CLang porting changes: cfMesh

applications/utilities/mesh/cfMesh/FLMAToSurface/FLMAToSurface.C

@@ -27,6 +27,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "triSurf.H"
 #include "triSurfModifier.H"

applications/utilities/mesh/cfMesh/FPMAToMesh/FPMAToMesh.C

@@ -27,6 +27,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "IFstream.H"

applications/utilities/mesh/cfMesh/cartesian2DMesh/cartesian2DMesh.C

@@ -30,6 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "cartesian2DMeshGenerator.H"
 

applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C

@@ -28,6 +28,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "triSurf.H"
 #include "triSurfaceExtrude2DEdges.H"

applications/utilities/mesh/cfMesh/meshToFPMA/meshToFPMA.C

@@ -27,6 +27,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "writeMeshFPMA.H"

applications/utilities/mesh/cfMesh/patchesToSubsets/patchesToSubsets.C

@@ -27,6 +27,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "triSurf.H"
 #include "triFaceList.H"

applications/utilities/mesh/cfMesh/preparePar/preparePar.C

@@ -30,6 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "objectRegistry.H"
 #include "Time.H"
 
 #include <sstream>

applications/utilities/mesh/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C

@@ -28,6 +28,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "triSurf.H"
 #include "triSurfaceRemoveFacets.H"

applications/utilities/mesh/cfMesh/subsetToPatch/subsetToPatch.C

@@ -27,6 +27,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "triSurf.H"
 #include "demandDrivenData.H"

applications/utilities/mesh/cfMesh/tetMesh/tetMesh.C

@@ -30,6 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "tetMeshGenerator.H"
 

src/mesh/cfMesh/meshLibrary/Make/options

@@ -1,5 +1,9 @@
 #if defined(__GNUC__)
-   OMP_FLAGS = -DUSE_OMP -fopenmp
+#   if defined(darwinIntel64)
+        OMP_FLAGS =
+#   else
+        OMP_FLAGS = -DUSE_OMP -fopenmp
+#   endif
 #else
    OMP_FLAGS =
 #endif

src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.H

@@ -35,6 +35,8 @@ SourceFiles
 #ifndef boundaryLayers_H
 #define boundaryLayers_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "meshSurfaceEngine.H"
 #include "meshSurfacePartitioner.H"

src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.H

@@ -36,6 +36,8 @@ SourceFiles
 #ifndef extrudeLayer_H
 #define extrudeLayer_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "VRWGraphList.H"
 #include "labelPair.H"

src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.H

@@ -36,6 +36,8 @@ SourceFiles
 #ifndef refineBoundaryLayers_H
 #define refineBoundaryLayers_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "meshSurfaceEngine.H"
 #include "DynList.H"

src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.H

@@ -35,6 +35,8 @@ SourceFiles
 #ifndef checkMeshDict_H
 #define checkMeshDict_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "IOdictionary.H"
 
 #include <map>

src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.C

@@ -27,8 +27,6 @@ License
 #include "Ostream.H"
 #include "token.H"
 
-#include "Time.H"
-
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T, Foam::label Offset>

src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.H

@@ -42,6 +42,7 @@ SourceFiles
 
 #include "label.H"
 #include "bool.H"
+#include "IOstreams.H"
 #include "error.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H

@@ -37,6 +37,7 @@ SourceFiles
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "objectRegistry.H"
 #include "Time.H"
 #include "meshSubset.H"
 #include "pointFieldPMG.H"

src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C

@@ -29,10 +29,7 @@ Description
 #include "demandDrivenData.H"
 #include "IFstream.H"
 #include "OFstream.H"
-#include "Time.H"
-
 #include "gzstream.h"
-
 #include "triSurface.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H

@@ -37,6 +37,7 @@ SourceFiles
 #define meshOctreeAutomaticRefinement_H
 
 #include "meshOctreeModifier.H"
+#include "IOdictionary.H"
 //#include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +61,7 @@ class meshOctreeAutomaticRefinement
         meshOctree& octree_;
 
         //- const reference to mesh dictionary
-        const IOdictionary& meshDict_;
+        const dictionary& meshDict_;
 
         //- use DATA boxes
         bool useDATABoxes_;

src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H

@@ -37,6 +37,7 @@ SourceFiles
 
 #include "boolList.H"
 #include "DynList.H"
+#include "IOdictionary.H"
 #include "meshOctreeModifier.H"
 //#include "volFields.H"
 #include "patchRefinementList.H"
@@ -49,7 +50,6 @@ namespace Foam
 {
 
 // Forward declarations
-class IOdictionary;
 class meshOctreeCube;
 
 /*---------------------------------------------------------------------------*\

src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C

@@ -26,6 +26,8 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "edgeExtractor.H"
 #include "meshSurfaceEngine.H"

src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H

@@ -38,6 +38,8 @@ SourceFiles
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "labelList.H"
 #include "labelLongList.H"
 #include "VRWGraph.H"

src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H

@@ -37,6 +37,8 @@ SourceFiles
 #ifndef meshSurfaceCheckEdgeTypes_H
 #define meshSurfaceCheckEdgeTypes_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H

@@ -37,6 +37,8 @@ SourceFiles
 #ifndef meshSurfaceCheckInvertedVertices_H
 #define meshSurfaceCheckInvertedVertices_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "HashSet.H"
 

src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H

@@ -35,6 +35,8 @@ SourceFiles
 #ifndef meshSurfaceEngine_H
 #define meshSurfaceEngine_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "SubList.H"
 #include "boolList.H"

src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H

@@ -37,6 +37,7 @@ SourceFiles
 #ifndef triSurfacePatchManipulator_H
 #define triSurfacePatchManipulator_H
 
+#include "IOdictionary.H"
 #include "triSurf.H"
 #include "VRWGraph.H"