Merge commit 'e94e94a7' into

defect-release-v1.1 Compilation for clang on Mac OSX thanks to Alexey
Matveichev

Conflicts:
	meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C

.gitignore

+*.dep
+**/lnInclude/*
+**/Make/**/*

executables/cartesian2DMesh/cartesian2DMesh.C

@@ -30,7 +30,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "Time.H"
 #include "cartesian2DMeshGenerator.H"
 
 using namespace Foam;

executables/pMesh/pMesh.C

@@ -30,7 +30,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "Time.H"
 #include "voronoiMeshGenerator.H"
 
 using namespace Foam;

executables/tetMesh/tetMesh.C

@@ -30,7 +30,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "Time.H"
 #include "tetMeshGenerator.H"
 
 using namespace Foam;

meshLibrary/utilities/anisotropicMeshing/coordinateModification/boxScaling.C

@@ -176,7 +176,7 @@ void boxScaling::boundingPlanes(PtrList<plane>&pl) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionary boxScaling::dict(bool ignoreType) const
+dictionary boxScaling::dict(bool /*ignoreType*/) const
 {
     dictionary dict;
 

meshLibrary/utilities/anisotropicMeshing/coordinateModification/coordinateModification.C

@@ -46,7 +46,7 @@ coordinateModification::coordinateModification()
 coordinateModification::coordinateModification
 (
     const word& name,
-    const dictionary& dict
+    const dictionary& /*dict*/
 )
 :
     name_(name)

meshLibrary/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H

@@ -39,7 +39,6 @@ SourceFiles
 #include "word.H"
 #include "point.H"
 #include "coordinateModificationList.H"
-#include "Time.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

meshLibrary/utilities/anisotropicMeshing/coordinateModification/planeScaling.C

@@ -153,7 +153,7 @@ void planeScaling::boundingPlanes(PtrList<plane>& pl) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionary planeScaling::dict(bool ignoreType) const
+dictionary planeScaling::dict(bool /*ignoreType*/) const
 {
     dictionary dict;
 

meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C

@@ -686,7 +686,7 @@ void boundaryLayers::createNewPartitionVerticesParallel
 (
     const labelLongList& procPoints,
     const List<direction>& pVertices,
-    const boolList& treatPatches
+    const boolList& /*treatPatches*/
 )
 {
     if( !Pstream::parRun() )

meshLibrary/utilities/checkMeshDict/checkMeshDict.C

@@ -860,7 +860,7 @@ void checkMeshDict::updatePatchCellSize
 
 void checkMeshDict::updateSubsetCellSize
 (
-    const std::map<word, wordList>& patchesFromPatch
+    const std::map<word, wordList>& /*patchesFromPatch*/
 )
 {
 
@@ -1028,7 +1028,7 @@ void checkMeshDict::updateRemoveCellsIntersectingPatches
 
 void checkMeshDict::updateObjectRefinements
 (
-    const std::map<word, wordList>& patchesFromPatch
+    const std::map<word, wordList>& /*patchesFromPatch*/
 )
 {
 

meshLibrary/utilities/containers/FRWGraph/FRWGraph.C

@@ -35,7 +35,11 @@ Foam::Ostream& Foam::operator<<
 )
 {
     os << DL.size() << "(" << endl;
+#if defined(__clang__)
+    for(label i=0;i<DL.size();++i)
+#else
     for(register label i=0;i<DL.size();++i)
+#endif
     {
         os << width << "(";
         for(label j=0;j<width;++j)

meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H

@@ -105,7 +105,7 @@ inline Foam::label Foam::FRWGraph<T,width>::size() const
 }
 
 template<class T, Foam::label width>
-inline Foam::label Foam::FRWGraph<T,width>::sizeOfRow(const label rowI) const
+inline Foam::label Foam::FRWGraph<T,width>::sizeOfRow(const label /*rowI*/) const
 {
     return width;
 }
@@ -155,7 +155,11 @@ inline bool Foam::FRWGraph<T,width>::contains
 ) const
 {
     const label start = rowI * width;
+#if defined(__clang__)
+    for(label i=0;i<width;++i)
+#else
     for(register label i=0;i<width;++i)
+#endif
         if( data_[start+i] == e )
             return true;
     
@@ -170,7 +174,11 @@ inline Foam::label Foam::FRWGraph<T,width>::containsAtPosition
 ) const
 {
     const label start = rowI * width;
+#if defined(__clang__)
+    for(label i=0;i<width;++i)
+#else
     for(register label i=0;i<width;++i)
+#endif
         if( data_[start+i] == e )
             return i;
     

meshLibrary/utilities/containers/LongList/LongList.C

@@ -202,7 +202,11 @@ Foam::Istream& Foam::operator>>
 
             if( listDelimiter == token::BEGIN_LIST )
             {
+#if defined(__clang__)
+                for(label i=0;i<size;++i)
+#else
                 for(register label i=0;i<size;++i)
+#endif
                 {
                     is >> DL[i];
 
@@ -223,7 +227,11 @@ Foam::Istream& Foam::operator>>
                     "reading the single entry"
                 );
 
+#if defined(__clang__)
+                for(label i=0;i<size;++i)
+#else
                 for(register label i=0;i<size;++i)
+#endif
                 {
                     DL[i] = element;
                 }
@@ -306,7 +314,11 @@ void Foam::LongList<T, Offset>::appendFromStream(Istream& is)
 
             if( listDelimiter == token::BEGIN_LIST )
             {
+#if defined(__clang__)
+                for(label i=0;i<size;++i)
+#else
                 for(register label i=0;i<size;++i)
+#endif
                 {
                     is >> this->operator[](origSize);
                     ++origSize;
@@ -328,7 +340,11 @@ void Foam::LongList<T, Offset>::appendFromStream(Istream& is)
                     "reading the single entry"
                 );
 
+#if defined(__clang__)
+                for(label i=0;i<size;++i)
+#else
                 for(register label i=0;i<size;++i)
+#endif
                 {
                     this->operator[](origSize) = element;
                     ++origSize;

meshLibrary/utilities/containers/LongList/LongListI.H

@@ -78,7 +78,11 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
 
     if( numblock1 < numBlocks_ )
     {
+#if defined(__clang__)
+        for(label i=numblock1;i<numBlocks_;++i)
+#else
         for(register label i=numblock1;i<numBlocks_;++i)
+#endif
             delete [] dataPtr_[i];
     }
     else if( numblock1 > numBlocks_ )
@@ -91,7 +95,11 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
             } while( numblock1 > numAllocatedBlocks_ );
 
             T** dataptr1 = new T*[numAllocatedBlocks_];
+#if defined(__clang__)
+            for(label i=0;i<numBlocks_;++i)
+#else
             for(register label i=0;i<numBlocks_;++i)
+#endif
                 dataptr1[i] = dataPtr_[i];
 
             if( dataPtr_ )
@@ -99,7 +107,11 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
             dataPtr_ = dataptr1;
         }
 
+#if defined(__clang__)
+        for(label i=numBlocks_;i<numblock1;++i)
+#else
         for(register label i=numBlocks_;i<numblock1;++i)
+#endif
             dataPtr_[i] = new T[blockSize];
     }
 
@@ -110,7 +122,11 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
 template<class T, Foam::label Offset>
 void Foam::LongList<T, Offset>::clearOut()
 {
+#if defined(__clang__)
+    for(label i=0;i<numBlocks_;++i)
+#else
     for(register label i=0;i<numBlocks_;++i)
+#endif
         delete [] dataPtr_[i];
 
     if( dataPtr_ )
@@ -281,7 +297,11 @@ inline void Foam::LongList<T, Offset>::appendIfNotIn(const T& e)
 template<class T, Foam::label Offset>
 inline bool Foam::LongList<T, Offset>::contains(const T& e) const
 {
+#if defined(__clang__)
+    for(label i=0;i<nextFree_;++i)
+#else
     for(register label i=0;i<nextFree_;++i)
+#endif
         if( (*this)[i] == e )
             return true;
 
@@ -294,7 +314,11 @@ inline Foam::label Foam::LongList<T, Offset>::containsAtPosition
     const T& e
 ) const
 {
+#if defined(__clang__)
+    for(label i=0;i<nextFree_;++i)
+#else
     for(register label i=0;i<nextFree_;++i)
+#endif
         if( (*this)[i] == e )
             return i;
 
@@ -376,7 +400,11 @@ inline T& Foam::LongList<T, Offset>::newElmt(const label i)
 template<class T, Foam::label Offset>
 inline void Foam::LongList<T, Offset>::operator=(const T& t)
 {
+#if defined(__clang__)
+    for(label i=0;i<nextFree_;++i)
+#else
     for(register label i=0;i<nextFree_;++i)
+#endif
         operator[](i) = t;
 }
 
@@ -384,7 +412,11 @@ template<class T, Foam::label Offset>
 inline void Foam::LongList<T, Offset>::operator=(const LongList<T, Offset>& l)
 {
     setSize(l.size());
+#if defined(__clang__)
+    for(label i=0;i<l.nextFree_;++i)
+#else
     for(register label i=0;i<l.nextFree_;++i)
+#endif
         operator[](i) = l[i];
 }
 

meshLibrary/utilities/containers/VRWGraph/VRWGraph.C

@@ -37,7 +37,11 @@ Foam::Ostream& Foam::operator<<
 {
     os << DL.size() << nl << token::BEGIN_LIST;
     
+#if defined(__clang__)
+    for(label i=0;i<DL.size();++i)
+#else
     for(register label i=0;i<DL.size();++i)
+#endif
     {
         os << nl << DL.sizeOfRow(i) << token::BEGIN_LIST;
         for(label j=0;j<DL.sizeOfRow(i);++j)

meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H

@@ -518,7 +518,11 @@ inline bool Foam::VRWGraph::contains
         return false;
     const label size = rows_[rowI].size();
 
+#if defined(__clang__)
+    for(label i=0;i<size;++i)
+#else
     for(register label i=0;i<size;++i)
+#endif
         if( data_[start+i] == e )
             return true;
 
@@ -536,7 +540,11 @@ inline Foam::label Foam::VRWGraph::containsAtPosition
         return -1;
 
     const label size = rows_[rowI].size();
+#if defined(__clang__)
+    for(label i=0;i<size;++i)
+#else
     for(register label i=0;i<size;++i)
+#endif
         if( data_[start+i] == e )
             return i;
 

meshLibrary/utilities/containers/VRWGraphList/VRWGraphList.C

@@ -37,7 +37,11 @@ Foam::Ostream& Foam::operator<<
 {
     os << DL.size() << nl << token::BEGIN_LIST;
     
+#if defined(__clang__)
+    for(label i=0;i<DL.size();++i)
+#else
     for(register label i=0;i<DL.size();++i)
+#endif
     {
         os << nl << DL[i];
     }

meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C

@@ -162,7 +162,7 @@ void decomposeCells::createPointsAndCellFaces(const boolList& decomposeCell)
         }
 }
 
-void decomposeCells::storeBoundaryFaces(const boolList& decomposeCell)
+void decomposeCells::storeBoundaryFaces(const boolList& /*decomposeCell*/)
 {
     meshSurfaceEngine mse(mesh_);
     const faceList::subList& bFaces = mse.boundaryFaces();

meshLibrary/utilities/decomposeCells/decomposeCellsPyramids.C

@@ -127,9 +127,9 @@ void decomposeCells::findAddressingForCell
 label decomposeCells::findTopVertex
 (
     const label cellI,
-    const DynList<label, 32>& vrt,
-    const DynList<edge, 64>& edges,
-    const DynList<DynList<label, 2>, 64>& edgeFaces
+    const DynList<label, 32>& /*vrt*/,
+    const DynList<edge, 64>& /*edges*/,
+    const DynList<DynList<label, 2>, 64>& /*edgeFaces*/
 )
 {
     const cell& c = mesh_.cells()[cellI];

meshLibrary/utilities/faceDecomposition/decomposeFaces.C

@@ -370,7 +370,11 @@ void decomposeFaces::decomposeConcaveInternalFaces
     # endif
 
     //- decompose internal faces
+#if defined(__clang__)
+    for(label faceI=0;faceI<nIntFaces;++faceI)
+#else
     for(register label faceI=0;faceI<nIntFaces;++faceI)
+#endif
     {
         const face& f = faces[faceI];
 

meshLibrary/utilities/helperClasses/parallelHelpers/parPartTet/parPartTet.H

@@ -87,7 +87,7 @@ public:
             return pts_[i];
         }
         
-        inline bool operator !=(const parPartTet& ptf) const
+        inline bool operator !=(const parPartTet& /*ptf*/) const
         {
             Serr << "Not implemented" << endl;
             ::exit(1);

meshLibrary/utilities/helperClasses/parallelHelpers/parTriFace/parTriFace.H

@@ -99,12 +99,10 @@ class parTriFace
 
     // Member operators
 
-        inline bool operator !=(const parTriFace& ptf) const
+        inline bool operator !=(const parTriFace& /*ptf*/) const
         {
             Serr << "parTriFace::operator!= Not implemented" << endl;
             ::exit(1);
-
-            return true;
         }
 
     // Friend operators

meshLibrary/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C

@@ -46,8 +46,8 @@ namespace Foam
 void partTetMesh::createParallelAddressing
 (
     const labelLongList& nodeLabelForPoint,
-    const labelLongList& nodeLabelForFace,
-    const labelLongList& nodeLabelForCell
+    const labelLongList& /*nodeLabelForFace*/,
+    const labelLongList& /*nodeLabelForCell*/
 )
 {
     //- vertices marked as SMOOTH and BOUNDARY are used by the smoother

meshLibrary/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C

@@ -47,7 +47,7 @@ namespace Foam
 void partTriMesh::createParallelAddressing
 (
     const labelList& nodeLabelForPoint,
-    const labelList& nodeLabelForFace
+    const labelList& /*nodeLabelForFace*/
 )
 {
     const meshSurfaceEngine& mse = mPart_.surfaceEngine();

meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.C

@@ -90,7 +90,7 @@ void processorBoundaryPatch::write(Ostream& os) const
     this->operator<<(os);
 }
 
-void processorBoundaryPatch::writeDict(Ostream& os) const
+void processorBoundaryPatch::writeDict(Ostream& /*os*/) const
 {
     
 }

meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C

@@ -1606,10 +1606,10 @@ void checkVolumeUniformity
 bool checkVolumeUniformity
 (
     const polyMeshGen&,
-    const bool report,
-    const scalar warnUniform,
-    labelHashSet* setPtr,
-    const boolList* changedFacePtr
+    const bool /*report*/,
+    const scalar /*warnUniform*/,
+    labelHashSet* /*setPtr*/,
+    const boolList* /*changedFacePtr*/
 )
 {
 
@@ -2122,7 +2122,7 @@ label findWorstQualityFaces
 (
     const polyMeshGen& mesh,
     labelHashSet& badFaces,
-    const bool report,
+    const bool /*report*/,
     const boolList* activeFacePtr,
     const scalar relativeThreshold
 )

meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C

@@ -187,7 +187,11 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace)
             neiProcNo[npI] = procBoundaries[patchI].neiProcNo();
             nFacesInPatch[npI] = 0;
 
+#if defined(__clang__)
+            for(label faceI=0;faceI<oldNumFacesInPatch;++faceI)
+#else
             for(register label faceI=0;faceI<oldNumFacesInPatch;++faceI)
+#endif
             {
                 if(
                     !removeFace[oldStart+faceI] &&

meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C

@@ -119,8 +119,8 @@ void meshOctreeModifier::refineTreeForCoordinates
 void meshOctreeModifier::refineTreeForCoordinates
 (
     const meshOctreeCubeCoordinates& cc,
-    const labelList& containedTriangles,
-    const labelList& containedEdges,
+    const labelList& /*containedTriangles*/,
+    const labelList& /*containedEdges*/,
     const short procNo,
     const direction cubeType
 )

meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/boxRefinement.C

@@ -94,7 +94,7 @@ bool boxRefinement::intersectsObject(const boundBox& bb) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionary boxRefinement::dict(bool ignoreType) const
+dictionary boxRefinement::dict(bool /*ignoreType*/) const
 {
     dictionary dict;
 

meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/coneRefinement.C

@@ -106,7 +106,7 @@ bool coneRefinement::intersectsObject(const boundBox& bb) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionary coneRefinement::dict(bool ignoreType) const
+dictionary coneRefinement::dict(bool /*ignoreType*/) const
 {
     dictionary dict;
 

meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/hollowConeRefinement.C

@@ -115,7 +115,7 @@ bool hollowConeRefinement::intersectsObject(const boundBox& bb) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionary hollowConeRefinement::dict(bool ignoreType) const
+dictionary hollowConeRefinement::dict(bool /*ignoreType*/) const
 {
     dictionary dict;
 

meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/lineRefinement.C

@@ -206,7 +206,7 @@ bool lineRefinement::intersectsObject(const boundBox& bb) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionary lineRefinement::dict(bool ignoreType) const
+dictionary lineRefinement::dict(bool /*ignoreType*/) const
 {
     dictionary dict;
 

meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.H

@@ -163,7 +163,7 @@ public:
         //- set refinement thickness
         void setRefinementThickness(const scalar refThickness)
         {
-            refThickness_ = refThickness_;
+            refThickness_ = refThickness;
         }
 
         //- return refinement thickness for this object

meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/sphereRefinement.C

@@ -87,7 +87,7 @@ bool sphereRefinement::intersectsObject(const boundBox& bb) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionary sphereRefinement::dict(bool ignoreType) const
+dictionary sphereRefinement::dict(bool /*ignoreType*/) const
 {
     dictionary dict;
 

meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.C

@@ -107,7 +107,7 @@ label meshOptimizer::findBadFaces
 label meshOptimizer::findLowQualityFaces
 (
     labelHashSet& badFaces,
-    const boolList& changedFace
+    const boolList& /*changedFace*/
 ) const
 {
     badFaces.clear();

meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C

@@ -368,8 +368,8 @@ void meshOptimizer::laplaceSmoother::optimizeLaplacian(const label nIterations)
 
 void meshOptimizer::laplaceSmoother::optimizeLaplacian
 (
-    const labelHashSet& badFaces,
-    const label nIterations
+    const labelHashSet& /*badFaces*/,
+    const label /*nIterations*/
 )
 {
     FatalError << "Not implemented " << exit(FatalError);
@@ -377,8 +377,8 @@ void meshOptimizer::laplaceSmoother::optimizeLaplacian
 
 void meshOptimizer::laplaceSmoother::optimizeSurfaceLaplacian
 (
-    const labelHashSet& badFaces,
-    const label nIterations
+    const labelHashSet& /*badFaces*/,
+    const label /*nIterations*/
 )
 {
     FatalError << "Not implemented " << exit(FatalError);
@@ -402,8 +402,8 @@ void meshOptimizer::laplaceSmoother::optimizeLaplacianPC
 
 void meshOptimizer::laplaceSmoother::optimizeLaplacianPC
 (
-    const labelHashSet& badFaces,
-    const label nIterations
+    const labelHashSet& /*badFaces*/,
+    const label /*nIterations*/
 )
 {
     FatalError << "Not implemented " << exit(FatalError);
@@ -427,8 +427,8 @@ void meshOptimizer::laplaceSmoother::optimizeLaplacianWPC
 
 void meshOptimizer::laplaceSmoother::optimizeLaplacianWPC
 (
-    const labelHashSet& badFaces,
-    const label nIterations
+    const labelHashSet& /*badFaces*/,
+    const label /*nIterations*/
 )
 {