diff --git a/etc/settings.sh b/etc/settings.sh index caad5bd3f..45c2ddcc4 100644 --- a/etc/settings.sh +++ b/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" ] diff --git a/src/decompositionMethods/Allwmake b/src/decompositionMethods/Allwmake index 788dcfc4c..c0d1c9264 100755 --- a/src/decompositionMethods/Allwmake +++ b/src/decompositionMethods/Allwmake @@ -4,7 +4,7 @@ set -x wmakeLnInclude decompositionMethods -#wmake libso scotchDecomp +wmake libso scotchDecomp wmake libso metisDecomp wmake libso parMetisDecomp diff --git a/wmake/rules/darwinIntel64/mplibSYSTEMOPENMPI b/wmake/rules/darwinIntel64/mplibSYSTEMOPENMPI new file mode 100644 index 000000000..98fa814ce --- /dev/null +++ b/wmake/rules/darwinIntel64/mplibSYSTEMOPENMPI @@ -0,0 +1 @@ +PFLAGS = -DOMPI_SKIP_MPICXX