diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 179d1451406cf50e2de3edb39c2367d39d2686ab..94e5618bff1c69a1c2481be98138fa08ad2dd907 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -41,6 +41,9 @@ alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}'
# Set environment variables according to system type
setenv WM_ARCH `uname -s`
+# Default WM_COMPILER_LIB_ARCH for 32bit
+setenv WM_COMPILER_LIB_ARCH
+
switch ($WM_ARCH)
case Linux:
setenv WM_ARCH linux
@@ -269,12 +272,7 @@ case ThirdParty:
_foamAddPath $gccDir/bin
# add compiler libraries to run-time environment
- # 64-bit needs lib64, but 32-bit needs lib (not lib32)
- if ($WM_ARCH_OPTION == 64 && $?WM_COMPILER_LIB_ARCH) then
- _foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH
- else
- _foamAddLib $gccDir/lib
- endif
+ _foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH
# add gmp/mpfr libraries to run-time environment
_foamAddLib $gmpDir/lib
@@ -371,21 +369,6 @@ unset boost_version cgal_version
unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
switch ("$WM_MPLIB")
-case OPENMPI:
- setenv FOAM_MPI openmpi-1.5.4
- # optional configuration tweaks:
- _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`
-
- setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
-
- # Tell OpenMPI where to find its install directory
- setenv OPAL_PREFIX $MPI_ARCH_PATH
-
- _foamAddPath $MPI_ARCH_PATH/bin
- _foamAddLib $MPI_ARCH_PATH/lib
- _foamAddMan $MPI_ARCH_PATH/share/man
- breaksw
-
case SYSTEMOPENMPI:
# Use the system installed openmpi, get library directory via mpicc
setenv FOAM_MPI openmpi-system
@@ -410,13 +393,36 @@ case SYSTEMOPENMPI:
unset libDir
breaksw
+case OPENMPI:
+ setenv FOAM_MPI openmpi-1.5.4
+ # optional configuration tweaks:
+ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`
+
+ setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+
+ # Tell OpenMPI where to find its install directory
+ setenv OPAL_PREFIX $MPI_ARCH_PATH
+
+ _foamAddPath $MPI_ARCH_PATH/bin
+
+ # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+ _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+ _foamAddLib $MPI_ARCH_PATH/lib
+
+ _foamAddMan $MPI_ARCH_PATH/share/man
+ breaksw
+
case MPICH:
setenv FOAM_MPI mpich2-1.1.1p1
setenv MPI_HOME $WM_THIRD_PARTY_DIR/$FOAM_MPI
setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
_foamAddPath $MPI_ARCH_PATH/bin
+
+ # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+ _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $MPI_ARCH_PATH/lib
+
_foamAddMan $MPI_ARCH_PATH/share/man
breaksw
@@ -427,7 +433,11 @@ case MPICH-GM:
setenv GM_LIB_PATH /opt/gm/lib64
_foamAddPath $MPI_ARCH_PATH/bin
+
+ # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+ _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $MPI_ARCH_PATH/lib
+
_foamAddLib $GM_LIB_PATH
breaksw
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 95c7046ec7089fd3c8a7c2ee16d77d2fb014df7f..dc39c480e1f09433e083ef98e0987b0825536915 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -294,14 +294,7 @@ OpenFOAM | ThirdParty)
_foamAddPath $gccDir/bin
# add compiler libraries to run-time environment
- # 64-bit needs lib64, but 32-bit needs lib (not lib32)
- if [ "$WM_ARCH_OPTION" = 64 ]
- then
- _foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH
- else
- _foamAddLib $gccDir/lib
- fi
-
+ _foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH
# add gmp/mpfr libraries to run-time environment
_foamAddLib $gmpDir/lib
@@ -401,21 +394,6 @@ unset boost_version cgal_version
unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
case "$WM_MPLIB" in
-OPENMPI)
- export FOAM_MPI=openmpi-1.5.4
- # optional configuration tweaks:
- _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
-
- export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
-
- # Tell OpenMPI where to find its install directory
- export OPAL_PREFIX=$MPI_ARCH_PATH
-
- _foamAddPath $MPI_ARCH_PATH/bin
- _foamAddLib $MPI_ARCH_PATH/lib
- _foamAddMan $MPI_ARCH_PATH/share/man
- ;;
-
SYSTEMOPENMPI)
# Use the system installed openmpi, get library directory via mpicc
export FOAM_MPI=openmpi-system
@@ -441,13 +419,36 @@ SYSTEMOPENMPI)
unset libDir
;;
+OPENMPI)
+ export FOAM_MPI=openmpi-1.5.4
+ # optional configuration tweaks:
+ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
+
+ export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+
+ # Tell OpenMPI where to find its install directory
+ export OPAL_PREFIX=$MPI_ARCH_PATH
+
+ _foamAddPath $MPI_ARCH_PATH/bin
+
+ # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+ _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+ _foamAddLib $MPI_ARCH_PATH/lib
+
+ _foamAddMan $MPI_ARCH_PATH/share/man
+ ;;
+
MPICH)
export FOAM_MPI=mpich2-1.1.1p1
export MPI_HOME=$WM_THIRD_PARTY_DIR/$FOAM_MPI
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
_foamAddPath $MPI_ARCH_PATH/bin
+
+ # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+ _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $MPI_ARCH_PATH/lib
+
_foamAddMan $MPI_ARCH_PATH/share/man
;;
@@ -458,7 +459,11 @@ MPICH-GM)
export GM_LIB_PATH=/opt/gm/lib64
_foamAddPath $MPI_ARCH_PATH/bin
+
+ # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+ _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $MPI_ARCH_PATH/lib
+
_foamAddLib $GM_LIB_PATH
;;
diff --git a/wmake/rules/General/mplibMPICH b/wmake/rules/General/mplibMPICH
index e5a38a8e38159982f4dcbbfd745e9246f343673a..0abee120ca427431d06752cf91ac85a33a8d4923 100644
--- a/wmake/rules/General/mplibMPICH
+++ b/wmake/rules/General/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS = -DMPICH_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
-PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
+PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/General/mplibMPICH-GM b/wmake/rules/General/mplibMPICH-GM
index 88493ebc7059aac7da8678f743a18077a54b9d00..4c97ec851f3015265ecb7373eece343e896ca44f 100644
--- a/wmake/rules/General/mplibMPICH-GM
+++ b/wmake/rules/General/mplibMPICH-GM
@@ -1,3 +1,3 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
-PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/General/mplibOPENMPI b/wmake/rules/General/mplibOPENMPI
index 834d2d3e22aaebee233a19b139b6d99a4d457cf7..c888c3855659436e9994dabd32ad64a728bcda7c 100644
--- a/wmake/rules/General/mplibOPENMPI
+++ b/wmake/rules/General/mplibOPENMPI
@@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
-PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
+PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi