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

cleanup mpi settings in etc/settings.{sh,csh}

Browse Source
This commit is contained in:
Mark Olesen
2008-06-04 16:16:49 +02:00
parent f985933723
commit 8b8a4f292b
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
etc/settings.csh
View File

@ -132,9 +132,8 @@ endif
switch ("$WM_MPLIB") switch ("$WM_MPLIB")
case OPENMPI: case OPENMPI:
set ompi_version=1.2.6 set ompi_version=openmpi-1.2.6
setenv OPENMPI_HOME $thirdParty/openmpi-$ompi_version setenv OPENMPI_ARCH_PATH $thirdParty/$ompi_version/platforms/$WM_OPTIONS
setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS
# Tell OpenMPI where to find it's install directory # Tell OpenMPI where to find it's install directory
setenv OPAL_PREFIX $OPENMPI_ARCH_PATH setenv OPAL_PREFIX $OPENMPI_ARCH_PATH
@ -142,32 +141,31 @@ case OPENMPI:
AddLib $OPENMPI_ARCH_PATH/lib AddLib $OPENMPI_ARCH_PATH/lib
AddPath $OPENMPI_ARCH_PATH/bin AddPath $OPENMPI_ARCH_PATH/bin
setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/openmpi-$ompi_version setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$ompi_version
unset ompi_version unset ompi_version
breaksw breaksw
case LAM: case LAM:
set lam_version=7.1.4 set lam_version=lam-7.1.4
setenv LAMHOME $thirdParty/lam-$lam_version setenv LAMHOME $thirdParty/$lam_version
setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
AddLib $LAM_ARCH_PATH/lib AddLib $LAM_ARCH_PATH/lib
AddPath $LAM_ARCH_PATH/bin AddPath $LAM_ARCH_PATH/bin
setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/lam-$lam_version setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$lam_version
unset lam_version unset lam_version
breaksw breaksw
case MPICH: case MPICH:
set mpich_version=1.2.4 set mpich_version=mpich-1.2.4
setenv MPICH_PATH $thirdParty/mpich-$mpich_version setenv MPICH_ARCH_PATH $thirdParty/$mpich_version/platforms/$WM_OPTIONS
setenv MPICH_ARCH_PATH $MPICH_PATH/platforms/$WM_OPTIONS
setenv MPICH_ROOT $MPICH_ARCH_PATH setenv MPICH_ROOT $MPICH_ARCH_PATH
AddLib $MPICH_ARCH_PATH/lib AddLib $MPICH_ARCH_PATH/lib
AddPath $MPICH_ARCH_PATH/bin AddPath $MPICH_ARCH_PATH/bin
setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpich-$mpich_version setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpich_version
unset mpich_version unset mpich_version
breaksw breaksw

22
etc/settings.sh
View File

@ -145,42 +145,40 @@ thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
case "$WM_MPLIB" in case "$WM_MPLIB" in
OPENMPI) OPENMPI)
ompi_version=1.2.6 ompi_version=openmpi-1.2.6
export OPENMPI_HOME=$thirdParty/openmpi-$ompi_version export OPENMPI_ARCH_PATH=$thirdParty/$ompi_version/platforms/$WM_OPTIONS
export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS
# Tell OpenMPI where to find it's install directory # Tell OpenMPI where to find its install directory
export OPAL_PREFIX=$OPENMPI_ARCH_PATH export OPAL_PREFIX=$OPENMPI_ARCH_PATH
AddLib $OPENMPI_ARCH_PATH/lib AddLib $OPENMPI_ARCH_PATH/lib
AddPath $OPENMPI_ARCH_PATH/bin AddPath $OPENMPI_ARCH_PATH/bin
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/openmpi-$ompi_version export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$ompi_version
unset ompi_version unset ompi_version
;; ;;
LAM) LAM)
lam_version=7.1.4 lam_version=lam-7.1.4
export LAMHOME=$thirdParty/lam-$lam_version export LAMHOME=$thirdParty/$lam_version
export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
AddLib $LAM_ARCH_PATH/lib AddLib $LAM_ARCH_PATH/lib
AddPath $LAM_ARCH_PATH/bin AddPath $LAM_ARCH_PATH/bin
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/lam-$lam_version export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$lam_version
unset lam_version unset lam_version
;; ;;
MPICH) MPICH)
mpich_version=1.2.4 mpich_version=mpich-1.2.4
export MPICH_PATH=$thirdParty/mpich-$mpich_version export MPICH_ARCH_PATH=$thirdParty/$mpich_version/platforms/$WM_OPTIONS
export MPICH_ARCH_PATH=$MPICH_PATH/platforms/$WM_OPTIONS
export MPICH_ROOT=$MPICH_ARCH_PATH export MPICH_ROOT=$MPICH_ARCH_PATH
AddLib $MPICH_ARCH_PATH/lib AddLib $MPICH_ARCH_PATH/lib
AddPath $MPICH_ARCH_PATH/bin AddPath $MPICH_ARCH_PATH/bin
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-$mpich_version export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpich_version
unset mpich_version unset mpich_version
;; ;;