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

Added WM_THIRD_PARTY environment variable.

Browse Source
This commit is contained in:
henry
2008-06-09 14:10:14 +01:00
parent 450894c239
commit 65e5080ec8
6 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/conversion/Optional/AllwmakeOptional
View File

@ -6,7 +6,7 @@ set -x
if [ ! -e $FOAM_LIBBIN/libccmio.so ] if [ ! -e $FOAM_LIBBIN/libccmio.so ]
then then
( (
cd $WM_PROJECT_DIR/../ThirdParty && ./AllwmakeLibccmio cd $WM_THIRD_PARTY && ./AllwmakeLibccmio
) )
fi fi

4
applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
View File

@ -1,8 +1,8 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I${WM_PROJECT_DIR}/../ThirdParty/libccmio-2.6.1 \ -I${WM_THIRD_PARTY}/libccmio-2.6.1 \
-I${WM_PROJECT_DIR}/../ThirdParty/libccmio-2.6.1/lnInclude -I${WM_THIRD_PARTY}/libccmio-2.6.1/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \

5
etc/bashrc
View File

@ -57,6 +57,11 @@ export WM_PROJECT_DIR=$FOAM_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION
export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export WM_THIRD_PARTY=$WM_PROJECT_INST_DIR/ThirdParty
# Operating System/Platform from Unix or MSWindows # Operating System/Platform from Unix or MSWindows
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WM_OS = Unix | MSWindows # WM_OS = Unix | MSWindows

5
etc/cshrc
View File

@ -55,6 +55,11 @@ setenv WM_PROJECT_DIR $FOAM_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION
setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
setenv WM_THIRD_PARTY $WM_PROJECT_INST_DIR/ThirdParty
# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc) # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc

17
etc/settings.csh
View File

@ -74,11 +74,6 @@ AddPath $FOAM_USER_APPBIN
setenv FOAM_RUN $WM_PROJECT_USER_DIR/run setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
set thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
# Compiler settings # Compiler settings
# ~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~
set WM_COMPILER_BIN= set WM_COMPILER_BIN=
@ -94,10 +89,10 @@ switch ("$WM_COMPILER_INST")
case OpenFOAM: case OpenFOAM:
switch ("$WM_COMPILER") switch ("$WM_COMPILER")
case Gcc43: case Gcc43:
setenv WM_COMPILER_DIR $thirdParty/gcc-4.3.0/platforms/$WM_ARCH$WM_COMPILER_ARCH setenv WM_COMPILER_DIR $WM_THIRD_PARTY/gcc-4.3.0/platforms/$WM_ARCH$WM_COMPILER_ARCH
breaksw breaksw
case Gcc: case Gcc:
setenv WM_COMPILER_DIR $thirdParty/gcc-4.2.2/platforms/$WM_ARCH$WM_COMPILER_ARCH setenv WM_COMPILER_DIR $WM_THIRD_PARTY/gcc-4.2.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
breaksw breaksw
endsw endsw
@ -135,7 +130,7 @@ unset MPI_ARCH_PATH
switch ("$WM_MPLIB") switch ("$WM_MPLIB")
case OPENMPI: case OPENMPI:
set mpi_version=openmpi-1.2.6 set mpi_version=openmpi-1.2.6
setenv MPI_HOME $thirdParty/$mpi_version setenv MPI_HOME $WM_THIRD_PARTY/$mpi_version
setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
# Tell OpenMPI where to find its install directory # Tell OpenMPI where to find its install directory
@ -150,9 +145,9 @@ case OPENMPI:
case LAM: case LAM:
set mpi_version=lam-7.1.4 set mpi_version=lam-7.1.4
setenv MPI_HOME $thirdParty/$mpi_version setenv MPI_HOME $WM_THIRD_PARTY/$mpi_version
setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
setenv LAMHOME $thirdParty/$mpi_version setenv LAMHOME $WM_THIRD_PARTY/$mpi_version
# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
AddLib $MPI_ARCH_PATH/lib AddLib $MPI_ARCH_PATH/lib
@ -164,7 +159,7 @@ case LAM:
case MPICH: case MPICH:
set mpi_version=mpich-1.2.4 set mpi_version=mpich-1.2.4
setenv MPI_HOME $thirdParty/$mpi_version setenv MPI_HOME $WM_THIRD_PARTY/$mpi_version
setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
setenv MPICH_ROOT $MPI_ARCH_PATH setenv MPICH_ROOT $MPI_ARCH_PATH

16
etc/settings.sh
View File

@ -91,10 +91,6 @@ AddPath $FOAM_USER_APPBIN
export FOAM_RUN=$WM_PROJECT_USER_DIR/run export FOAM_RUN=$WM_PROJECT_USER_DIR/run
# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
# Compiler settings # Compiler settings
# ~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~
WM_COMPILER_BIN= WM_COMPILER_BIN=
@ -109,10 +105,10 @@ case "$WM_COMPILER_INST" in
OpenFOAM) OpenFOAM)
case "$WM_COMPILER" in case "$WM_COMPILER" in
Gcc43) Gcc43)
export WM_COMPILER_DIR=$thirdParty/gcc-4.3.0/platforms/$WM_ARCH$WM_COMPILER_ARCH export WM_COMPILER_DIR=$WM_THIRD_PARTY/gcc-4.3.0/platforms/$WM_ARCH$WM_COMPILER_ARCH
;; ;;
Gcc) Gcc)
export WM_COMPILER_DIR=$thirdParty/gcc-4.2.2/platforms/$WM_ARCH$WM_COMPILER_ARCH export WM_COMPILER_DIR=$WM_THIRD_PARTY/gcc-4.2.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
;; ;;
esac esac
@ -146,7 +142,7 @@ unset MPI_ARCH_PATH
case "$WM_MPLIB" in case "$WM_MPLIB" in
OPENMPI) OPENMPI)
mpi_version=openmpi-1.2.6 mpi_version=openmpi-1.2.6
export MPI_HOME=$thirdParty/$mpi_version export MPI_HOME=$WM_THIRD_PARTY/$mpi_version
export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
# Tell OpenMPI where to find its install directory # Tell OpenMPI where to find its install directory
@ -161,9 +157,9 @@ OPENMPI)
LAM) LAM)
mpi_version=lam-7.1.4 mpi_version=lam-7.1.4
export MPI_HOME=$thirdParty/$mpi_version export MPI_HOME=$WM_THIRD_PARTY/$mpi_version
export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
export LAMHOME=$thirdParty/$mpi_version export LAMHOME=$WM_THIRD_PARTY/$mpi_version
# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
AddLib $MPI_ARCH_PATH/lib AddLib $MPI_ARCH_PATH/lib
@ -175,7 +171,7 @@ LAM)
MPICH) MPICH)
mpi_version=mpich-1.2.4 mpi_version=mpich-1.2.4
export MPI_HOME=$thirdParty/$mpi_version export MPI_HOME=$WM_THIRD_PARTY/$mpi_version
export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
export MPICH_ROOT=$MPI_ARCH_PATH export MPICH_ROOT=$MPI_ARCH_PATH