diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions
index 44de1b2f3a..1d0e36e08c 100755
--- a/bin/tools/buildParaViewFunctions
+++ b/bin/tools/buildParaViewFunctions
@@ -55,26 +55,7 @@ addMpiSupport ()
 {
     [ "$INCLUDE_MPI" = ON ] || return
 
-    # using OpenFOAM variables to identify location of MPI libraries
-    case "$WM_MPLIB" in
-    OPENMPI)
-        MPI_ARCH_PATH=$OPENMPI_ARCH_PATH
-        MPI_LIBRARY=$OPENMPI_ARCH_PATH/lib/libmpi.so
-        ;;
-    LAM)
-        MPI_ARCH_PATH=$LAM_ARCH_PATH
-        MPI_LIBRARY=$LAM_ARCH_PATH/lib/libmpi.so
-        ;;
-    MPICH)
-        MPI_ARCH_PATH=$MPICH_ARCH_PATH
-        MPI_LIBRARY=$MPICH_ARCH_PATH/lib/libmpich.so
-        ;;
-    *)
-        echo "*** Error: unknown/unsupported mpi: $WM_MPLIB"
-        exit 1
-        ;;
-    esac
-
+    MPI_LIBRARY=$MPI_ARCH_PATH/lib/libmpi.so
     MPI_INCLUDE_PATH=$MPI_ARCH_PATH/include
     MPI_RUN=$MPI_ARCH_PATH/bin/mpirun
 
diff --git a/etc/settings.csh b/etc/settings.csh
index e1e8a5cd95..b121e434e6 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -135,6 +135,7 @@ case OPENMPI:
     set ompi_version=1.2.6
     setenv OPENMPI_HOME $thirdParty/openmpi-$ompi_version
     setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS
+    setenv MPI_ARCH_PATH $OPENMPI_ARCH_PATH
 
     # Tell OpenMPI where to find it's install directory
     setenv OPAL_PREFIX $OPENMPI_ARCH_PATH
@@ -150,6 +151,7 @@ case LAM:
     set lam_version=7.1.4
     setenv LAMHOME $thirdParty/lam-$lam_version
     setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
+    setenv MPI_ARCH_PATH $LAM_ARCH_PATH
 
     AddLib $LAM_ARCH_PATH/lib
     AddPath $LAM_ARCH_PATH/bin
@@ -163,6 +165,7 @@ case MPICH:
     setenv MPICH_PATH $thirdParty/mpich-$mpich_version
     setenv MPICH_ARCH_PATH $MPICH_PATH/platforms/$WM_OPTIONS
     setenv MPICH_ROOT $MPICH_ARCH_PATH
+    setenv MPI_ARCH_PATH $MPICH_ARCH_PATH
 
     AddLib $MPICH_ARCH_PATH/lib
     AddPath $MPICH_ARCH_PATH/bin
@@ -176,6 +179,7 @@ case MPICH-GM:
     setenv MPICH_ARCH_PATH $MPICH_PATH
     setenv MPICH_ROOT $MPICH_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
@@ -186,14 +190,11 @@ case MPICH-GM:
 
 case GAMMA:
     setenv GAMMA_ARCH_PATH /usr
-
-    # AddLib $GAMMA_ARCH_PATH/lib
-    # AddPath $GAMMA_ARCH_PATH/bin
-
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/gamma
     breaksw
 
 case MPI:
+    setenv MPI_ARCH_PATH /opt/mpi
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpi
     breaksw
 
diff --git a/etc/settings.sh b/etc/settings.sh
index 9522d4755f..965a2be1cb 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -148,6 +148,7 @@ OPENMPI)
     ompi_version=1.2.6
     export OPENMPI_HOME=$thirdParty/openmpi-$ompi_version
     export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS
+    export MPI_ARCH_PATH=$OPENMPI_ARCH_PATH
 
     # Tell OpenMPI where to find it's install directory
     export OPAL_PREFIX=$OPENMPI_ARCH_PATH
@@ -163,6 +164,7 @@ LAM)
     lam_version=7.1.4
     export LAMHOME=$thirdParty/lam-$lam_version
     export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
+    export MPI_ARCH_PATH=$LAM_ARCH_PATH
 
     AddLib  $LAM_ARCH_PATH/lib
     AddPath $LAM_ARCH_PATH/bin
@@ -176,6 +178,7 @@ MPICH)
     export MPICH_PATH=$thirdParty/mpich-$mpich_version
     export MPICH_ARCH_PATH=$MPICH_PATH/platforms/$WM_OPTIONS
     export MPICH_ROOT=$MPICH_ARCH_PATH
+    export MPI_ARCH_PATH=$MPICH_ARCH_PATH
 
     AddLib  $MPICH_ARCH_PATH/lib
     AddPath $MPICH_ARCH_PATH/bin
@@ -189,6 +192,7 @@ MPICH-GM)
     export MPICH_ARCH_PATH=$MPICH_PATH
     export MPICH_ROOT=$MPICH_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
@@ -200,13 +204,11 @@ MPICH-GM)
 GAMMA)
     export GAMMA_ARCH_PATH=/usr
 
-    # AddLib $GAMMA_ARCH_PATH/lib
-    # AddPath $GAMMA_ARCH_PATH/bin
-
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/gamma
     ;;
 
 MPI)
+    export MPI_ARCH_PATH=/opt/mpi
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpi
     ;;