mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Changed WM_THIRD_PARTY to WM_THIRD_PARTY_DIR and added to all 'options' files that use third-party software.
This commit is contained in:
@ -105,10 +105,10 @@ case "$WM_COMPILER_INST" in
|
||||
OpenFOAM)
|
||||
case "$WM_COMPILER" in
|
||||
Gcc43)
|
||||
export WM_COMPILER_DIR=$WM_THIRD_PARTY/gcc-4.3.0/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.0/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||
;;
|
||||
Gcc)
|
||||
export WM_COMPILER_DIR=$WM_THIRD_PARTY/gcc-4.2.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.2.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -142,7 +142,7 @@ unset MPI_ARCH_PATH
|
||||
case "$WM_MPLIB" in
|
||||
OPENMPI)
|
||||
mpi_version=openmpi-1.2.6
|
||||
export MPI_HOME=$WM_THIRD_PARTY/$mpi_version
|
||||
export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
|
||||
export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
|
||||
|
||||
# Tell OpenMPI where to find its install directory
|
||||
@ -157,9 +157,9 @@ OPENMPI)
|
||||
|
||||
LAM)
|
||||
mpi_version=lam-7.1.4
|
||||
export MPI_HOME=$WM_THIRD_PARTY/$mpi_version
|
||||
export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
|
||||
export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
|
||||
export LAMHOME=$WM_THIRD_PARTY/$mpi_version
|
||||
export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version
|
||||
# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
|
||||
|
||||
AddLib $MPI_ARCH_PATH/lib
|
||||
@ -171,7 +171,7 @@ LAM)
|
||||
|
||||
MPICH)
|
||||
mpi_version=mpich-1.2.4
|
||||
export MPI_HOME=$WM_THIRD_PARTY/$mpi_version
|
||||
export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
|
||||
export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
|
||||
export MPICH_ROOT=$MPI_ARCH_PATH
|
||||
|
||||
|
||||
Reference in New Issue
Block a user