Allwmake

@@ -13,6 +13,9 @@ then
     exit 0
 fi
 
+# Disable use of openmp...
+unset without_openmp
+
 echo "========================================"
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
 echo "Starting compile of $moduleName with ${WM_PROJECT_DIR##*/} ${0##*}"
@@ -21,9 +24,9 @@ echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo "  prefix = ${FOAM_MODULE_PREFIX:-default (user)}"
 echo
 
-wmake libso meshLibrary
-wmake -all executables
-wmake -all utilities
+wmake ${without_openmp:+-no-openmp} libso meshLibrary
+wmake ${without_openmp:+-no-openmp} -all executables
+wmake ${without_openmp:+-no-openmp} -all utilities
 
 # Some summary information
 echo

executables/cartesian2DMesh/Make/options

@@ -16,6 +16,8 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
+    -lfileFormats \
+    -lsurfMesh \
     -lmeshTools \
+    -lfiniteVolume \
     -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

executables/cartesianMesh/Make/options

@@ -16,6 +16,8 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
+    -lfileFormats \
+    -lsurfMesh \
     -lmeshTools \
+    -lfiniteVolume \
     -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

executables/pMesh/Make/options

@@ -16,6 +16,8 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
+    -lfileFormats \
+    -lsurfMesh \
     -lmeshTools \
+    -lfiniteVolume \
     -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

executables/tetMesh/Make/options

@@ -16,6 +16,8 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
+    -lfileFormats \
+    -lsurfMesh \
     -lmeshTools \
+    -lfiniteVolume \
     -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

meshLibrary/Make/options

@@ -17,5 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
+    $(LINK_OPENMP) \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools

meshLibrary/tetMesh/tetMeshExtractorOctree/tetMeshExtractorOctree.C

@@ -34,10 +34,6 @@ License
 #include "polyMeshGenModifierAddCellByCell.H"
 #include "demandDrivenData.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 // #define DEBUGTets
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayers.C

@@ -41,10 +41,6 @@ License
 #include <map>
 #include <set>
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 //#define DEBUGLayer
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

meshLibrary/utilities/boundaryLayers/detectBoundaryLayers/detectBoundaryLayersFunctions.C

@@ -38,10 +38,6 @@ License
 #include "labelledPair.H"
 #include "labelledScalar.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 //#define DEBUGLayer
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C

@@ -35,10 +35,6 @@ License
 #include "meshSurfacePartitioner.H"
 #include "labelledPointScalar.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 #ifdef DEBUGExtrudeLayer
 #include "polyMeshGenChecks.H"
 #endif

meshLibrary/utilities/boundaryLayers/triangulateNonPlanarBaseFaces/triangulateNonPlanarBaseFacesFunctions.C

@@ -35,10 +35,6 @@ License
 #include "meshSurfacePartitioner.H"
 #include "triangle.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 //#define DEBUGLayer
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

meshLibrary/utilities/faceDecomposition/decomposeFaces.C

@@ -31,10 +31,6 @@ License
 #include "decomposeFaces.H"
 #include "boolList.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 //#define DEBUGDec
 
 # ifdef DEBUGDec

meshLibrary/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.C

@@ -39,10 +39,6 @@ License
 #include "HashSet.H"
 #include "demandDrivenData.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 void Foam::Module::findCellsIntersectingSurface::generateOctree

meshLibrary/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngine.C

@@ -32,10 +32,6 @@ License
 #include "polyMeshGenAddressing.H"
 #include "demandDrivenData.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 void Foam::Module::polyMeshGen2DEngine::findActiveFaces() const

meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingUpdateGeometry.C

@@ -31,10 +31,6 @@ License
 #include "polyMeshGenAddressing.H"
 #include "demandDrivenData.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-#endif
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::Module::polyMeshGenAddressing::updateGeometry

meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecks.C

@@ -37,10 +37,6 @@ License
 #include "ListOps.H"
 #include "Map.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 bool Foam::Module::polyMeshGenChecks::checkGeometry

meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C

@@ -30,10 +30,6 @@ License
 #include "tetrahedron.H"
 #include "syncTools.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 bool Foam::Module::polyMeshGenChecks::checkClosedBoundary

meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksTopology.C

@@ -33,10 +33,6 @@ License
 #include "cell.H"
 #include "Map.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 bool Foam::Module::polyMeshGenChecks::checkPoints

meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddProcessorFaces.C

@@ -31,9 +31,7 @@ License
 #include "polyMeshGenModifier.H"
 #include "demandDrivenData.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 void Foam::Module::polyMeshGenModifier::addProcessorFaces
 (

meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveCells.C

@@ -31,10 +31,6 @@ License
 #include "polyMeshGenModifier.H"
 #include "demandDrivenData.H"
 
-# ifdef USE_OMP
-#include <omp.h>
-# endif
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 void Foam::Module::polyMeshGenModifier::removeCells