Changed WM_THIRD_PARTY to WM_THIRD_PARTY_DIR and added to all 'options' files that use third-party software.

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
 

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_DIR}/libccmio-2.6.1 \
-    -I${WM_THIRD_PARTY}/libccmio-2.6.1/lnInclude
+    -I${WM_THIRD_PARTY_DIR}/libccmio-2.6.1/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \

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

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)

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
 

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
 

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)

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 \

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$(WM_THIRD_PARTY_DIR)/ParMetis-3.1/ParMETISLib \
-    -I$(THIRD_PARTY)/ParMetis-3.1 \
+    -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1 \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \