From 49358044792b72cadad9c9c81b52b8c62d7a863a Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 12 Oct 2010 08:51:26 +0100
Subject: [PATCH 1/2] Formatting

---
 applications/solvers/multiphase/cavitatingFoam/pEqn.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index 816928626..710487d0f 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -37,7 +37,7 @@
           - fvm::laplacian(rUAf, p)
         );
 
-        if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
+        if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
         {
             pEqn.solve(mesh.solver(p.name() + "Final"));
         }

From db148bed7145ca24859f19f91984ec16a3cfa495 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 12 Oct 2010 08:53:05 +0100
Subject: [PATCH 2/2] Mac OS X updates

---
 etc/settings.sh | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/etc/settings.sh b/etc/settings.sh
index c6f17b094..5507b251b 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -47,6 +47,10 @@ _foamAddLib()
     while [ $# -ge 1 ]
     do
         export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
+	if [ "$WM_ARCH" == "darwinIntel" ]
+	then
+	    export DYLD_LIBRARY_PATH=$1:$DYLD_LIBRARY_PATH
+	fi
         shift
     done
 }
@@ -168,15 +172,24 @@ unset MPI_ARCH_PATH
 
 case "$WM_MPLIB" in
 OPENMPI)
-    mpi_version=openmpi-1.4.1
-    export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
-    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
+    if [ "$WM_ARCH" == "darwinIntel" ]
+	then
+	mpi_version=openmpi-system
+	export MPI_HOME=/usr
+	export MPI_ARCH_PATH=/usr
 
-    # Tell OpenMPI where to find its install directory
-    export OPAL_PREFIX=$MPI_ARCH_PATH
+	unset OPAL_PREFIX
+    else
+	mpi_version=openmpi-1.4.1
+        export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
+        export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
 
-    _foamAddPath $MPI_ARCH_PATH/bin
-    _foamAddLib  $MPI_ARCH_PATH/lib
+        # Tell OpenMPI where to find its install directory
+        export OPAL_PREFIX=$MPI_ARCH_PATH
+
+        _foamAddPath $MPI_ARCH_PATH/bin
+        _foamAddLib  $MPI_ARCH_PATH/lib
+    fi
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -317,6 +330,16 @@ export MPI_BUFFER_SIZE
 #    export LD_PRELOAD=$FOAM_LIBBIN/libhoard.so:$LD_PRELOAD
 #fi
 
+# HOARD seems to crash Paraview on Mac OS X 10.6
+#if [ -f $FOAM_LIBBIN/libhoard.dylib ]
+#then
+#    if [ -z "$DYLD_INSERT_LIBRARIES" ]
+#    then
+#	export DYLD_INSERT_LIBRARIES=$FOAM_LIBBIN/libhoard.dylib
+#    else
+#	export DYLD_INSERT_LIBRARIES=$FOAM_LIBBIN/libhoard.dylib:$DYLD_INSERT_LIBRARIES
+#    fi
+#fi
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~