From b2ad57c69b9deafb1e854f4ab6ce1dbb3b38c1ad Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Sat, 28 Mar 2009 19:53:06 +0000
Subject: [PATCH] Added basic support for QsNet.
---
etc/bashrc | 8 +-------
etc/cshrc | 8 +-------
etc/settings.csh | 9 +++++++++
etc/settings.sh | 9 +++++++++
wmake/rules/linux64Gcc/mplibQSMPI | 4 ++++
5 files changed, 24 insertions(+), 14 deletions(-)
create mode 100644 wmake/rules/linux64Gcc/mplibQSMPI
diff --git a/etc/bashrc b/etc/bashrc
index e9f9c6f9cf8..ce10b39e78f 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -77,12 +77,6 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
-# Operating System/Platform from Unix or MSWindows
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# WM_OS = Unix | MSWindows
-: ${WM_OS:=Unix}; export WM_OS
-
-
# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
: ${WM_COMPILER:=Gcc}; export WM_COMPILER
@@ -105,7 +99,7 @@ export WM_COMPILER_LIB_ARCH=
# WM_JAVAC_OPTION = Opt | Debug
: ${WM_JAVAC_OPTION:=Opt}; export WM_JAVAC_OPTION
-# WM_MPLIB = | OPENMPI | LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI
+# WM_MPLIB = | OPENMPI | LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
: ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
diff --git a/etc/cshrc b/etc/cshrc
index bcda5b6318d..a46cf3ee475 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -71,12 +71,6 @@ setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
-# Operating System/Platform from Unix or MSWindows
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# WM_OS = Unix | MSWindows
-if ( ! $?WM_OS ) setenv WM_OS Unix
-
-
# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc
@@ -99,7 +93,7 @@ if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
# WM_JAVAC_OPTION = Opt | Debug
if ( ! $?WM_JAVAC_OPTION ) setenv WM_JAVAC_OPTION Opt
-# WM_MPLIB = | OPENMPI | LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI
+# WM_MPLIB = | OPENMPI | LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI
diff --git a/etc/settings.csh b/etc/settings.csh
index 688ade5408b..d36a91ad5b0 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -231,6 +231,15 @@ case FJMPI:
_foamAddLib /opt/FJSVpnidt/lib
breaksw
+case QSMPI:
+ setenv MPI_ARCH_PATH /usr/lib/mpi
+ setenv FOAM_MPI_LIBBIN FOAM_LIBBIN/qsmpi
+
+ _foamAddPath $MPI_ARCH_PATH/bin
+ _foamAddLib $MPI_ARCH_PATH/lib
+
+ breaksw
+
default:
setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/dummy
breaksw
diff --git a/etc/settings.sh b/etc/settings.sh
index 240b0036a06..046f624cdef 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -259,6 +259,15 @@ FJMPI)
_foamAddLib /opt/FJSVpnidt/lib
;;
+QSMPI)
+ export MPI_ARCH_PATH=/usr/lib/mpi
+ export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/qsmpi
+
+ _foamAddPath $MPI_ARCH_PATH/bin
+ _foamAddLib $MPI_ARCH_PATH/lib
+
+ ;;
+
*)
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/dummy
;;
diff --git a/wmake/rules/linux64Gcc/mplibQSMPI b/wmake/rules/linux64Gcc/mplibQSMPI
new file mode 100644
index 00000000000..95ea327379f
--- /dev/null
+++ b/wmake/rules/linux64Gcc/mplibQSMPI
@@ -0,0 +1,4 @@
+PFLAGS =
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
+
--
GitLab