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

Merge commit 'origin/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2008-06-05 09:20:18 +02:00
parent 8b8a4f292b 7cc0520c36
commit f7ab1729e4
6 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
etc/settings.csh
View File

@ -134,8 +134,9 @@ switch ("$WM_MPLIB")
case OPENMPI:
set ompi_version=openmpi-1.2.6
setenv OPENMPI_ARCH_PATH $thirdParty/$ompi_version/platforms/$WM_OPTIONS
setenv MPI_ARCH_PATH $OPENMPI_ARCH_PATH
# Tell OpenMPI where to find it's install directory
# Tell OpenMPI where to find its install directory
setenv OPAL_PREFIX $OPENMPI_ARCH_PATH
AddLib $OPENMPI_ARCH_PATH/lib
@ -149,6 +150,7 @@ case LAM:
set lam_version=lam-7.1.4
setenv LAMHOME $thirdParty/$lam_version
setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
setenv MPI_ARCH_PATH $LAM_ARCH_PATH
AddLib $LAM_ARCH_PATH/lib
AddPath $LAM_ARCH_PATH/bin
@ -161,6 +163,7 @@ case MPICH:
set mpich_version=mpich-1.2.4
setenv MPICH_ARCH_PATH $thirdParty/$mpich_version/platforms/$WM_OPTIONS
setenv MPICH_ROOT $MPICH_ARCH_PATH
setenv MPI_ARCH_PATH $MPICH_ARCH_PATH
AddLib $MPICH_ARCH_PATH/lib
AddPath $MPICH_ARCH_PATH/bin
@ -174,6 +177,7 @@ case MPICH-GM:
setenv MPICH_ARCH_PATH $MPICH_PATH
setenv MPICH_ROOT $MPICH_ARCH_PATH
setenv GM_LIB_PATH /opt/gm/lib64
setenv MPI_ARCH_PATH $MPICH_ARCH_PATH
AddLib $MPICH_ARCH_PATH/lib
AddLib $GM_LIB_PATH
@ -184,14 +188,11 @@ case MPICH-GM:
case GAMMA:
setenv GAMMA_ARCH_PATH /usr
# AddLib $GAMMA_ARCH_PATH/lib
# AddPath $GAMMA_ARCH_PATH/bin
setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/gamma
breaksw
case MPI:
setenv MPI_ARCH_PATH /opt/mpi
setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpi
breaksw

8
etc/settings.sh
View File

@ -147,6 +147,7 @@ case "$WM_MPLIB" in
OPENMPI)
ompi_version=openmpi-1.2.6
export OPENMPI_ARCH_PATH=$thirdParty/$ompi_version/platforms/$WM_OPTIONS
export MPI_ARCH_PATH=$OPENMPI_ARCH_PATH
# Tell OpenMPI where to find its install directory
export OPAL_PREFIX=$OPENMPI_ARCH_PATH
@ -162,6 +163,7 @@ LAM)
lam_version=lam-7.1.4
export LAMHOME=$thirdParty/$lam_version
export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
export MPI_ARCH_PATH=$LAM_ARCH_PATH
AddLib $LAM_ARCH_PATH/lib
AddPath $LAM_ARCH_PATH/bin
@ -174,6 +176,7 @@ MPICH)
mpich_version=mpich-1.2.4
export MPICH_ARCH_PATH=$thirdParty/$mpich_version/platforms/$WM_OPTIONS
export MPICH_ROOT=$MPICH_ARCH_PATH
export MPI_ARCH_PATH=$MPICH_ARCH_PATH
AddLib $MPICH_ARCH_PATH/lib
AddPath $MPICH_ARCH_PATH/bin
@ -187,6 +190,7 @@ MPICH-GM)
export MPICH_ARCH_PATH=$MPICH_PATH
export MPICH_ROOT=$MPICH_ARCH_PATH
export GM_LIB_PATH=/opt/gm/lib64
export MPI_ARCH_PATH=$MPICH_ARCH_PATH
AddLib $MPICH_ARCH_PATH/lib
AddLib $GM_LIB_PATH
@ -198,13 +202,11 @@ MPICH-GM)
GAMMA)
export GAMMA_ARCH_PATH=/usr
# AddLib $GAMMA_ARCH_PATH/lib
# AddPath $GAMMA_ARCH_PATH/bin
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/gamma
;;
MPI)
export MPI_ARCH_PATH=/opt/mpi
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpi
;;