From 14fefb0554ec256d796fe958811efd85e6e2ec37 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 5 Jun 2008 10:53:44 +0200
Subject: [PATCH] Use uniform MPI_ARCH_PATH instead of
{OPENMPI,LAM,..}_ARCH_PATH
---
bin/foamInstallationTest | 5 +-
etc/settings.csh | 62 +++++++++----------
etc/settings.sh | 85 ++++++++++++--------------
wmake/rules/General/mplibMPICH | 4 +-
wmake/rules/linux64Gcc/mplibGAMMA | 4 +-
wmake/rules/linux64Gcc/mplibLAM | 4 +-
wmake/rules/linux64Gcc/mplibMPICH | 4 +-
wmake/rules/linux64Gcc/mplibMPICH-GM | 4 +-
wmake/rules/linux64Gcc/mplibOPENMPI | 4 +-
wmake/rules/linux64Gcc43/mplibGAMMA | 4 +-
wmake/rules/linux64Gcc43/mplibLAM | 4 +-
wmake/rules/linux64Gcc43/mplibMPICH | 4 +-
wmake/rules/linux64Gcc43/mplibMPICH-GM | 4 +-
wmake/rules/linux64Gcc43/mplibOPENMPI | 4 +-
wmake/rules/linux64Icc/mplibLAM | 4 +-
wmake/rules/linux64Icc/mplibMPICH | 4 +-
wmake/rules/linux64Icc/mplibOPENMPI | 4 +-
wmake/rules/linuxGcc/mplibGAMMA | 4 +-
wmake/rules/linuxGcc/mplibLAM | 4 +-
wmake/rules/linuxGcc/mplibMPICH | 4 +-
wmake/rules/linuxGcc/mplibMPICH-GM | 4 +-
wmake/rules/linuxGcc/mplibOPENMPI | 4 +-
wmake/rules/linuxGcc43/mplibGAMMA | 4 +-
wmake/rules/linuxGcc43/mplibLAM | 4 +-
wmake/rules/linuxGcc43/mplibMPICH | 4 +-
wmake/rules/linuxGcc43/mplibMPICH-GM | 4 +-
wmake/rules/linuxGcc43/mplibOPENMPI | 4 +-
wmake/rules/linuxIA64Gcc/mplibLAM | 4 +-
wmake/rules/linuxIA64Gcc/mplibMPICH | 4 +-
wmake/rules/linuxIA64Gcc/mplibOPENMPI | 4 +-
wmake/rules/linuxIA64Icc/mplibLAM | 4 +-
wmake/rules/linuxIA64Icc/mplibMPICH | 4 +-
wmake/rules/linuxIA64Icc/mplibOPENMPI | 4 +-
wmake/rules/linuxIcc/mplibLAM | 4 +-
wmake/rules/linuxIcc/mplibMPICH | 4 +-
wmake/rules/linuxIcc/mplibOPENMPI | 4 +-
wmake/rules/linuxmingw32/mplibGAMMA | 4 +-
wmake/rules/linuxmingw32/mplibLAM | 4 +-
wmake/rules/linuxmingw32/mplibMPICH | 4 +-
wmake/rules/linuxmingw32/mplibMPICH-GM | 4 +-
wmake/rules/linuxmingw32/mplibOPENMPI | 4 +-
wmake/rules/solarisGcc/mplibLAM | 4 +-
wmake/rules/solarisGcc/mplibMPICH | 4 +-
wmake/rules/solarisGcc/mplibOPENMPI | 4 +-
44 files changed, 153 insertions(+), 163 deletions(-)
diff --git a/bin/foamInstallationTest b/bin/foamInstallationTest
index 72fc06e112f..5a6980ddcec 100755
--- a/bin/foamInstallationTest
+++ b/bin/foamInstallationTest
@@ -532,8 +532,7 @@ reportEnv '$WM_DIR' '$PATH' "yes"
reportEnv '$CEI_HOME' '$PATH' "no"
echo ""
reportEnv '$JAVA_PATH' '$PATH' "no"
-reportEnv '$LAM_ARCH_PATH' '$PATH' "yes"
-reportEnv '$MPICH_ARCH_PATH' '$PATH' "no"
+reportEnv '$MPI_ARCH_PATH' '$PATH' "yes"
hline #--------------------
#
heading "Checking the FOAM env variables set on the LD_LIBRARY_PATH..."
@@ -543,7 +542,7 @@ echo "$COL1 $COL2 $COL3 $COL4 $COL5"
hline #--------------------
reportEnv '$FOAM_LIBBIN' '$LD_LIBRARY_PATH' "yes"
reportEnv '$FOAM_USER_LIBBIN' '$LD_LIBRARY_PATH' "no"
-reportEnv '$LAM_ARCH_PATH' '$LD_LIBRARY_PATH' "yes"
+reportEnv '$MPI_ARCH_PATH' '$LD_LIBRARY_PATH' "yes"
hline #--------------------
#
heading "Software versions"
diff --git a/etc/settings.csh b/etc/settings.csh
index ae04e5b7d21..865d486ad07 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -132,62 +132,59 @@ endif
switch ("$WM_MPLIB")
case OPENMPI:
- set ompi_version=openmpi-1.2.6
- setenv OPENMPI_ARCH_PATH $thirdParty/$ompi_version/platforms/$WM_OPTIONS
- setenv MPI_ARCH_PATH $OPENMPI_ARCH_PATH
+ set mpi_version=openmpi-1.2.6
+ setenv MPI_ARCH_PATH $thirdParty/$mpi_version/platforms/$WM_OPTIONS
# Tell OpenMPI where to find its install directory
- setenv OPAL_PREFIX $OPENMPI_ARCH_PATH
+ setenv OPAL_PREFIX $MPI_ARCH_PATH
- AddLib $OPENMPI_ARCH_PATH/lib
- AddPath $OPENMPI_ARCH_PATH/bin
+ AddLib $MPI_ARCH_PATH/lib
+ AddPath $MPI_ARCH_PATH/bin
- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$ompi_version
- unset ompi_version
+ setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+ unset mpi_version
breaksw
case LAM:
- set lam_version=lam-7.1.4
- setenv LAMHOME $thirdParty/$lam_version
- setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
- setenv MPI_ARCH_PATH $LAM_ARCH_PATH
+ set mpi_version=lam-7.1.4
+ setenv MPI_ARCH_PATH $thirdParty/$mpi_version/platforms/$WM_OPTIONS
+ setenv LAMHOME $thirdParty/$mpi_version
+ # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
- AddLib $LAM_ARCH_PATH/lib
- AddPath $LAM_ARCH_PATH/bin
+ AddLib $MPI_ARCH_PATH/lib
+ AddPath $MPI_ARCH_PATH/bin
- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$lam_version
- unset lam_version
+ setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+ unset mpi_version
breaksw
case MPICH:
- set mpich_version=mpich-1.2.4
- setenv MPICH_ARCH_PATH $thirdParty/$mpich_version/platforms/$WM_OPTIONS
- setenv MPICH_ROOT $MPICH_ARCH_PATH
- setenv MPI_ARCH_PATH $MPICH_ARCH_PATH
+ set mpi_version=mpich-1.2.4
+ setenv MPI_ARCH_PATH $thirdParty/$mpi_version/platforms/$WM_OPTIONS
+ setenv MPICH_ROOT $MPI_ARCH_PATH
- AddLib $MPICH_ARCH_PATH/lib
- AddPath $MPICH_ARCH_PATH/bin
+ AddLib $MPI_ARCH_PATH/lib
+ AddPath $MPI_ARCH_PATH/bin
- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpich_version
- unset mpich_version
+ setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+ unset mpi_version
breaksw
case MPICH-GM:
- setenv MPICH_PATH /opt/mpi
- setenv MPICH_ARCH_PATH $MPICH_PATH
- setenv MPICH_ROOT $MPICH_ARCH_PATH
+ setenv MPI_ARCH_PATH /opt/mpi
+ setenv MPICH_PATH $MPI_ARCH_PATH
+ setenv MPICH_ROOT $MPI_ARCH_PATH
setenv GM_LIB_PATH /opt/gm/lib64
- setenv MPI_ARCH_PATH $MPICH_ARCH_PATH
- AddLib $MPICH_ARCH_PATH/lib
- AddLib $GM_LIB_PATH
- AddPath $MPICH_ARCH_PATH/bin
+ AddLib $MPI_ARCH_PATH/lib
+ AddLib $GM_LIB_PATH
+ AddPath $MPI_ARCH_PATH/bin
setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpich-gm
breaksw
case GAMMA:
- setenv GAMMA_ARCH_PATH /usr
+ setenv MPI_ARCH_PATH /usr
setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/gamma
breaksw
@@ -222,5 +219,4 @@ endif
# setenv LD_PRELOAD $FOAM_LIBBIN/libhoard.so:${LD_PRELOAD}
#endif
-
# -----------------------------------------------------------------------------
diff --git a/etc/settings.sh b/etc/settings.sh
index bf202613e8b..1c971323b35 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -39,18 +39,22 @@ fi
AddPath()
{
- if [ $# -ge 1 ]; then
+ while [ $# -ge 1 ]
+ do
[ -d $1 ] || mkdir -p $1
export PATH=$1:$PATH
- fi
+ shift
+ done
}
AddLib()
{
- if [ $# -ge 1 ]; then
+ while [ $# -ge 1 ]
+ do
[ -d $1 ] || mkdir -p $1
export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
- fi
+ shift
+ done
}
@@ -91,7 +95,6 @@ export FOAM_RUN=$WM_PROJECT_USER_DIR/run
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
-
# Compiler settings
# ~~~~~~~~~~~~~~~~~
WM_COMPILER_BIN=
@@ -117,7 +120,7 @@ OpenFOAM)
if [ ! -d "$WM_COMPILER_DIR" ]
then
echo
- echo "Warning in $1:"
+ echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
echo " Cannot find $WM_COMPILER_DIR installation."
echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the WM_COMPILER_INST setting to 'System' in this file"
@@ -135,73 +138,66 @@ if [ "$WM_COMPILER_BIN" != "" ]; then
fi
-# Third-party software
-# ~~~~~~~~~~~~~~~~~~~~
-thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
-
-
# Communications library
# ~~~~~~~~~~~~~~~~~~~~~~
+unset MPI_ARCH_PATH
+
case "$WM_MPLIB" in
OPENMPI)
- ompi_version=openmpi-1.2.6
- export OPENMPI_ARCH_PATH=$thirdParty/$ompi_version/platforms/$WM_OPTIONS
- export MPI_ARCH_PATH=$OPENMPI_ARCH_PATH
+ mpi_version=openmpi-1.2.6
+ export MPI_ARCH_PATH=$thirdParty/$mpi_version/platforms/$WM_OPTIONS
# Tell OpenMPI where to find its install directory
- export OPAL_PREFIX=$OPENMPI_ARCH_PATH
+ export OPAL_PREFIX=$MPI_ARCH_PATH
- AddLib $OPENMPI_ARCH_PATH/lib
- AddPath $OPENMPI_ARCH_PATH/bin
+ AddLib $MPI_ARCH_PATH/lib
+ AddPath $MPI_ARCH_PATH/bin
- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$ompi_version
- unset ompi_version
+ export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+ unset mpi_version
;;
LAM)
- lam_version=lam-7.1.4
- export LAMHOME=$thirdParty/$lam_version
- export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
- export MPI_ARCH_PATH=$LAM_ARCH_PATH
+ mpi_version=lam-7.1.4
+ export MPI_ARCH_PATH=$thirdParty/$mpi_version/platforms/$WM_OPTIONS
+ export LAMHOME=$thirdParty/$mpi_version
+ # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
- AddLib $LAM_ARCH_PATH/lib
- AddPath $LAM_ARCH_PATH/bin
+ AddLib $MPI_ARCH_PATH/lib
+ AddPath $MPI_ARCH_PATH/bin
- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$lam_version
- unset lam_version
+ export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+ unset mpi_version
;;
MPICH)
- mpich_version=mpich-1.2.4
- export MPICH_ARCH_PATH=$thirdParty/$mpich_version/platforms/$WM_OPTIONS
- export MPICH_ROOT=$MPICH_ARCH_PATH
- export MPI_ARCH_PATH=$MPICH_ARCH_PATH
+ mpi_version=mpich-1.2.4
+ export MPI_ARCH_PATH=$thirdParty/$mpi_version/platforms/$WM_OPTIONS
+ export MPICH_ROOT=$MPI_ARCH_PATH
- AddLib $MPICH_ARCH_PATH/lib
- AddPath $MPICH_ARCH_PATH/bin
+ AddLib $MPI_ARCH_PATH/lib
+ AddPath $MPI_ARCH_PATH/bin
- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpich_version
- unset mpich_version
+ export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+ unset mpi_version
;;
MPICH-GM)
- export MPICH_PATH=/opt/mpi
- export MPICH_ARCH_PATH=$MPICH_PATH
- export MPICH_ROOT=$MPICH_ARCH_PATH
+ export MPI_ARCH_PATH=/opt/mpi
+ export MPICH_PATH=$MPI_ARCH_PATH
+ export MPICH_ROOT=$MPI_ARCH_PATH
export GM_LIB_PATH=/opt/gm/lib64
- export MPI_ARCH_PATH=$MPICH_ARCH_PATH
- AddLib $MPICH_ARCH_PATH/lib
- AddLib $GM_LIB_PATH
- AddPath $MPICH_ARCH_PATH/bin
+ AddLib $MPI_ARCH_PATH/lib
+ AddLib $GM_LIB_PATH
+ AddPath $MPI_ARCH_PATH/bin
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-gm
;;
GAMMA)
- export GAMMA_ARCH_PATH=/usr
-
+ export MPI_ARCH_PATH=/usr
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/gamma
;;
@@ -234,5 +230,4 @@ export MPI_BUFFER_SIZE=20000000
# export LD_PRELOAD=$FOAM_LIBBIN/libhoard.so:$LD_PRELOAD
#fi
-
# -----------------------------------------------------------------------------
diff --git a/wmake/rules/General/mplibMPICH b/wmake/rules/General/mplibMPICH
index d586ba3e039..ac17f7c1d2e 100644
--- a/wmake/rules/General/mplibMPICH
+++ b/wmake/rules/General/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA
index dc67a60a0bf..d62c6250ff4 100644
--- a/wmake/rules/linux64Gcc/mplibGAMMA
+++ b/wmake/rules/linux64Gcc/mplibGAMMA
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(GAMMA_ARCH_PATH)/include
-PLIBS = -L$(GAMMA_ARCH_PATH)/lib -lgamma
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc/mplibLAM b/wmake/rules/linux64Gcc/mplibLAM
index ce18f758601..6762b843c12 100644
--- a/wmake/rules/linux64Gcc/mplibLAM
+++ b/wmake/rules/linux64Gcc/mplibLAM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(LAM_ARCH_PATH)/include
-PLIBS = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH
index d586ba3e039..ac17f7c1d2e 100644
--- a/wmake/rules/linux64Gcc/mplibMPICH
+++ b/wmake/rules/linux64Gcc/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc/mplibMPICH-GM b/wmake/rules/linux64Gcc/mplibMPICH-GM
index 74fd9658087..88493ebc705 100644
--- a/wmake/rules/linux64Gcc/mplibMPICH-GM
+++ b/wmake/rules/linux64Gcc/mplibMPICH-GM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linux64Gcc/mplibOPENMPI b/wmake/rules/linux64Gcc/mplibOPENMPI
index ea9b4d22993..834d2d3e22a 100644
--- a/wmake/rules/linux64Gcc/mplibOPENMPI
+++ b/wmake/rules/linux64Gcc/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
-PINC = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA
index dc67a60a0bf..d62c6250ff4 100644
--- a/wmake/rules/linux64Gcc43/mplibGAMMA
+++ b/wmake/rules/linux64Gcc43/mplibGAMMA
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(GAMMA_ARCH_PATH)/include
-PLIBS = -L$(GAMMA_ARCH_PATH)/lib -lgamma
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc43/mplibLAM b/wmake/rules/linux64Gcc43/mplibLAM
index ce18f758601..6762b843c12 100644
--- a/wmake/rules/linux64Gcc43/mplibLAM
+++ b/wmake/rules/linux64Gcc43/mplibLAM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(LAM_ARCH_PATH)/include
-PLIBS = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH
index d586ba3e039..ac17f7c1d2e 100644
--- a/wmake/rules/linux64Gcc43/mplibMPICH
+++ b/wmake/rules/linux64Gcc43/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc43/mplibMPICH-GM
index 74fd9658087..88493ebc705 100644
--- a/wmake/rules/linux64Gcc43/mplibMPICH-GM
+++ b/wmake/rules/linux64Gcc43/mplibMPICH-GM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI
index ea9b4d22993..834d2d3e22a 100644
--- a/wmake/rules/linux64Gcc43/mplibOPENMPI
+++ b/wmake/rules/linux64Gcc43/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
-PINC = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linux64Icc/mplibLAM b/wmake/rules/linux64Icc/mplibLAM
index 92290b21b5c..9fa7c2752ed 100644
--- a/wmake/rules/linux64Icc/mplibLAM
+++ b/wmake/rules/linux64Icc/mplibLAM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(LAM_ARCH_PATH)/include
-PLIBS = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lutil
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lutil
diff --git a/wmake/rules/linux64Icc/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH
index d586ba3e039..ac17f7c1d2e 100644
--- a/wmake/rules/linux64Icc/mplibMPICH
+++ b/wmake/rules/linux64Icc/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Icc/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI
index ea9b4d22993..834d2d3e22a 100644
--- a/wmake/rules/linux64Icc/mplibOPENMPI
+++ b/wmake/rules/linux64Icc/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
-PINC = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA
index dc67a60a0bf..d62c6250ff4 100644
--- a/wmake/rules/linuxGcc/mplibGAMMA
+++ b/wmake/rules/linuxGcc/mplibGAMMA
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(GAMMA_ARCH_PATH)/include
-PLIBS = -L$(GAMMA_ARCH_PATH)/lib -lgamma
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc/mplibLAM b/wmake/rules/linuxGcc/mplibLAM
index ce18f758601..6762b843c12 100644
--- a/wmake/rules/linuxGcc/mplibLAM
+++ b/wmake/rules/linuxGcc/mplibLAM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(LAM_ARCH_PATH)/include
-PLIBS = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH
index d586ba3e039..ac17f7c1d2e 100644
--- a/wmake/rules/linuxGcc/mplibMPICH
+++ b/wmake/rules/linuxGcc/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc/mplibMPICH-GM b/wmake/rules/linuxGcc/mplibMPICH-GM
index 74fd9658087..88493ebc705 100644
--- a/wmake/rules/linuxGcc/mplibMPICH-GM
+++ b/wmake/rules/linuxGcc/mplibMPICH-GM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxGcc/mplibOPENMPI b/wmake/rules/linuxGcc/mplibOPENMPI
index ea9b4d22993..834d2d3e22a 100644
--- a/wmake/rules/linuxGcc/mplibOPENMPI
+++ b/wmake/rules/linuxGcc/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
-PINC = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA
index dc67a60a0bf..d62c6250ff4 100644
--- a/wmake/rules/linuxGcc43/mplibGAMMA
+++ b/wmake/rules/linuxGcc43/mplibGAMMA
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(GAMMA_ARCH_PATH)/include
-PLIBS = -L$(GAMMA_ARCH_PATH)/lib -lgamma
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc43/mplibLAM b/wmake/rules/linuxGcc43/mplibLAM
index ce18f758601..6762b843c12 100644
--- a/wmake/rules/linuxGcc43/mplibLAM
+++ b/wmake/rules/linuxGcc43/mplibLAM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(LAM_ARCH_PATH)/include
-PLIBS = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH
index d586ba3e039..ac17f7c1d2e 100644
--- a/wmake/rules/linuxGcc43/mplibMPICH
+++ b/wmake/rules/linuxGcc43/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc43/mplibMPICH-GM
index 74fd9658087..88493ebc705 100644
--- a/wmake/rules/linuxGcc43/mplibMPICH-GM
+++ b/wmake/rules/linuxGcc43/mplibMPICH-GM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI
index ea9b4d22993..834d2d3e22a 100644
--- a/wmake/rules/linuxGcc43/mplibOPENMPI
+++ b/wmake/rules/linuxGcc43/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
-PINC = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxIA64Gcc/mplibLAM b/wmake/rules/linuxIA64Gcc/mplibLAM
index ce18f758601..6762b843c12 100644
--- a/wmake/rules/linuxIA64Gcc/mplibLAM
+++ b/wmake/rules/linuxIA64Gcc/mplibLAM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(LAM_ARCH_PATH)/include
-PLIBS = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxIA64Gcc/mplibMPICH b/wmake/rules/linuxIA64Gcc/mplibMPICH
index d586ba3e039..ac17f7c1d2e 100644
--- a/wmake/rules/linuxIA64Gcc/mplibMPICH
+++ b/wmake/rules/linuxIA64Gcc/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxIA64Gcc/mplibOPENMPI b/wmake/rules/linuxIA64Gcc/mplibOPENMPI
index ea9b4d22993..834d2d3e22a 100644
--- a/wmake/rules/linuxIA64Gcc/mplibOPENMPI
+++ b/wmake/rules/linuxIA64Gcc/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
-PINC = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxIA64Icc/mplibLAM b/wmake/rules/linuxIA64Icc/mplibLAM
index 92290b21b5c..9fa7c2752ed 100644
--- a/wmake/rules/linuxIA64Icc/mplibLAM
+++ b/wmake/rules/linuxIA64Icc/mplibLAM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(LAM_ARCH_PATH)/include
-PLIBS = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lutil
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lutil
diff --git a/wmake/rules/linuxIA64Icc/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH
index d586ba3e039..ac17f7c1d2e 100644
--- a/wmake/rules/linuxIA64Icc/mplibMPICH
+++ b/wmake/rules/linuxIA64Icc/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxIA64Icc/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI
index ea9b4d22993..834d2d3e22a 100644
--- a/wmake/rules/linuxIA64Icc/mplibOPENMPI
+++ b/wmake/rules/linuxIA64Icc/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
-PINC = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxIcc/mplibLAM b/wmake/rules/linuxIcc/mplibLAM
index 92290b21b5c..9fa7c2752ed 100644
--- a/wmake/rules/linuxIcc/mplibLAM
+++ b/wmake/rules/linuxIcc/mplibLAM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(LAM_ARCH_PATH)/include
-PLIBS = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lutil
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lutil
diff --git a/wmake/rules/linuxIcc/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH
index d586ba3e039..ac17f7c1d2e 100644
--- a/wmake/rules/linuxIcc/mplibMPICH
+++ b/wmake/rules/linuxIcc/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxIcc/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI
index ea9b4d22993..834d2d3e22a 100644
--- a/wmake/rules/linuxIcc/mplibOPENMPI
+++ b/wmake/rules/linuxIcc/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
-PINC = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA
index dc67a60a0bf..d62c6250ff4 100644
--- a/wmake/rules/linuxmingw32/mplibGAMMA
+++ b/wmake/rules/linuxmingw32/mplibGAMMA
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(GAMMA_ARCH_PATH)/include
-PLIBS = -L$(GAMMA_ARCH_PATH)/lib -lgamma
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxmingw32/mplibLAM b/wmake/rules/linuxmingw32/mplibLAM
index ce18f758601..6762b843c12 100644
--- a/wmake/rules/linuxmingw32/mplibLAM
+++ b/wmake/rules/linuxmingw32/mplibLAM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(LAM_ARCH_PATH)/include
-PLIBS = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH
index d586ba3e039..ac17f7c1d2e 100644
--- a/wmake/rules/linuxmingw32/mplibMPICH
+++ b/wmake/rules/linuxmingw32/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxmingw32/mplibMPICH-GM b/wmake/rules/linuxmingw32/mplibMPICH-GM
index 74fd9658087..88493ebc705 100644
--- a/wmake/rules/linuxmingw32/mplibMPICH-GM
+++ b/wmake/rules/linuxmingw32/mplibMPICH-GM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI
index ea9b4d22993..834d2d3e22a 100644
--- a/wmake/rules/linuxmingw32/mplibOPENMPI
+++ b/wmake/rules/linuxmingw32/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
-PINC = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/solarisGcc/mplibLAM b/wmake/rules/solarisGcc/mplibLAM
index f14c793d9c6..fc109a63b5d 100644
--- a/wmake/rules/solarisGcc/mplibLAM
+++ b/wmake/rules/solarisGcc/mplibLAM
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(LAM_ARCH_PATH)/include
-PLIBS = -L$(LAM_ARCH_PATH)/lib -lmpi -llam
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi -llam
diff --git a/wmake/rules/solarisGcc/mplibMPICH b/wmake/rules/solarisGcc/mplibMPICH
index 46572fd7fe4..cd9ff0e4787 100644
--- a/wmake/rules/solarisGcc/mplibMPICH
+++ b/wmake/rules/solarisGcc/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPICH_ARCH_PATH)/include
-PLIBS = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt -laio
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio
diff --git a/wmake/rules/solarisGcc/mplibOPENMPI b/wmake/rules/solarisGcc/mplibOPENMPI
index ea9b4d22993..834d2d3e22a 100644
--- a/wmake/rules/solarisGcc/mplibOPENMPI
+++ b/wmake/rules/solarisGcc/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
-PINC = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC = -I$(MPI_ARCH_PATH)/include
+PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
--
GitLab