Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.0.x

OpenFOAM · Sep 19, 2011 · 2e66330 · 2e66330
2 parents 2ee9121 + 3e04766
commit 2e66330
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/etc/config/settings.csh b/etc/config/settings.csh
@@ -480,6 +480,14 @@ case QSMPI:
     _foamAddLib     $MPI_ARCH_PATH/lib
     breaksw
 
+case SGIMPI:
+    setenv FOAM_MPI ${MPI_ROOT##*/}
+    setenv MPI_ARCH_PATH $MPI_ROOT
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+    _foamAddLib     $MPI_ARCH_PATH/lib
+    breaksw
+
 default:
     setenv FOAM_MPI dummy
     breaksw

diff --git a/etc/config/settings.sh b/etc/config/settings.sh
@@ -502,6 +502,14 @@ QSMPI)
     _foamAddLib     $MPI_ARCH_PATH/lib
     ;;
 
+SGIMPI)
+    export FOAM_MPI=${MPI_ROOT##*/}
+    export MPI_ARCH_PATH=$MPI_ROOT
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+    _foamAddLib     $MPI_ARCH_PATH/lib
+    ;;
+
 *)
     export FOAM_MPI=dummy
     ;;

diff --git a/wmake/rules/General/mplibSGIMPI b/wmake/rules/General/mplibSGIMPI
@@ -0,0 +1,3 @@
+PFLAGS     = -DSGIMPI -DMPI_NO_CPPBIND
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi