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:
@ -89,10 +89,10 @@ switch ("$WM_COMPILER_INST")
|
||||
case OpenFOAM:
|
||||
switch ("$WM_COMPILER")
|
||||
case Gcc43:
|
||||
setenv WM_COMPILER_DIR $WM_THIRD_PARTY/gcc-4.3.0/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.0/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||
breaksw
|
||||
case Gcc:
|
||||
setenv WM_COMPILER_DIR $WM_THIRD_PARTY/gcc-4.2.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.2.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
@ -130,7 +130,7 @@ unset MPI_ARCH_PATH
|
||||
switch ("$WM_MPLIB")
|
||||
case OPENMPI:
|
||||
set mpi_version=openmpi-1.2.6
|
||||
setenv MPI_HOME $WM_THIRD_PARTY/$mpi_version
|
||||
setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
|
||||
setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
|
||||
|
||||
# Tell OpenMPI where to find its install directory
|
||||
@ -145,9 +145,9 @@ case OPENMPI:
|
||||
|
||||
case LAM:
|
||||
set mpi_version=lam-7.1.4
|
||||
setenv MPI_HOME $WM_THIRD_PARTY/$mpi_version
|
||||
setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
|
||||
setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
|
||||
setenv LAMHOME $WM_THIRD_PARTY/$mpi_version
|
||||
setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version
|
||||
# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
|
||||
|
||||
AddLib $MPI_ARCH_PATH/lib
|
||||
@ -159,7 +159,7 @@ case LAM:
|
||||
|
||||
case MPICH:
|
||||
set mpi_version=mpich-1.2.4
|
||||
setenv MPI_HOME $WM_THIRD_PARTY/$mpi_version
|
||||
setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
|
||||
setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
|
||||
setenv MPICH_ROOT $MPI_ARCH_PATH
|
||||
|
||||
|
||||
Reference in New Issue
Block a user