zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: update paraview 5.3.0, openmpi 2.0.2, mpich 3.2, fftw 3.3.6-pl1

Browse Source
This commit is contained in:
Mark Olesen
2017-03-14 10:38:54 +01:00
parent 7848953b21
commit f1112fc357
7 changed files with 38 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
etc/config.sh/mpi
View File

@ -43,18 +43,17 @@ SYSTEMOPENMPI)
unset OPAL_PREFIX
fi
# Bit of a hack: strip off 'lib' and hope this is the prefix for openmpi
# include files and libraries.
libDir=$(mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/')
# Bit of a hack: strip off 'lib' and hope this is the path to openmpi
# include files and libraries.
export MPI_ARCH_PATH="${libDir%/*}"
_foamAddLib $libDir
unset libDir
;;
OPENMPI)
export FOAM_MPI=openmpi-1.10.4
export FOAM_MPI=openmpi-2.0.2
# Optional configuration tweaks:
_foamSourceEtc config.sh/openmpi
@ -70,9 +69,13 @@ OPENMPI)
echo " FOAM_MPI : $FOAM_MPI" 1>&2
fi
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddMan $MPI_ARCH_PATH/share/man
# Could be sourced from ThirdParty with incomplete environment
if type _foamAddLib > /dev/null 2>&1
then
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddMan $MPI_ARCH_PATH/share/man
fi
;;
SYSTEMMPI)
@ -124,31 +127,27 @@ SYSTEMMPI)
;;
MPICH)
export FOAM_MPI=mpich2-1.1.1p1
export FOAM_MPI=mpich-3.2
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
export MPI_HOME=$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
# Could be sourced from ThirdParty with incomplete environment
if type _foamAddLib > /dev/null 2>&1
then
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddMan $MPI_ARCH_PATH/share/man
fi
;;
MPICH-GM)
export FOAM_MPI=mpich-gm
export MPI_ARCH_PATH=/opt/mpi
export MPICH_PATH=$MPI_ARCH_PATH
export GM_LIB_PATH=/opt/gm/lib64
export GM_LIB_PATH=/opt/gm/lib$WM_COMPILER_LIB_ARCH
_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
;;
@ -227,8 +226,7 @@ SGIMPI)
;;
INTELMPI)
# No trailing slash
[ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}"
MPI_ROOT="${MPI_ROOT%/}" # No trailing slash
export FOAM_MPI="${MPI_ROOT##*/}"
export MPI_ARCH_PATH=$MPI_ROOT
@ -259,7 +257,7 @@ esac
# Add (non-dummy) MPI implementation
# Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
if [ "$FOAM_MPI" != dummy ]
if [ "$FOAM_MPI" != dummy ] && type _foamAddLib > /dev/null 2>&1
then
_foamAddLib $FOAM_LIBBIN/$FOAM_MPI:$FOAM_EXT_LIBBIN/$FOAM_MPI
fi