Corrected for relacation of src/other to $WM_PROJECT_INST_DIR/ThirdParty

Allwmake

 #!/bin/sh
 set -x
 
-( cd wmake && ./makeWmake )
+(cd $WM_PROJECT_INST_DIR/ThirdParty && ./Allwmake)
 
-( cd src && ./Allwmake )
+(cd wmake && ./makeWmake)
 
-( cd applications && ./Allwmake )
+(cd src && ./Allwmake)
+
+(cd applications && ./Allwmake)
 
 if [ "$1" = doc ]
 then
-   ( cd doc && ./Allwmake)
+   (cd doc && ./Allwmake)
 fi

etc/settings.csh

@@ -121,10 +121,15 @@ if ($?WM_COMPILER_BIN) then
 endif
 
 
+# Third-party software
+# ~~~~~~~~~~~~~~~~~~~~
+set thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
+
+
 # MICO
 # ~~~~
 setenv MICO_VERSION 2.3.12
-setenv MICO_PATH $FOAM_SRC/other/mico-$MICO_VERSION
+setenv MICO_PATH $thirdParty/mico-$MICO_VERSION
 setenv MICO_ARCH_PATH $MICO_PATH/platforms/$WM_OPTIONS
 set path=($MICO_ARCH_PATH/bin $path)
 
@@ -158,7 +163,7 @@ endif
 switch ("$WM_MPLIB")
 case OPENMPI:
     set ompi_version=1.2.6
-    setenv OPENMPI_HOME $FOAM_SRC/other/openmpi-$ompi_version
+    setenv OPENMPI_HOME $thirdParty/openmpi-$ompi_version
     setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS
 
     # Tell OpenMPI where to find it's install directory
@@ -173,7 +178,7 @@ case OPENMPI:
 
 case LAM:
     set lam_version=7.1.4
-    setenv LAMHOME $FOAM_SRC/other/lam-$lam_version
+    setenv LAMHOME $thirdParty/lam-$lam_version
     setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
 
     AddLib $LAM_ARCH_PATH/lib
@@ -185,7 +190,7 @@ case LAM:
 
 case MPICH:
     set mpich_version=1.2.4
-    setenv MPICH_PATH $FOAM_SRC/other/mpich-$mpich_version
+    setenv MPICH_PATH $thirdParty/mpich-$mpich_version
     setenv MPICH_ARCH_PATH $MPICH_PATH/platforms/$WM_OPTIONS
     setenv MPICH_ROOT $MPICH_ARCH_PATH
 

etc/settings.sh

@@ -128,10 +128,15 @@ if [ "$WM_COMPILER_BIN" != "" ]; then
 fi
 
 
+# Third-party software
+# ~~~~~~~~~~~~~~~~~~~~
+thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
+
+
 # MICO
 # ~~~~
 export MICO_VERSION=2.3.12
-export MICO_PATH=$FOAM_SRC/other/mico-$MICO_VERSION
+export MICO_PATH=$thirdParty/mico-$MICO_VERSION
 export MICO_ARCH_PATH=$MICO_PATH/platforms/$WM_OPTIONS
 export PATH=$MICO_ARCH_PATH/bin:$PATH
 
@@ -159,7 +164,7 @@ export FOAMX_CONFIG
 case "$WM_MPLIB" in
 OPENMPI)
     ompi_version=1.2.6
-    export OPENMPI_HOME=$FOAM_SRC/other/openmpi-$ompi_version
+    export OPENMPI_HOME=$thirdParty/openmpi-$ompi_version
     export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS
 
     # Tell OpenMPI where to find it's install directory
@@ -174,7 +179,7 @@ OPENMPI)
 
 LAM)
     lam_version=7.1.4
-    export LAMHOME=$FOAM_SRC/other/lam-$lam_version
+    export LAMHOME=$thirdParty/lam-$lam_version
     export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
 
     AddLib  $LAM_ARCH_PATH/lib
@@ -186,7 +191,7 @@ LAM)
 
 MPICH)
     mpich_version=1.2.4
-    export MPICH_PATH=$FOAM_SRC/other/mpich-$mpich_version
+    export MPICH_PATH=$thirdParty/mpich-$mpich_version
     export MPICH_ARCH_PATH=$MPICH_PATH/platforms/$WM_OPTIONS
     export MPICH_ROOT=$MPICH_ARCH_PATH
 

src/Allwmake

@@ -2,9 +2,7 @@
 set -x
 
 ( cd OpenFOAM && wmakeLnInclude . )
-( cd other && ./Allwmake )
 ( cd Pstream && ./Allwmake )
-
 wmake libo OSspecific/$WM_OS
 wmake libso OpenFOAM
 

src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake

-wmake libso ParMGridGen-1.0/MGridGen/IMlib
-wmake libso ParMGridGen-1.0/MGridGen/Lib
 wmake libso MGridGenGAMGAgglomeration

src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options

-ParMGridGen = $(LIB_SRC)/decompositionAgglomeration/MGridGenGamgAgglomeration/ParMGridGen-1.0
+ParMGridGen = ${WM_PROJECT_INST_DIR}/ThirdParty/ParMGridGen-1.0
 
 TYPE_REAL=
 #if defined(SP)

src/decompositionAgglomeration/decompositionMethods/Make/options

 EXE_INC = \
-    -I$(FOAM_SRC)/other/metis-5.0pre2/include
+    -I${WM_PROJECT_INST_DIR}/ThirdParty/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$(FOAM_SRC)/other/ParMetis-3.1/ParMETISLib \
-    -I$(FOAM_SRC)/other/ParMetis-3.1 \
+    -I${WM_PROJECT_INST_DIR}/ThirdParty/ParMetis-3.1/ParMETISLib \
+    -I${WM_PROJECT_INST_DIR}/ThirdParty/ParMetis-3.1 \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \