OpenFOAM · AliShiehnejadhesar · Feb 24, 2014 · Mar 10, 2014 · Mar 10, 2014 · Mar 10, 2014
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ core
 lnInclude
 
 # build directories - anywhere
+darwinIntel64Gcc*/
 linux*Clang*/
 linux*Gcc*/
 linux*Icc*/

diff --git a/OpenFOAM-2.3.x-Mac.patch b/OpenFOAM-2.3.x-Mac.patch
diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
@@ -36,8 +36,10 @@ EXE_LIBS = \
     -lsampling \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
+    -lcompressibleTurbulenceModel \
     -lspecie \
     -lfluidThermophysicalModels \
+    -lliquidProperties \
     -lsolidProperties \
     -lsolidMixtureProperties \
     -lthermophysicalFunctions \
@@ -53,5 +55,6 @@ EXE_LIBS = \
     -lpyrolysisModels \
     -lregionCoupling \
     -llagrangianIntermediate \
+    -llagrangian \
     -llagrangianTurbulence \
     -lODE
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
@@ -13,6 +13,7 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@@ -21,6 +21,7 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lsolidThermo \
     -lspecie \
+    -lmeshTools \
     -lcompressibleTurbulenceModel \
     -lcompressibleRASModels \
     -lcompressibleLESModels \

diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
+    -lincompressibleTurbulenceModel \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
     -lfiniteVolume
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
@@ -11,6 +11,7 @@ EXE_INC = \
 
 
 EXE_LIBS = \
+    -lincompressibleTurbulenceModel \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \

diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
@@ -21,6 +21,7 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lradiationModels \
+    -lincompressibleTurbulenceModel \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
     -lincompressibleTransportModels \

diff --git a/...agrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/...agrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -27,6 +27,7 @@ EXE_LIBS = \
     -lradiationModels \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
+    -lincompressibleTurbulenceModel \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \

diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -30,6 +30,7 @@ EXE_LIBS = \
     -lfvOptions \
     -lsampling \
     -lmeshTools \
+    -lcompressibleTurbulenceModel \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
     -lspecie \
@@ -44,6 +45,8 @@ EXE_LIBS = \
     -lradiationModels \
     -lsurfaceFilmModels \
     -lsurfaceFilmDerivedFvPatchFields \
+    -lliquidProperties \
+    -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
     -lODE \

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
@@ -17,6 +17,7 @@ EXE_LIBS = \
     -linterfaceProperties \
     -lincompressibleTransportModels \
     -lcompressibleMultiphaseEulerianInterfacialModels \
+    -lincompressibleTurbulenceModel \
     -lincompressibleLESModels \
     -lincompressibleRASModels \
     -lfiniteVolume
diff --git a/applications/utilities/mesh/generation/blockMesh/Make/options b/applications/utilities/mesh/generation/blockMesh/Make/options
@@ -6,4 +6,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lblockMesh \
     -lmeshTools \
+    -lfiniteVolume \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options
@@ -27,6 +27,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    -lboost_thread-mt \
+    -lgmp \
     -lextrude2DMesh \
     -lextrudeModel \
     -lcv2DMesh \

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    /* -g -DFULLDEBUG -O0 */ \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    /* -DFULLDEBUG -g -O0 */ \
     ${COMPILE_FLAGS} \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \

diff --git a/applications/utilities/miscellaneous/expandDictionary/Make/options b/applications/utilities/miscellaneous/expandDictionary/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = */
-/* EXE_LIBS = */

diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -42,10 +42,8 @@ EXE_LIBS = \
     -lmeshTools \
     -lmolecularMeasurements \
     -lmolecule \
-/*    -lmultiphaseInterFoam  */ \
     -lODE \
     -lOpenFOAM \
-/*    -lphaseModel  */ \
     -lpotential \
     -lradiationModels \
     -lrandomProcesses \

diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/Make/options b/applications/utilities/parallelProcessing/reconstructParMesh/Make/options
@@ -4,5 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
+    -lfiniteVolume \
     -ldynamicMesh \
     -lmeshTools
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    /* -DFULLDEBUG -g -O0 */ \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -11,4 +10,3 @@ EXE_LIBS = \
     -lsampling \
     -lgenericPatchFields \
     -llagrangian
-
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
@@ -12,10 +12,12 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
+    -lincompressibleTurbulenceModel \
     -lfluidThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
+    -lcompressibleTurbulenceModel \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \

diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -8,10 +8,12 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
+    -lincompressibleTurbulenceModel \
     -lincompressibleTransportModels \
     -lincompressibleRASModels \
     -lfluidThermophysicalModels \
     -lspecie \
+    -lcompressibleTurbulenceModel \
     -lcompressibleRASModels \
     -lfiniteVolume \
     -lgenericPatchFields \

diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@@ -5,6 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
+    -lincompressibleTurbulenceModel \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \

diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options
@@ -12,10 +12,12 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
+    -lincompressibleTurbulenceModel \
     -lfluidThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
+    -lcompressibleTurbulenceModel \
     -lfiniteVolume \
     -lgenericPatchFields \
     -lmeshTools
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -7,8 +7,10 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleTransportModels \
     -lincompressibleRASModels \
+    -lincompressibleTurbulenceModel \
     -lfluidThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -lfiniteVolume \
     -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/Make/options b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
@@ -8,6 +8,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lincompressibleLESModels \
+    -lincompressibleTurbulenceModel \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
@@ -10,9 +10,11 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleTransportModels \
     -lincompressibleRASModels \
+    -lincompressibleTurbulenceModel \
     -lfluidThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
+    -lcompressibleTurbulenceModel \
     -lfiniteVolume \
     -lgenericPatchFields \
     -lmeshTools \

diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
@@ -8,6 +8,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lincompressibleTurbulenceModel \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
     -lincompressibleTransportModels \

diff --git a/bin/addr2line4Mac.py b/bin/addr2line4Mac.py
@@ -0,0 +1,49 @@
+#! /usr/bin/python
+
+import sys
+filename=sys.argv[1]
+address=sys.argv[2]
+import re
+from os import environ,path
+
+fullFile=None
+if path.exists(filename):
+    fullFile=filename
+
+for v in ["PATH","LD_LIBRARY_PATH"]:
+    if not fullFile:
+        for d in environ[v].split(':'):
+            if path.exists(path.join(d,filename)):
+                fullFile=path.join(d,filename)
+                break
+
+if not fullFile:
+    fullFile=filename
+
+answer="??:0"
+
+if path.exists(fullFile):
+    import subprocess
+
+    result=subprocess.Popen(["xcrun", "atos",
+                             "-o",fullFile,
+                             address],
+                            stdout=subprocess.PIPE
+                        ).communicate()[0]
+    match=re.compile('.+ \((.+)\) \((.+)\)').match(result)
+    if match:
+        answer=match.group(2)+" "+match.group(1)
+    else:
+        import os
+        result=subprocess.Popen(["xcrun", "atos",
+                                 "-p",str(os.getppid()),
+                                 address],
+                                stdout=subprocess.PIPE
+                            ).communicate()[0]
+        match=re.compile('.+ \((.+)\) \((.+)\)').match(result)
+        if match:
+            answer=match.group(2)+" "+match.group(1)
+
+print answer,
+
+sys.exit(255)
diff --git a/etc/bashrc b/etc/bashrc
@@ -63,7 +63,7 @@ foamCompiler=system
 
 #- Compiler:
 #    WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Clang | Icc (Intel icc)
-export WM_COMPILER=Gcc
+export WM_COMPILER=Gcc47
 unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 
 #- Architecture:
@@ -81,7 +81,7 @@ export WM_COMPILE_OPTION=Opt
 #- MPI implementation:
 #    WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI
 #               | GAMMA | MPI | QSMPI | SGIMPI
-export WM_MPLIB=OPENMPI
+export WM_MPLIB=SYSTEMOPENMPI
 
 #- Operating System:
 #    WM_OSTYPE = POSIX | ???
@@ -199,6 +199,10 @@ cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` \
 
 #- Clean MANPATH
 cleaned=`$foamClean "$MANPATH" "$foamOldDirs"` && MANPATH="$cleaned"
+if [[ `uname -s` == "Darwin" ]]
+then
+    cleaned=`$foamClean "$DYLD_LIBRARY_PATH" "$foamOldDirs"` && DYLD_LIBRARY_PATH="$cleaned"
+fi
 
 export PATH LD_LIBRARY_PATH MANPATH
 
@@ -237,10 +241,24 @@ then
     export LD_PRELOAD
 fi
 
+if [[ `uname -s` == "Darwin" ]]
+then
+    if [[ `ulimit -n` == "unlimited" || `ulimit -n` < 8192 ]]
+    then
+	# higher limit needed for wmkdeps
+	ulimit -n 8192
+    fi
+fi
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
 unset cleaned foamClean foamInstall foamOldDirs
 unset _foamSource _foamEval
 
 # ----------------------------------------------------------------- end-of-file
+
+export WM_CC='gcc-mp-4.7'
+export WM_CXX='g++-mp-4.7'
+export WM_NCOMPPROCS=4
+ulimit -n 1024
+
diff --git a/etc/config/CGAL.sh b/etc/config/CGAL.sh
@@ -35,6 +35,22 @@ cgal_version=CGAL-4.3
 export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
 
+if [ -n "$WM_USE_MACPORT" ]
+then
+    if [ -d "/opt/local/include/boost" ]
+    then
+	export BOOST_ARCH_PATH=/opt/local
+    else
+	echo "No boost in MacPorts. Install boost with 'port install boost'"
+    fi
+    if [ -d "/opt/local/include/CGAL" ]
+    then
+	export CGAL_ARCH_PATH=/opt/local
+    else
+	echo "No CGAL in MacPorts. Install CGAL with 'port install cgal'"
+    fi
+fi
+
 if [ "$FOAM_VERBOSE" -a "$PS1" ]
 then
     echo "Using CGAL and boost"

diff --git a/etc/config/metis.sh b/etc/config/metis.sh
@@ -36,4 +36,15 @@
 export METIS_VERSION=metis-5.1.0
 export METIS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$METIS_VERSION
 
+if [ -n "$WM_USE_MACPORT" ]
+then
+    if [ -e "/opt/local/include/metis.h" ]
+    then
+	export METIS_ARCH_PATH=/opt/local
+	unset METIS_VERSION
+    else
+	echo "No metis in MacPorts. Install metis with 'port install metis'"
+    fi
+fi
+
 # -----------------------------------------------------------------------------