diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C index f699e17588..82a8df0cca 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C @@ -220,7 +220,7 @@ void Foam::writeFuns::writePointDataHeader } -void Foam::writeFuns::insert(const scalar& pt, DynamicList& dest) +void Foam::writeFuns::insert(const scalar pt, DynamicList& dest) { dest.append(float(pt)); } diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H index cf7a4e992c..c38bbda669 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H @@ -86,7 +86,7 @@ public: // Convert to VTK and store - static void insert(const scalar&, DynamicList&); + static void insert(const scalar, DynamicList&); static void insert(const point&, DynamicList&); static void insert(const sphericalTensor&, DynamicList&); static void insert(const symmTensor&, DynamicList&); diff --git a/src/OpenFOAM/db/scalarRange/scalarRange.C b/src/OpenFOAM/db/scalarRange/scalarRange.C index 7623e14c27..393b19bba4 100644 --- a/src/OpenFOAM/db/scalarRange/scalarRange.C +++ b/src/OpenFOAM/db/scalarRange/scalarRange.C @@ -42,7 +42,7 @@ Foam::scalarRange::scalarRange() {} -Foam::scalarRange::scalarRange(const scalar& lower, const scalar& upper) +Foam::scalarRange::scalarRange(const scalar lower, const scalar upper) : type_(RANGE), value_(lower), @@ -123,7 +123,7 @@ Foam::scalar Foam::scalarRange::upper() const } -bool Foam::scalarRange::selected(const scalar& value) const +bool Foam::scalarRange::selected(const scalar value) const { switch (type_) { diff --git a/src/OpenFOAM/db/scalarRange/scalarRange.H b/src/OpenFOAM/db/scalarRange/scalarRange.H index b996871664..f123809237 100644 --- a/src/OpenFOAM/db/scalarRange/scalarRange.H +++ b/src/OpenFOAM/db/scalarRange/scalarRange.H @@ -92,7 +92,7 @@ public: scalarRange(); //- Construct a Range - scalarRange(const scalar& lower, const scalar& upper); + scalarRange(const scalar lower, const scalar upper); //- Construct from Istream. // Since commas can be used as list delimiters, @@ -119,7 +119,7 @@ public: scalar upper() const; //- Return true if the value is within the range - bool selected(const scalar&) const; + bool selected(const scalar) const; // Member Operators diff --git a/src/OpenFOAM/db/scalarRange/scalarRanges.C b/src/OpenFOAM/db/scalarRange/scalarRanges.C index c59e2b5a9d..f8b3c077b1 100644 --- a/src/OpenFOAM/db/scalarRange/scalarRanges.C +++ b/src/OpenFOAM/db/scalarRange/scalarRanges.C @@ -57,7 +57,7 @@ Foam::scalarRanges::scalarRanges(Istream& is) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -bool Foam::scalarRanges::selected(const scalar& value) const +bool Foam::scalarRanges::selected(const scalar value) const { forAll(*this, i) { diff --git a/src/OpenFOAM/db/scalarRange/scalarRanges.H b/src/OpenFOAM/db/scalarRange/scalarRanges.H index 5483454ae6..c3bf1ea668 100644 --- a/src/OpenFOAM/db/scalarRange/scalarRanges.H +++ b/src/OpenFOAM/db/scalarRange/scalarRanges.H @@ -66,7 +66,7 @@ public: // Member Functions //- Return true if the given value is within the ranges - bool selected(const scalar&) const; + bool selected(const scalar) const; //- Return the set of selected entries in the given list // that are within the ranges diff --git a/src/OpenFOAM/global/unitConversion/unitConversion.H b/src/OpenFOAM/global/unitConversion/unitConversion.H index 0ab93f1a50..10cbd47b35 100644 --- a/src/OpenFOAM/global/unitConversion/unitConversion.H +++ b/src/OpenFOAM/global/unitConversion/unitConversion.H @@ -45,13 +45,13 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // //- Conversion from degrees to radians -inline scalar degToRad(const scalar& deg) +inline scalar degToRad(const scalar deg) { return (deg*pi/180.0); } //- Conversion from radians to degrees -inline scalar radToDeg(const scalar& rad) +inline scalar radToDeg(const scalar rad) { return (rad*180.0/pi); } diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/objectHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/objectHit.H index fe2bf09865..16e1fc3a22 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/objectHit.H +++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/objectHit.H @@ -76,7 +76,7 @@ public: {} //- Construct from components - objectHit(const bool success, const label& obj) + objectHit(const bool success, const label obj) : hit_(success), hitObject_(obj) @@ -111,7 +111,7 @@ public: { return ((a.hit_ == b.hit_) && (a.hitObject_ == b.hitObject_)); } - + friend bool operator!=(const objectHit& a, const objectHit& b) { return (!(a == b)); diff --git a/src/OpenFOAM/primitives/hashes/Hash/Hash.H b/src/OpenFOAM/primitives/hashes/Hash/Hash.H index dd16517dfe..b998daea1b 100644 --- a/src/OpenFOAM/primitives/hashes/Hash/Hash.H +++ b/src/OpenFOAM/primitives/hashes/Hash/Hash.H @@ -107,7 +107,7 @@ public: //- Incrementally hash a label. // This will necessarily return a different value than the // non-incremental version. - unsigned operator()(const label& p, unsigned seed) const + unsigned operator()(const label p, unsigned seed) const { return Hasher(&p, sizeof(label), seed); } @@ -115,11 +115,10 @@ public: //- Return the unsigned representation of a label. // This helps if people have relied on the hash value corresponding to // the natural order. - unsigned operator()(const label& p) const + unsigned operator()(const label p) const { return p; } - }; diff --git a/src/OpenFOAM/primitives/random/Random.C b/src/OpenFOAM/primitives/random/Random.C index 848b3a5547..570817e692 100644 --- a/src/OpenFOAM/primitives/random/Random.C +++ b/src/OpenFOAM/primitives/random/Random.C @@ -47,8 +47,7 @@ namespace Foam // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// construct given seed -Random::Random(const label& seed) +Random::Random(const label seed) { if (seed > 1) { diff --git a/src/OpenFOAM/primitives/random/Random.H b/src/OpenFOAM/primitives/random/Random.H index f611f90600..2339e607b5 100644 --- a/src/OpenFOAM/primitives/random/Random.H +++ b/src/OpenFOAM/primitives/random/Random.H @@ -61,7 +61,7 @@ public: // Constructors //- Construct given seed - Random(const label&); + Random(const label); // Member functions @@ -70,14 +70,19 @@ public: //- scalar [0..1] (so including 0,1) scalar scalar01(); + //- vector with every component scalar01 vector vector01(); + //- sphericalTensor with every component scalar01 sphericalTensor sphericalTensor01(); + //- symmTensor with every component scalar01 symmTensor symmTensor01(); + //- tensor with every component scalar01 tensor tensor01(); + //- label [lower..upper] label integer(const label lower, const label upper); diff --git a/src/conversion/ensight/file/ensightFile.C b/src/conversion/ensight/file/ensightFile.C index 8cb28f8c5e..095d2659f8 100644 --- a/src/conversion/ensight/file/ensightFile.C +++ b/src/conversion/ensight/file/ensightFile.C @@ -74,7 +74,7 @@ bool Foam::ensightFile::allowUndef(bool value) } -Foam::scalar Foam::ensightFile::undefValue(const scalar& value) +Foam::scalar Foam::ensightFile::undefValue(const scalar value) { // enable its use too allowUndef_ = true; @@ -133,7 +133,7 @@ Foam::Ostream& Foam::ensightFile::write(const string& value) } -Foam::Ostream& Foam::ensightFile::write(const label& value) +Foam::Ostream& Foam::ensightFile::write(const label value) { if (format() == IOstream::BINARY) { @@ -157,7 +157,7 @@ Foam::Ostream& Foam::ensightFile::write(const label& value) Foam::Ostream& Foam::ensightFile::write ( - const label& value, + const label value, const label fieldWidth ) { @@ -181,7 +181,7 @@ Foam::Ostream& Foam::ensightFile::write } -Foam::Ostream& Foam::ensightFile::write(const scalar& value) +Foam::Ostream& Foam::ensightFile::write(const scalar value) { if (format() == IOstream::BINARY) { diff --git a/src/conversion/ensight/file/ensightFile.H b/src/conversion/ensight/file/ensightFile.H index 1fa91f8561..ca62114160 100644 --- a/src/conversion/ensight/file/ensightFile.H +++ b/src/conversion/ensight/file/ensightFile.H @@ -103,7 +103,7 @@ public: //- Assign the value to represent undef in the results // Returns the previous value // NB: do not use values larger than floatScalarVGREAT - static scalar undefValue(const scalar&); + static scalar undefValue(const scalar); // Output @@ -124,13 +124,13 @@ public: Ostream& write(const string& value); //- write integer as "%10d" or as binary - Ostream& write(const label& value); + Ostream& write(const label value); //- write integer with specified width or as binary - Ostream& write(const label& value, const label fieldWidth); + Ostream& write(const label value, const label fieldWidth); //- write float as "%12.5e" or as binary - Ostream& write(const scalar& value); + Ostream& write(const scalar value); //- Add carriage return to ascii stream void newline(); diff --git a/src/conversion/meshTables/cellTable.C b/src/conversion/meshTables/cellTable.C index 6369f98d9d..a07cbaf96d 100644 --- a/src/conversion/meshTables/cellTable.C +++ b/src/conversion/meshTables/cellTable.C @@ -22,8 +22,6 @@ License along with OpenFOAM; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Description - \*---------------------------------------------------------------------------*/ #include "cellTable.H" @@ -81,7 +79,7 @@ void Foam::cellTable::addDefaults() void Foam::cellTable::setEntry ( - const label& id, + const label id, const word& keyWord, const word& value ) @@ -192,7 +190,7 @@ Foam::Map Foam::cellTable::names } -Foam::word Foam::cellTable::name(const label& id) const +Foam::word Foam::cellTable::name(const label id) const { word theName("cellTable_" + Foam::name(id)); @@ -289,19 +287,19 @@ Foam::Map Foam::cellTable::shells() const -void Foam::cellTable::setMaterial(const label& id, const word& matlType) +void Foam::cellTable::setMaterial(const label id, const word& matlType) { setEntry(id, "MaterialType", matlType); } -void Foam::cellTable::setName(const label& id, const word& name) +void Foam::cellTable::setName(const label id, const word& name) { setEntry(id, "Label", name); } -void Foam::cellTable::setName(const label& id) +void Foam::cellTable::setName(const label id) { iterator iter = find(id); diff --git a/src/conversion/meshTables/cellTable.H b/src/conversion/meshTables/cellTable.H index 4d0079f032..ff8c1fafb6 100644 --- a/src/conversion/meshTables/cellTable.H +++ b/src/conversion/meshTables/cellTable.H @@ -96,7 +96,7 @@ class cellTable //- Add required entries - MaterialType void addDefaults(); - void setEntry(const label& id, const word& keyWord, const word& value); + void setEntry(const label id, const word& keyWord, const word& value); //- Disallow default bitwise copy construct cellTable(const cellTable&); @@ -133,7 +133,7 @@ public: //- Return the name corresponding to id // returns cellTable_ID if not otherwise defined - word name(const label& id) const; + word name(const label id) const; //- Return a Map of (id => name) Map names() const; @@ -157,13 +157,13 @@ public: Map materialTypes() const; //- Assign material Type - void setMaterial(const label&, const word&); + void setMaterial(const label, const word&); //- Assign name - void setName(const label&, const word&); + void setName(const label, const word&); //- Assign default name if not already set - void setName(const label&); + void setName(const label); //- Read constant/cellTable void readDict diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C index 7820bcd70b..2be5111187 100644 --- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C +++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C @@ -1536,7 +1536,7 @@ void Foam::faceCoupleInfo::perfectPointMatch FatalErrorIn ( "faceCoupleInfo::perfectPointMatch" - "(const scalar&, const bool)" + "(const scalar, const bool)" ) << "Did not match all of the master faces to the slave faces" << endl << "This usually means that the slave patch and master patch" diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C index 926f2f4913..f338c6cf06 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C @@ -55,7 +55,7 @@ namespace Foam class ifEqEqOp { public: - void operator()(label& x, const label& y) const + void operator()(label x, const label y) const { x = (x==y) ? x : value; } diff --git a/src/mesh/blockMesh/curvedEdges/spline.C b/src/mesh/blockMesh/curvedEdges/spline.C index 871c7f7db4..e95d5a9f36 100644 --- a/src/mesh/blockMesh/curvedEdges/spline.C +++ b/src/mesh/blockMesh/curvedEdges/spline.C @@ -36,7 +36,7 @@ Foam::spline::spline(const pointField& knotPoints) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::spline::B(const scalar& tau) const +Foam::scalar Foam::spline::B(const scalar tau) const { if (tau <= -2.0 || tau >= 2.0) { @@ -60,7 +60,7 @@ Foam::scalar Foam::spline::B(const scalar& tau) const } else { - FatalErrorIn("spline::B(const scalar&)") + FatalErrorIn("spline::B(const scalar)") << "Programming error???, " << "tau = " << tau << abort(FatalError); diff --git a/src/mesh/blockMesh/curvedEdges/spline.H b/src/mesh/blockMesh/curvedEdges/spline.H index 5808770682..243ed35690 100644 --- a/src/mesh/blockMesh/curvedEdges/spline.H +++ b/src/mesh/blockMesh/curvedEdges/spline.H @@ -59,7 +59,7 @@ class spline // Private Member Functions //- Blending function for constructing spline - scalar B(const scalar&) const; + scalar B(const scalar) const; //- Disallow default bitwise copy construct spline(const spline&); diff --git a/src/meshTools/octree/treeBoundBox.H b/src/meshTools/octree/treeBoundBox.H index 69791e04a8..04b420a531 100644 --- a/src/meshTools/octree/treeBoundBox.H +++ b/src/meshTools/octree/treeBoundBox.H @@ -158,10 +158,6 @@ public: static const FixedList faceNormals; - //- Face on which neighbour is - static direction neighbourFaceBits(const label&); - - // Constructors //- Construct null setting points to zero diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C index 8bcab42089..1c1622c0eb 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurface.C +++ b/src/surfMesh/MeshedSurface/MeshedSurface.C @@ -507,7 +507,7 @@ void Foam::MeshedSurface::movePoints(const pointField& newPoints) template -void Foam::MeshedSurface::scalePoints(const scalar& scaleFactor) +void Foam::MeshedSurface::scalePoints(const scalar scaleFactor) { // avoid bad scaling if (scaleFactor > 0 && scaleFactor != 1.0) diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H index 5677233e0b..ea7125fa83 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurface.H +++ b/src/surfMesh/MeshedSurface/MeshedSurface.H @@ -338,7 +338,7 @@ public: virtual void movePoints(const pointField&); //- Scale points. A non-positive factor is ignored - virtual void scalePoints(const scalar&); + virtual void scalePoints(const scalar); //- Reset primitive data (points, faces and zones) // Note, optimized to avoid overwriting data (with Xfer::null) diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C index 3b8d2f9d5f..65258557e8 100644 --- a/src/triSurface/triSurface/triSurface.C +++ b/src/triSurface/triSurface/triSurface.C @@ -33,8 +33,6 @@ License #include "SortableList.H" #include "PackedBoolList.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { @@ -783,7 +781,6 @@ const Foam::labelList& Foam::triSurface::edgeOwner() const } -//- Move points void Foam::triSurface::movePoints(const pointField& newPoints) { // Remove all geometry dependent data @@ -797,8 +794,7 @@ void Foam::triSurface::movePoints(const pointField& newPoints) } -// scale points -void Foam::triSurface::scalePoints(const scalar& scaleFactor) +void Foam::triSurface::scalePoints(const scalar scaleFactor) { // avoid bad scaling if (scaleFactor > 0 && scaleFactor != 1.0) diff --git a/src/triSurface/triSurface/triSurface.H b/src/triSurface/triSurface/triSurface.H index 9ee5b5ca4d..7ef87db1ab 100644 --- a/src/triSurface/triSurface/triSurface.H +++ b/src/triSurface/triSurface/triSurface.H @@ -324,7 +324,7 @@ public: virtual void movePoints(const pointField&); //- Scale points. A non-positive factor is ignored - virtual void scalePoints(const scalar&); + virtual void scalePoints(const scalar); //- Check/remove duplicate/degenerate triangles void checkTriangles(const bool verbose);