diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi index 583a0ce68c..922f7848a2 100644 --- a/etc/config.csh/mpi +++ b/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 diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi index 204f25dcf7..ca7c0b1254 100644 --- a/etc/config.sh/mpi +++ b/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 diff --git a/wmake/rules/General/mplibMPICH b/wmake/rules/General/mplibMPICH index 611641afbc..8d3fee45b2 100644 --- a/wmake/rules/General/mplibMPICH +++ b/wmake/rules/General/mplibMPICH @@ -1,3 +1,3 @@ -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 diff --git a/wmake/rules/General/mplibMVA2MPI b/wmake/rules/General/mplibMVA2MPI new file mode 100644 index 0000000000..112f510b3c --- /dev/null +++ b/wmake/rules/General/mplibMVA2MPI @@ -0,0 +1,3 @@ +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 diff --git a/wmake/rules/General/mplibOPENMPI b/wmake/rules/General/mplibOPENMPI index f1f8899922..112f510b3c 100644 --- a/wmake/rules/General/mplibOPENMPI +++ b/wmake/rules/General/mplibOPENMPI @@ -1,3 +1,3 @@ -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 diff --git a/wmake/rules/General/mplibSYSTEMOPENMPI b/wmake/rules/General/mplibSYSTEMOPENMPI index 639c8ce277..9245c3ee99 100644 --- a/wmake/rules/General/mplibSYSTEMOPENMPI +++ b/wmake/rules/General/mplibSYSTEMOPENMPI @@ -1,5 +1,5 @@ -# 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) diff --git a/wmake/rules/linux64Clang/mplibINTELMPI b/wmake/rules/linux64Clang/mplibINTELMPI index e5f0d01163..b3667bce26 100644 --- a/wmake/rules/linux64Clang/mplibINTELMPI +++ b/wmake/rules/linux64Clang/mplibINTELMPI @@ -1,3 +1,3 @@ -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 diff --git a/wmake/rules/linux64Cray/mplibINTELMPI b/wmake/rules/linux64Cray/mplibINTELMPI index e5f0d01163..b3667bce26 100644 --- a/wmake/rules/linux64Cray/mplibINTELMPI +++ b/wmake/rules/linux64Cray/mplibINTELMPI @@ -1,3 +1,3 @@ -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 diff --git a/wmake/rules/linux64Gcc/mplibINTELMPI b/wmake/rules/linux64Gcc/mplibINTELMPI index e5f0d01163..b3667bce26 100644 --- a/wmake/rules/linux64Gcc/mplibINTELMPI +++ b/wmake/rules/linux64Gcc/mplibINTELMPI @@ -1,3 +1,3 @@ -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 diff --git a/wmake/rules/linux64Icc/mplibINTELMPI b/wmake/rules/linux64Icc/mplibINTELMPI index e5f0d01163..b3667bce26 100644 --- a/wmake/rules/linux64Icc/mplibINTELMPI +++ b/wmake/rules/linux64Icc/mplibINTELMPI @@ -1,3 +1,3 @@ -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 diff --git a/wmake/rules/linuxIA64Icc/mplibINTELMPI b/wmake/rules/linuxIA64Icc/mplibINTELMPI index e5f0d01163..b3667bce26 100644 --- a/wmake/rules/linuxIA64Icc/mplibINTELMPI +++ b/wmake/rules/linuxIA64Icc/mplibINTELMPI @@ -1,3 +1,3 @@ -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 diff --git a/wmake/rules/solarisGcc/mplibMPICH b/wmake/rules/solarisGcc/mplibMPICH index 767acf1ecc..0fc1f3efe9 100644 --- a/wmake/rules/solarisGcc/mplibMPICH +++ b/wmake/rules/solarisGcc/mplibMPICH @@ -1,3 +1,3 @@ -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