Fixes for compiling 4.1 on macOS.

applications/solvers/compressible/rhoPorousSimpleFoam/Make/options

@@ -10,6 +10,7 @@ EXE_LIBS = \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -lfiniteVolume \
     -lmeshTools \
     -llduSolvers

applications/solvers/compressible/rhoSimpleFoam/Make/options

@@ -9,6 +9,7 @@ EXE_LIBS = \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -lfiniteVolume \
     -lmeshTools \
     -llduSolvers

applications/solvers/compressible/steadyCompressibleFoam/Make/options

@@ -10,4 +10,5 @@ EXE_LIBS = \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -llduSolvers

applications/solvers/compressible/steadyCompressibleMRFFoam/Make/options

@@ -10,4 +10,5 @@ EXE_LIBS = \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -llduSolvers

applications/solvers/compressible/steadyCompressibleSRFFoam/Make/options

@@ -10,4 +10,5 @@ EXE_LIBS = \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -llduSolvers

applications/solvers/compressible/steadyUniversalFoam/Make/options

@@ -10,4 +10,5 @@ EXE_LIBS = \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -llduSolvers

applications/solvers/compressible/steadyUniversalMRFFoam/Make/options

@@ -10,4 +10,5 @@ EXE_LIBS = \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -llduSolvers

applications/solvers/coupled/MRFPorousFoam/Make/options

@@ -8,5 +8,6 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -llduSolvers

applications/solvers/coupled/pUCoupledFoam/Make/options

@@ -8,5 +8,6 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -llduSolvers

applications/solvers/equationReaderDemo/Make/options

@@ -9,6 +9,6 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -lequationReader
-

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options

@@ -10,4 +10,5 @@ EXE_LIBS = \
     -lmeshTools \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -llduSolvers

applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options

@@ -10,5 +10,6 @@ EXE_LIBS = \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -lfiniteVolume \
     -llduSolvers

applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options

@@ -13,6 +13,7 @@ EXE_LIBS = \
     -lspecie \
     -lradiation \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -lfiniteVolume \
     -lmeshTools \
     -llduSolvers

applications/solvers/immersedBoundary/porousSimpleIbFoam/Make/options

@@ -10,6 +10,7 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -lmeshTools \
     -lsurfMesh \

applications/solvers/immersedBoundary/simpleIbFoam/Make/options

@@ -10,6 +10,7 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -lmeshTools \
     -lsurfMesh \

applications/solvers/incompressible/MRFSimpleFoam/Make/options

@@ -6,5 +6,6 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -llduSolvers

applications/solvers/incompressible/boundaryFoam/Make/options

@@ -9,6 +9,7 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \

applications/solvers/incompressible/channelFoam/Make/options

@@ -10,6 +10,7 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleLESModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -lmeshTools \
     -llduSolvers

applications/solvers/incompressible/porousSimpleFoam/Make/options

@@ -10,6 +10,7 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -lmeshTools \
     -llduSolvers

applications/solvers/incompressible/simpleFoam/Make/options

@@ -8,5 +8,6 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -llduSolvers

applications/solvers/incompressible/simpleSRFFoam/Make/options

@@ -6,6 +6,7 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -lmeshTools \
     -llduSolvers

applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options

@@ -9,10 +9,12 @@ EXE_INC = \
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
+    -lcompressibleTurbulenceModel \
     -lfiniteVolume

applications/utilities/postProcessing/turbulence/R/Make/options

@@ -7,4 +7,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume

applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options

@@ -7,4 +7,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume

applications/utilities/postProcessing/velocityField/Pe/Make/options

@@ -11,10 +11,12 @@ EXE_INC = \
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
     -lbasicThermophysicalModels \
     -lspecie \
+    -lcompressibleTurbulenceModel \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
     -lfiniteVolume \

applications/utilities/postProcessing/wall/wallHeatFlux/Make/options

@@ -7,6 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
+    -lcompressibleTurbulenceModel \
     -lcompressibleRASModels \
     -lreactionThermophysicalModels \
     -lfiniteVolume \

applications/utilities/postProcessing/wall/wallShearStress/Make/options

@@ -9,7 +9,9 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lbasicThermophysicalModels \
     -lspecie \
+    -lcompressibleTurbulenceModel \
     -lcompressibleRASModels \
     -lfiniteVolume

applications/utilities/postProcessing/wall/yPlusLES/Make/options

@@ -9,4 +9,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleLESModels \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume

applications/utilities/postProcessing/wall/yPlusRAS/Make/options

@@ -9,9 +9,11 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lincompressibleTransportModels \
+    -lincompressibleTurbulenceModel \
     -lincompressibleRASModels \
     -lbasicThermophysicalModels \
     -lspecie \
+    -lcompressibleTurbulenceModel \
     -lcompressibleRASModels \
     -lfiniteVolume \
     -lmeshTools \

src/OSspecific/POSIX/POSIX.C

@@ -264,10 +264,10 @@ Foam::fileNameList Foam::findEtcFiles
     fileNameList results;
 
     // Search for user files in
-    // * ~/.OpenFOAM/VERSION
+    // * ~/.foam/VERSION
-    // * ~/.OpenFOAM
+    // * ~/.foam
     //
-    fileName searchDir = home()/".OpenFOAM";
+    fileName searchDir = home()/".foam";
     if (isDir(searchDir))
     {
         fileName fullName = searchDir/FOAMversion/name;

src/foam/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C

@@ -26,6 +26,7 @@ License
 #include "dlLibraryTable.H"
 #include "OSspecific.H"
 #include "int.H"
+#include <dlfcn.h> 
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -34,6 +35,8 @@ namespace Foam
     defineTypeNameAndDebug(dlLibraryTable, 0);
 }
 
+Foam::dlLibraryTable Foam::dlLibraryTable::loadedLibraries;
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -75,24 +78,75 @@ bool Foam::dlLibraryTable::open
 {
     if (functionLibName.size())
     {
-        void* functionLibPtr = dlOpen(functionLibName, verbose);
+        void* functionLibPtr =
+            dlopen(functionLibName.c_str(), RTLD_LAZY|RTLD_GLOBAL);
 
+#ifdef darwin
+        // If failing to load under OS X, let's try some obvious variations
+        // before giving up completely
+        fileName osxFileName(functionLibName);
+
+        if(!functionLibPtr && functionLibName.ext()=="so")
+        {
+            osxFileName=functionLibName.lessExt()+".dylib";
+
+            functionLibPtr =
+                dlopen(osxFileName.c_str(), RTLD_LAZY|RTLD_GLOBAL);
+        }
+
+        // If unsuccessful, which might be the case under Mac OSX 10.11 (El
+        // Capitan) with System Integrity Protection (SIP) enabled, let's try
+        // building a full path using well-known environment variables. This is
+        // the last resort, unless you provide the full pathname yourself.
         if (!functionLibPtr)
         {
-            if (verbose)
+            fileName l_LIBBIN_Name =
-            {
+                getEnv("FOAM_LIBBIN")/osxFileName;
-                WarningInFunction
+            functionLibPtr =
-                    << "could not load " << functionLibName
+                dlopen(l_LIBBIN_Name.c_str(), RTLD_LAZY|RTLD_GLOBAL);
-                    << endl;
+        }
-            }
+        if (!functionLibPtr)
+        {
+            fileName l_SITE_LIBBIN_Name =
+                getEnv("FOAM_SITE_LIBBIN")/osxFileName;
+            functionLibPtr =
+                dlopen(l_SITE_LIBBIN_Name.c_str(), RTLD_LAZY|RTLD_GLOBAL);
+        }
+        if (!functionLibPtr)
+        {
+            fileName l_USER_LIBBIN_Name =
+                getEnv("FOAM_USER_LIBBIN")/osxFileName;
+            functionLibPtr =
+                dlopen(l_USER_LIBBIN_Name.c_str(), RTLD_LAZY|RTLD_GLOBAL);
+        }
+#elif defined mingw
+        if(!functionLibPtr && functionLibName.ext()=="so") {
+            fileName lName=functionLibName.lessExt()+".dll";
+            functionLibPtr =
+                dlopen(lName.c_str(), RTLD_LAZY|RTLD_GLOBAL);
+        }
+#endif
+        if (!functionLibPtr)
+        {
+            WarningIn
+            (
+                "dlLibraryTable::open(const fileName& functionLibName)"
+            )   << "could not load " << dlerror()
+                << endl;
 
             return false;
         }
         else
         {
-            libPtrs_.append(functionLibPtr);
+            if (!loadedLibraries.found(functionLibPtr))
-            libNames_.append(functionLibName);
+            {
-            return true;
+                loadedLibraries.insert(functionLibPtr, functionLibName);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
         }
     }
     else

src/foam/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H

@@ -37,6 +37,8 @@ SourceFiles
 
 #include "label.H"
 #include "DynamicList.H"
+#include "Hash.H"
+#include "HashTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,6 +50,8 @@ namespace Foam
 \*---------------------------------------------------------------------------*/
 
 class dlLibraryTable
+:
+    public HashTable<fileName, void*, Hash<void*> >
 {
     // Private Member Functions
 
@@ -68,6 +72,12 @@ public:
     // Declare name of the class and its debug switch
     ClassName("dlLibraryTable");
 
+    // Static data members
+
+        //- Static data someStaticData
+        static dlLibraryTable loadedLibraries;
+
+
     // Constructors
 
         //- Construct null

src/foam/global/argList/argList.C

@@ -1145,7 +1145,7 @@ void Foam::argList::printUsage() const
     printNotes();
 
     Info<< nl
-        <<"Using: OpenFOAM-" << Foam::FOAMversion
+        <<"Using: foam-extend-" << Foam::FOAMversion
         << " (see www.foam-extend.org)" << nl
         <<"Build: " << Foam::FOAMbuild << nl
         << endl;

wmake/rules/darwinIntel64Gcc/c++

@@ -1,6 +1,6 @@
 .SUFFIXES: .C .cxx .cc .cpp
 
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-overloaded-virtual -Wno-unsequenced -Wno-c++11-extensions -Wno-unused-comparison
+c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-overloaded-virtual -Wno-unsequenced -Wno-c++11-extensions -Wno-unused-comparison -Wno-undefined-var-template
 
 CC          = $(WM_CXX) $(WM_CXXFLAGS) -ftrapping-math