CONFIG: update MPICH and MVAPICH versions/rules

- Note: mpich now builds libmpi.so instead of libmpich.so

- define both -DMPICH_SKIP_MPICXX and -DOMPI_SKIP_MPICXX regardless of
  using openmpi or mpich. This simplifies the files and does not harm.

etc/config.csh/mpi

@@ -130,7 +130,7 @@ case SYSTEMMPI:
     breaksw
 
 case MPICH:
-    setenv FOAM_MPI mpich-3.2
+    setenv FOAM_MPI mpich-3.3
     setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
     setenv MPI_HOME $MPI_ARCH_PATH
 
@@ -150,6 +150,14 @@ case MPICH-GM:
     _foamAddLib     $GM_LIB_PATH
     breaksw
 
+case MVA2MPI:  # MVAMPICH2
+    setenv FOAM_MPI mvapich2-2.3
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+    _foamAddMan     $MPI_ARCH_PATH/share/man
+    _foamAddLibAuto $MPI_ARCH_PATH  lib$WM_COMPILER_LIB_ARCH
+    breaksw
+
 case CRAY-MPICH:
     if ( ! $?MPICH_DIR ) setenv MPICH_DIR /dev/null
     setenv FOAM_MPI cray-mpich

etc/config.sh/mpi

@@ -145,7 +145,7 @@ SYSTEMMPI)
     ;;
 
 MPICH)
-    export FOAM_MPI=mpich-3.2
+    export FOAM_MPI=mpich-3.3
     export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
     export MPI_HOME=$MPI_ARCH_PATH
 
@@ -169,6 +169,19 @@ MPICH-GM)
     _foamAddLib     $GM_LIB_PATH
     ;;
 
+MVA2MPI)  # MVAMPICH2
+    export FOAM_MPI=mvapich2-2.3
+    export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+
+    # Could be sourced from ThirdParty with incomplete environment
+    if command -v _foamAddLibAuto > /dev/null 2>&1  # Normal sourcing
+    then
+        _foamAddPath    $MPI_ARCH_PATH/bin
+        _foamAddMan     $MPI_ARCH_PATH/share/man
+        _foamAddLibAuto $MPI_ARCH_PATH  lib$WM_COMPILER_LIB_ARCH
+    fi
+    ;;
+
 CRAY-MPICH)
     export FOAM_MPI=cray-mpich
     export MPI_ARCH_PATH=$MPICH_DIR

wmake/rules/General/mplibMPICH

-PFLAGS     = -DMPICH_SKIP_MPICXX
+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
 PINC       = -isystem $(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
+PLIBS      = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi -lrt

wmake/rules/General/mplibMVA2MPI

+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
+PINC       = -isystem $(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi

wmake/rules/General/mplibOPENMPI

-PFLAGS     = -DOMPI_SKIP_MPICXX
+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
 PINC       = -isystem $(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi

wmake/rules/General/mplibSYSTEMOPENMPI

-# use the system installed openmpi - mpicc must be installed
+# Use the system installed openmpi - mpicc must be installed
 
-PFLAGS     = -DOMPI_SKIP_MPICXX
+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
 PINC       = $(shell mpicc --showme:compile)
 PLIBS      = $(shell mpicc --showme:link)

wmake/rules/linux64Clang/mplibINTELMPI

-PFLAGS     = -DMPICH_SKIP_MPICXX
+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
 PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
 PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

wmake/rules/linux64Cray/mplibINTELMPI

-PFLAGS     = -DMPICH_SKIP_MPICXX
+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
 PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
 PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

wmake/rules/linux64Gcc/mplibINTELMPI

-PFLAGS     = -DMPICH_SKIP_MPICXX
+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
 PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
 PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

wmake/rules/linux64Icc/mplibINTELMPI

-PFLAGS     = -DMPICH_SKIP_MPICXX
+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
 PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
 PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

wmake/rules/linuxIA64Icc/mplibINTELMPI

-PFLAGS     = -DMPICH_SKIP_MPICXX
+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
 PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
 PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

wmake/rules/solarisGcc/mplibMPICH

-PFLAGS     = -DMPICH_SKIP_MPICXX
+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
 PINC       = -isystem $(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio