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.
This commit is contained in:
Mark Olesen
2019-02-14 18:09:37 +01:00
committed by Andrew Heather
parent 6b9fe33275
commit fd8379fdbe
12 changed files with 37 additions and 13 deletions

View File

@ -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