Merge with default. On the Mac the Apple-OpenMPI is chosen if the type is set to SYSTEMOPENMPI. Otherwise the thirdParty-stuff

--HG--
branch : macMerge

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"));
         }

etc/settings.sh

@@ -324,6 +324,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:
 # ~~~~~~~~~~~~~~~~~~~~