diff --git a/applications/utilities/mesh/conversion/Optional/AllwmakeOptional b/applications/utilities/mesh/conversion/Optional/AllwmakeOptional
index c5536397a1df370867164dfaab479594a31301d3..ca4d3a8d6c072f37795a2039dd640bdc299ab8d3 100755
--- a/applications/utilities/mesh/conversion/Optional/AllwmakeOptional
+++ b/applications/utilities/mesh/conversion/Optional/AllwmakeOptional
@@ -6,7 +6,7 @@ set -x
if [ ! -e $FOAM_LIBBIN/libccmio.so ]
then
(
- cd $WM_PROJECT_DIR/../ThirdParty && ./AllwmakeLibccmio
+ cd $WM_THIRD_PARTY && ./AllwmakeLibccmio
)
fi
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
index b999b0d456573edb265b42e45e64af1edcb93849..386fc03cf30ab3fd99ae7fe8e40b219c48c4234f 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
@@ -1,8 +1,8 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I${WM_PROJECT_DIR}/../ThirdParty/libccmio-2.6.1 \
- -I${WM_PROJECT_DIR}/../ThirdParty/libccmio-2.6.1/lnInclude
+ -I${WM_THIRD_PARTY}/libccmio-2.6.1 \
+ -I${WM_THIRD_PARTY}/libccmio-2.6.1/lnInclude
EXE_LIBS = \
-lfiniteVolume \
diff --git a/etc/bashrc b/etc/bashrc
index c7eb7684703e705f40bf111b93b417f30e1cd4c7..a6f3bf4bfd79e8a79debe88bf6ced46e8b25bbd2 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -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
+# Location of third-party software
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+export WM_THIRD_PARTY=$WM_PROJECT_INST_DIR/ThirdParty
+
+
# Operating System/Platform from Unix or MSWindows
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WM_OS = Unix | MSWindows
diff --git a/etc/cshrc b/etc/cshrc
index 78f894bc55ba6e758559ee9d70ac64fa9bdc146c..0611f84f83dcb2b6af6402b7d11578094636b2be 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -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
+# 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)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc
diff --git a/etc/settings.csh b/etc/settings.csh
index 7e9b30d4427130bbaac997884c421aae5dec8cfa..0070dd09a5af8c9e72b40cea37eedf27210d6281 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -74,11 +74,6 @@ AddPath $FOAM_USER_APPBIN
setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
-# Location of third-party software
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-set thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
-
-
# Compiler settings
# ~~~~~~~~~~~~~~~~~
set WM_COMPILER_BIN=
@@ -94,10 +89,10 @@ switch ("$WM_COMPILER_INST")
case OpenFOAM:
switch ("$WM_COMPILER")
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
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
endsw
@@ -135,7 +130,7 @@ unset MPI_ARCH_PATH
switch ("$WM_MPLIB")
case OPENMPI:
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
# Tell OpenMPI where to find its install directory
@@ -150,9 +145,9 @@ case OPENMPI:
case LAM:
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 LAMHOME $thirdParty/$mpi_version
+ setenv LAMHOME $WM_THIRD_PARTY/$mpi_version
# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
AddLib $MPI_ARCH_PATH/lib
@@ -164,7 +159,7 @@ case LAM:
case MPICH:
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 MPICH_ROOT $MPI_ARCH_PATH
diff --git a/etc/settings.sh b/etc/settings.sh
index 70bbee2f8b47e8d95c46d1e6f0b927d5d603e289..41972afe9a50d118806d79bf1b2f279fbf93f041 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -91,10 +91,6 @@ AddPath $FOAM_USER_APPBIN
export FOAM_RUN=$WM_PROJECT_USER_DIR/run
-# Location of third-party software
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
-
# Compiler settings
# ~~~~~~~~~~~~~~~~~
WM_COMPILER_BIN=
@@ -109,10 +105,10 @@ case "$WM_COMPILER_INST" in
OpenFOAM)
case "$WM_COMPILER" in
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)
- 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
@@ -146,7 +142,7 @@ unset MPI_ARCH_PATH
case "$WM_MPLIB" in
OPENMPI)
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
# Tell OpenMPI where to find its install directory
@@ -161,9 +157,9 @@ OPENMPI)
LAM)
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 LAMHOME=$thirdParty/$mpi_version
+ export LAMHOME=$WM_THIRD_PARTY/$mpi_version
# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
AddLib $MPI_ARCH_PATH/lib
@@ -175,7 +171,7 @@ LAM)
MPICH)
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 MPICH_ROOT=$MPI_ARCH_PATH