From 44123aa2eb6506fb7dc366aad86d7b26bfcfb46b Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Tue, 17 Jun 2014 11:42:41 +0100 Subject: [PATCH] CLang porting changes: cfMesh --- .../utilities/mesh/cfMesh/FLMAToSurface/FLMAToSurface.C | 1 + applications/utilities/mesh/cfMesh/FPMAToMesh/FPMAToMesh.C | 1 + .../utilities/mesh/cfMesh/cartesian2DMesh/cartesian2DMesh.C | 1 + .../extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C | 1 + applications/utilities/mesh/cfMesh/meshToFPMA/meshToFPMA.C | 1 + .../mesh/cfMesh/patchesToSubsets/patchesToSubsets.C | 1 + applications/utilities/mesh/cfMesh/preparePar/preparePar.C | 1 + .../mesh/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C | 1 + .../utilities/mesh/cfMesh/subsetToPatch/subsetToPatch.C | 1 + applications/utilities/mesh/cfMesh/tetMesh/tetMesh.C | 1 + src/mesh/cfMesh/meshLibrary/Make/options | 6 +++++- .../meshLibrary/utilities/boundaryLayers/boundaryLayers.H | 2 ++ .../meshLibrary/utilities/boundaryLayers/extrudeLayer.H | 2 ++ .../utilities/boundaryLayers/refineBoundaryLayers.H | 2 ++ .../meshLibrary/utilities/checkMeshDict/checkMeshDict.H | 2 ++ .../meshLibrary/utilities/containers/LongList/LongList.C | 2 -- .../meshLibrary/utilities/containers/LongList/LongList.H | 1 + .../utilities/meshes/polyMeshGen/polyMeshGenPoints.H | 1 + .../cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C | 3 --- .../meshOctreeAutomaticRefinement.H | 3 ++- .../meshOctree/meshOctreeCreator/meshOctreeCreator.H | 2 +- .../edgeExtraction/edgeExtractor/edgeExtractor.C | 2 ++ .../edgeExtraction/edgeExtractor/edgeExtractor.H | 2 ++ .../meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H | 2 ++ .../meshSurfaceCheckInvertedVertices.H | 2 ++ .../surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H | 2 ++ .../triSurfacePatchManipulator/triSurfacePatchManipulator.H | 1 + 27 files changed, 39 insertions(+), 8 deletions(-) diff --git a/applications/utilities/mesh/cfMesh/FLMAToSurface/FLMAToSurface.C b/applications/utilities/mesh/cfMesh/FLMAToSurface/FLMAToSurface.C index 7db892462..76fd5b3fb 100644 --- a/applications/utilities/mesh/cfMesh/FLMAToSurface/FLMAToSurface.C +++ b/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" diff --git a/applications/utilities/mesh/cfMesh/FPMAToMesh/FPMAToMesh.C b/applications/utilities/mesh/cfMesh/FPMAToMesh/FPMAToMesh.C index b072c6e9f..1f10a9115 100644 --- a/applications/utilities/mesh/cfMesh/FPMAToMesh/FPMAToMesh.C +++ b/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" diff --git a/applications/utilities/mesh/cfMesh/cartesian2DMesh/cartesian2DMesh.C b/applications/utilities/mesh/cfMesh/cartesian2DMesh/cartesian2DMesh.C index 1a03a0367..0ad87d3a1 100644 --- a/applications/utilities/mesh/cfMesh/cartesian2DMesh/cartesian2DMesh.C +++ b/applications/utilities/mesh/cfMesh/cartesian2DMesh/cartesian2DMesh.C @@ -30,6 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "argList.H" +#include "objectRegistry.H" #include "Time.H" #include "cartesian2DMeshGenerator.H" diff --git a/applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C b/applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C index 0ff651237..871de6630 100644 --- a/applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C +++ b/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" diff --git a/applications/utilities/mesh/cfMesh/meshToFPMA/meshToFPMA.C b/applications/utilities/mesh/cfMesh/meshToFPMA/meshToFPMA.C index 0a69f40db..3bf17c73b 100644 --- a/applications/utilities/mesh/cfMesh/meshToFPMA/meshToFPMA.C +++ b/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" diff --git a/applications/utilities/mesh/cfMesh/patchesToSubsets/patchesToSubsets.C b/applications/utilities/mesh/cfMesh/patchesToSubsets/patchesToSubsets.C index d5e614eca..fb270b566 100644 --- a/applications/utilities/mesh/cfMesh/patchesToSubsets/patchesToSubsets.C +++ b/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" diff --git a/applications/utilities/mesh/cfMesh/preparePar/preparePar.C b/applications/utilities/mesh/cfMesh/preparePar/preparePar.C index 06011e8c4..b8d2915fb 100644 --- a/applications/utilities/mesh/cfMesh/preparePar/preparePar.C +++ b/applications/utilities/mesh/cfMesh/preparePar/preparePar.C @@ -30,6 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "argList.H" +#include "objectRegistry.H" #include "Time.H" #include diff --git a/applications/utilities/mesh/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C b/applications/utilities/mesh/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C index 8fae8f439..198b33154 100644 --- a/applications/utilities/mesh/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C +++ b/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" diff --git a/applications/utilities/mesh/cfMesh/subsetToPatch/subsetToPatch.C b/applications/utilities/mesh/cfMesh/subsetToPatch/subsetToPatch.C index 5e71f89cd..53ab264dc 100644 --- a/applications/utilities/mesh/cfMesh/subsetToPatch/subsetToPatch.C +++ b/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" diff --git a/applications/utilities/mesh/cfMesh/tetMesh/tetMesh.C b/applications/utilities/mesh/cfMesh/tetMesh/tetMesh.C index 307f590c1..b801007fb 100644 --- a/applications/utilities/mesh/cfMesh/tetMesh/tetMesh.C +++ b/applications/utilities/mesh/cfMesh/tetMesh/tetMesh.C @@ -30,6 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "argList.H" +#include "objectRegistry.H" #include "Time.H" #include "tetMeshGenerator.H" diff --git a/src/mesh/cfMesh/meshLibrary/Make/options b/src/mesh/cfMesh/meshLibrary/Make/options index 3e1cae4a3..fd941f16f 100644 --- a/src/mesh/cfMesh/meshLibrary/Make/options +++ b/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 diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.H b/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.H index ef83edcea..9c6920da0 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.H +++ b/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" diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.H b/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.H index 70548df6b..46daa3601 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.H +++ b/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" diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.H b/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.H index 1e8535ea2..81d0bf60f 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.H +++ b/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" diff --git a/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.H b/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.H index c97d2addb..4271e01af 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.H +++ b/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 diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.C b/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.C index 05ba461d5..4a8caf736 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.C +++ b/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 diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.H b/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.H index 68e72e63f..caf34a5ae 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H b/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H index 1274a36b0..7d655282c 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H +++ b/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" diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C b/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C index 1d2891679..cc1dd6596 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H b/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H index 218ee09bf..d3fd4208e 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H +++ b/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_; diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H b/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H index f2d2ee87b..7f741bb2a 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H +++ b/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; /*---------------------------------------------------------------------------*\ diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C index 0ac8e401f..183fedf53 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C +++ b/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" diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H index 4998bc85d..3f4c92c30 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H +++ b/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" diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H index e35707ad6..f656b4018 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H index 9448dc489..e65cf8a0a 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H +++ b/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" diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H index e0759b4c6..1a907203c 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H +++ b/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" diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H b/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H index 0258cadb6..3096610de 100644 --- a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H +++ b/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"