Use the System-MPI (switch on via prefs.sh)

--HG--
branch : macMerge

etc/settings.sh

@@ -189,9 +189,12 @@ OPENMPI)
 SYSTEMOPENMPI)
     mpi_version=openmpi-system
 
+    # make sure not the "old" mpi is used 
+    export OPAL_PREFIX=
+
     # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
     export PINC=`mpicc --showme:compile` 
-    export PLIBS=`mpicc --showme:link`
+    export PLIBS="`mpicc --showme:link`"
     libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
 
     if [ "$FOAM_VERBOSE" -a "$PS1" ]

src/decompositionMethods/Allwmake

@@ -4,7 +4,7 @@ set -x
 
 wmakeLnInclude decompositionMethods
 
-#wmake libso scotchDecomp
+wmake libso scotchDecomp
 wmake libso metisDecomp
 wmake libso parMetisDecomp
 

wmake/rules/darwinIntel64/mplibSYSTEMOPENMPI

@@ -0,0 +1 @@
+PFLAGS     = -DOMPI_SKIP_MPICXX