diff --git a/applications/utilities/mesh/conversion/Optional/AllwmakeOptional b/applications/utilities/mesh/conversion/Optional/AllwmakeOptional
index ca4d3a8d6c072f37795a2039dd640bdc299ab8d3..95f041dd612d0864327b5afa3e50f5377f618a03 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_THIRD_PARTY && ./AllwmakeLibccmio
+ cd $WM_THIRD_PARTY_DIR && ./AllwmakeLibccmio
)
fi
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
index 386fc03cf30ab3fd99ae7fe8e40b219c48c4234f..e87c735e37d1ef96d887aa2ecfb06af748ce8f1c 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_THIRD_PARTY}/libccmio-2.6.1 \
- -I${WM_THIRD_PARTY}/libccmio-2.6.1/lnInclude
+ -I${WM_THIRD_PARTY_DIR}/libccmio-2.6.1 \
+ -I${WM_THIRD_PARTY_DIR}/libccmio-2.6.1/lnInclude
EXE_LIBS = \
-lfiniteVolume \
diff --git a/etc/bashrc b/etc/bashrc
index a6f3bf4bfd79e8a79debe88bf6ced46e8b25bbd2..6040b766175d128637556a5bb9086a3ab426fb29 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -59,7 +59,7 @@ 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
+export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
# Operating System/Platform from Unix or MSWindows
diff --git a/etc/cshrc b/etc/cshrc
index 0611f84f83dcb2b6af6402b7d11578094636b2be..a8de0bdd68e20f0f1e069c5cb70a38acff19911b 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -57,7 +57,7 @@ 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
+setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
diff --git a/etc/settings.csh b/etc/settings.csh
index 0070dd09a5af8c9e72b40cea37eedf27210d6281..1e4d509e8a574aa0e8622318e5d5a74c2db260a6 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -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
diff --git a/etc/settings.sh b/etc/settings.sh
index 41972afe9a50d118806d79bf1b2f279fbf93f041..7631ac900efdb354c200ab9e35edf073b1d98c8b 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -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
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options
index a158e9202683d567ecb83477d0ae97ca6b5b83c7..bc278a29cb245bdfa2021b8ed4ee7ebf0eb3d0da 100644
--- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options
+++ b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options
@@ -1,4 +1,4 @@
-ParMGridGen = $(THIRD_PARTY)/ParMGridGen-1.0
+ParMGridGen = $(WM_THIRD_PARTY_DIR)/ParMGridGen-1.0
TYPE_REAL=
#if defined(SP)
diff --git a/src/decompositionAgglomeration/decompositionMethods/Make/options b/src/decompositionAgglomeration/decompositionMethods/Make/options
index bd781ef9cad0fa8f75ff0a44e48da5ebe09a67b9..9ccb652d2bc1b807bb48da05d6b82456ffeabedb 100644
--- a/src/decompositionAgglomeration/decompositionMethods/Make/options
+++ b/src/decompositionAgglomeration/decompositionMethods/Make/options
@@ -1,5 +1,5 @@
EXE_INC = \
- -I$(THIRD_PARTY)/metis-5.0pre2/include
+ -I$(WM_THIRD_PARTY_DIR)/metis-5.0pre2/include
LIB_LIBS = \
-lmetis \
diff --git a/src/decompositionAgglomeration/parMetisDecomp/Make/options b/src/decompositionAgglomeration/parMetisDecomp/Make/options
index be8ac3eea1fbdd5ca220be6642dacfd86b6baf39..475bf5dbb17c41f753c8fe86906486f089ca956f 100644
--- a/src/decompositionAgglomeration/parMetisDecomp/Make/options
+++ b/src/decompositionAgglomeration/parMetisDecomp/Make/options
@@ -2,8 +2,8 @@ include $(RULES)/mplib$(WM_MPLIB)
EXE_INC = \
$(PFLAGS) $(PINC) \
- -I$(THIRD_PARTY)/ParMetis-3.1/ParMETISLib \
- -I$(THIRD_PARTY)/ParMetis-3.1 \
+ -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1/ParMETISLib \
+ -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1 \
-I../decompositionMethods/lnInclude
LIB_LIBS = \