From 83b101a1b8a73af9530e2f8b6762f868cd6b060c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 27 May 2008 15:07:34 +0200
Subject: [PATCH 01/19] ParaView build fixes

  * share libs were not getting built
  * can now build from anywhere if the source is in $WM_PROJECT_INST_DIR
  * misc. stylistic changes
---
 bin/buildParaView3.2.1                 | 156 ----------------------
 bin/{ => tools}/buildParaView3.3-cvs   |  46 +++----
 bin/{ => tools}/buildParaViewFunctions | 172 ++++++++++++++++---------
 3 files changed, 133 insertions(+), 241 deletions(-)
 delete mode 100755 bin/buildParaView3.2.1
 rename bin/{ => tools}/buildParaView3.3-cvs (71%)
 rename bin/{ => tools}/buildParaViewFunctions (61%)

diff --git a/bin/buildParaView3.2.1 b/bin/buildParaView3.2.1
deleted file mode 100755
index 81a315fcee..0000000000
--- a/bin/buildParaView3.2.1
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/sh
-set -x
-
-# ParaView 3.x build script
-# - run from folder above source folder
-PARAVIEW_SRC="ParaView3.2.1"
-
-VERBOSE="OFF"
-INCLUDE_MPI="ON"
-MPI_MAX_PROCS=32
-INCLUDE_PYTHON="ON"
-INCLUDE_MESA="OFF"
-
-# initialisation
-CMAKE_VARIABLES=""
-PWD=`pwd`
-OBJ_ADD=""
-
-# set general options
-CMAKE_VARIABLES="$CMAKE_VARIABLES -DBUILD_SHARED_LIBS:BOOL=ON"
-
-if [ "$VERBOSE" = "ON" ]; then
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -DCMAKE_VERBOSE_MAKEFILE=TRUE"
-fi
-
-# set MPI specific options
-if [ "$INCLUDE_MPI" = "ON" ]; then
-    OBJ_ADD="$OBJ_ADD-mpi"
-
-    if [ "$WM_MPLIB" = "OPENMPI" ]; then
-        MPI_INCLUDE_PATH=$OPENMPI_ARCH_PATH/include
-        MPI_LIBRARY=$OPENMPI_ARCH_PATH/lib/libmpi.so
-        MPI_RUN=$OPENMPI_ARCH_PATH/bin/mpirun
-    elif [ "$WM_MPLIB" = "LAM" ]; then
-        MPI_INCLUDE_PATH=$LAM_ARCH_PATH/include
-        MPI_LIBRARY=$LAM_ARCH_PATH/lib/libmpi.so
-        MPI_RUN=$LAM_ARCH_PATH/bin/mpirun
-    elif [ "$WM_MPLIB" = "MPICH" ]; then
-        MPI_INCLUDE_PATH=$MPICH_ARCH_PATH/include
-        MPI_LIBRARY=$MPICH_ARCH_PATH/lib/libmpich.so
-        MPI_RUN=$MPICH_ARCH_PATH/bin/mpirun
-    fi
-
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -DVTK_USE_MPI=ON"
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -DPARAVIEW_USE_MPI=ON"
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -DMPI_INCLUDE_PATH=$MPI_INCLUDE_PATH"
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -DMPI_LIBRARY=$MPI_LIBRARY"
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -DVTK_MPIRUN_EXE=$MPI_RUN"
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -DVTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS"
-fi
-
-# set python specific options
-if [ "$INCLUDE_PYTHON" = "ON" ]; then
-    WHICH_PYTHON=`which python`
-    if [ "$WHICH_PYTHON" != "" ]; then
-        OBJ_ADD="$OBJ_ADD-py"
-
-        PYTHON_LIBRARY=`ldd $WHICH_PYTHON | grep libpython | \
-            sed 's/.* => \(.*\) (.*/\1/'`
-        PYTHON_MAJOR_VERSION=`echo $PYTHON_LIBRARY | \
-            sed 's/.*libpython\(.*\).so.*/\1/'`
-        PYTHON_INCLUDE_DIR=/usr/include/python$PYTHON_MAJOR_VERSION
-
-        CMAKE_VARIABLES="$CMAKE_VARIABLES -DPARAVIEW_ENABLE_PYTHON=ON"
-        CMAKE_VARIABLES= \
-            "$CMAKE_VARIABLES -DPYTHON_INCLUDE_PATH=$PYTHON_INCLUDE_DIR"
-        CMAKE_VARIABLES="$CMAKE_VARIABLES -DPYTHON_LIBRARY=$PYTHON_LIBRARY"
-    else
-        echo "*** Warning: Unable to determine python libray"
-        echo "***          De-activating python support"
-        INCLUDE_PYTHON="OFF"
-    fi
-fi
-
-# set MESA specific options
-if [ "$INCLUDE_MESA" = "ON" ]; then
-    OBJ_ADD="$OBJ_ADD-mesa"
-
-    MESA_INCLUDE_DIR=/usr/include/GL
-    MESA_LIBRARY=/usr/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so
-
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -DVTK_OPENGL_HAS_OSMESA=ON"
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -DOSMESA_INCLUDE_DIR=$MESA_INCLUDE_DIR"
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -DOSMESA_LIBRARY=$MESA_LIBRARY"
-fi
-
-# set paraview environment
-PARAVIEW_SRC_DIR=$PWD/$PARAVIEW_SRC
-#PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS/obj$OBJ_ADD
-PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS
-
-# remove existing build folder if present
-if [ -e "$PARAVIEW_OBJ_DIR" ]; then
-    rm -rf $PARAVIEW_OBJ_DIR
-fi
-
-# create paraview build folder
-mkdir -p $PARAVIEW_OBJ_DIR
-cd $PARAVIEW_OBJ_DIR
-
-echo "Building $PARAVIEW_SRC"
-echo "    MPI support    : $INCLUDE_MPI"
-echo "    Python support : $INCLUDE_PYTHON"
-echo "    MESA support   : $INCLUDE_MESA"
-echo "    Source         : $PARAVIEW_SRC_DIR"
-echo "    Target         : $PARAVIEW_OBJ_DIR"
-
-# make paraview
-cmake \
-    -DCMAKE_INSTALL_PREFIX=$PARAVIEW_APP_DIR \
-    $CMAKE_VARIABLES \
-    $PARAVIEW_SRC_DIR
-
-if [ -r /proc/cpuinfo ]; then
-    WM_NCOMPPROCS=`egrep "^processor" /proc/cpuinfo | wc -l`
-
-    if [ $WM_NCOMPPROCS -gt 8 ]; then
-        WM_NCOMPPROCS=8
-    fi
-
-    make -j $WM_NCOMPPROCS
-else
-    make
-fi
-
-if [ -e "$PARAVIEW_OBJ_DIR/bin/paraview" ]; then
-    echo "    Build complete"
-
-    # replace local links with ParaView_INST_DIR environment variables
-    echo "    Replacing path hard links"
-    find . -iname \*.cmake -execdir sed -i \
-        "s,$PARAVIEW_SRC_DIR,\$ENV{ParaView_INST_DIR},g" {} ';' \
-        -print
-
-    # create a softlink to the $PARAVIEW_OBJ_DIR/bin folder
-    echo "    Creating paraview 3.2 soft link to /bin"
-    ( mkdir lib && cd lib && ln -s ../bin paraview-3.2 )
-
-    # info on symlinks to screen
-    echo ""
-    echo "    ---"
-    echo "    Installation complete"
-    echo "    Set environment variables:"
-    echo "    - ParaView_INST_DIR to $PARAVIEW_SRC_DIR"
-    echo "    - ParaView_DIR to $PARAVIEW_OBJ_DIR"
-    echo "    - PV_PLUGIN_PATH to $FOAM_LIBBIN"
-    echo "    Add $PARAVIEW_OBJ_DIR/bin to PATH"
-    #echo "   Add $ParaView_INST_DIR/lib to LD_LIBRARY_PATH"
-    echo "    ---"
-    echo "done."
-fi
-
-# finalisation
-cd $PWD
-
-
diff --git a/bin/buildParaView3.3-cvs b/bin/tools/buildParaView3.3-cvs
similarity index 71%
rename from bin/buildParaView3.3-cvs
rename to bin/tools/buildParaView3.3-cvs
index 40a879cd24..32ee3cf169 100755
--- a/bin/buildParaView3.3-cvs
+++ b/bin/tools/buildParaView3.3-cvs
@@ -28,48 +28,42 @@
 #
 # Description
 #     Build and install ParaView
-#     - run from folder above source folder
+#     - run from folder above ParaView source folder or place the
+#       ParaView source under $WM_PROJECT_INST_DIR
 #
 #------------------------------------------------------------------------------
-set -x
+. $WM_PROJECT_DIR/bin/tools/buildParaViewFunctions
 
-. $WM_PROJECT_DIR/bin/buildParaViewFunctions
+# set -x
 
 PARAVIEW_SRC="ParaView3.3-cvs"
-PARAVIEW_MAJOR_VERSION="3.2"
+PARAVIEW_MAJOR_VERSION="3.3"
 
-VERBOSE="OFF"
-INCLUDE_MPI="ON"
+VERBOSE=OFF
+INCLUDE_MPI=ON
 MPI_MAX_PROCS=32
-INCLUDE_PYTHON="ON"
+INCLUDE_PYTHON=ON
 #PYTHON_LIBRARY="/usr/lib64/libpython2.5.so.1.0"
 PYTHON_LIBRARY=""
-INCLUDE_MESA="OFF"
+INCLUDE_MESA=OFF
 
+set +x
+
+# provide a shortcut for repeated builds - use with caution
+if [ "$#" -gt 0 ]
+then
+   CMAKE_SKIP=YES
+fi
 
 initialiseVariables
 
-# set MPI specific options
-if [ "$INCLUDE_MPI" = "ON" ]; then
-    addMpiSupport
-fi
-
-# set python specific options
-if [ "$INCLUDE_PYTHON" = "ON" ]; then
-    addPythonSupport
-fi
-
-# set MESA specific options
-if [ "$INCLUDE_MESA" = "ON" ]; then
-    addMesaSupport
-fi
+addMpiSupport       # set MPI specific options
+addPythonSupport    # set python specific options
+addMesaSupport      # set MESA specific options
 
 buildParaView
-
 installParaView
 
-# finalisation
-cd $PWD
-
 echo "done."
 
+#------------------------------------------------------------------------------
diff --git a/bin/buildParaViewFunctions b/bin/tools/buildParaViewFunctions
similarity index 61%
rename from bin/buildParaViewFunctions
rename to bin/tools/buildParaViewFunctions
index 5013080096..326fed83ba 100644
--- a/bin/buildParaViewFunctions
+++ b/bin/tools/buildParaViewFunctions
@@ -31,59 +31,71 @@
 #
 #------------------------------------------------------------------------------
 
+addCMakeVariable ()
+{
+    while [ -n "$1" ]
+    do
+        CMAKE_VARIABLES="$CMAKE_VARIABLES -D$1"
+        shift
+    done
+}
+
+
 initialiseVariables ()
 {
-    CMAKE_VARIABLES=""
-    PWD=`pwd`
-    OBJ_ADD=""
+    unset CMAKE_VARIABLES OBJ_ADD
 
-    if [ "$VERBOSE" = "ON" ]; then
+    if [ "$VERBOSE" = ON ]; then
         addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
     fi
 }
 
 
-addCMakeVariable ()
-{
-    if [ -z "$1" ]; then
-        echo "*** Error: addCMakeVariable()"
-        echo "    No variable to add"
-    fi
-
-    CMAKE_VARIABLES="$CMAKE_VARIABLES -D$1"
-}
-
-
 addMpiSupport ()
 {
-    OBJ_ADD="$OBJ_ADD-mpi"
+    [ "$INCLUDE_MPI" = ON ] || return
 
-   # using OpenFOAM variables to identify location of MPI libraries
-   if [ "$WM_MPLIB" = "OPENMPI" ]; then
+    # using OpenFOAM variables to identify location of MPI libraries
+    case "$WM_MPLIB" in
+    OPENMPI)
         MPI_INCLUDE_PATH=$OPENMPI_ARCH_PATH/include
         MPI_LIBRARY=$OPENMPI_ARCH_PATH/lib/libmpi.so
         MPI_RUN=$OPENMPI_ARCH_PATH/bin/mpirun
-    elif [ "$WM_MPLIB" = "LAM" ]; then
+        ;;
+    LAM)
         MPI_INCLUDE_PATH=$LAM_ARCH_PATH/include
         MPI_LIBRARY=$LAM_ARCH_PATH/lib/libmpi.so
         MPI_RUN=$LAM_ARCH_PATH/bin/mpirun
-    elif [ "$WM_MPLIB" = "MPICH" ]; then
+        ;;
+    MPICH)
         MPI_INCLUDE_PATH=$MPICH_ARCH_PATH/include
         MPI_LIBRARY=$MPICH_ARCH_PATH/lib/libmpich.so
         MPI_RUN=$MPICH_ARCH_PATH/bin/mpirun
-    fi
+        ;;
+    *)
+        unset MPI_INCLUDE_PATH
+        ;;
+    esac
 
-    addCMakeVariable "VTK_USE_MPI=ON"
-    addCMakeVariable "PARAVIEW_USE_MPI=ON"
-    addCMakeVariable "MPI_INCLUDE_PATH=$MPI_INCLUDE_PATH"
-    addCMakeVariable "MPI_LIBRARY=$MPI_LIBRARY"
-    addCMakeVariable "VTK_MPIRUN_EXE=$MPI_RUN"
-    addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS"
+    if [ "$MPI_INCLUDE_PATH" ]; then
+        OBJ_ADD="$OBJ_ADD-mpi"
+        addCMakeVariable "VTK_USE_MPI=ON"
+        addCMakeVariable "PARAVIEW_USE_MPI=ON"
+        addCMakeVariable "MPI_INCLUDE_PATH=$MPI_INCLUDE_PATH"
+        addCMakeVariable "MPI_LIBRARY=$MPI_LIBRARY"
+        addCMakeVariable "VTK_MPIRUN_EXE=$MPI_RUN"
+        addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS"
+    else
+       echo "unknown/unsupported mpi: $WM_MPLIB"
+       INCLUDE_MPI=OFF
+    fi
 }
 
 
 addPythonSupport ()
 {
+    [ "$INCLUDE_PYTHON" = ON ] || return
+
     WHICH_PYTHON=`which python`
     if [ -n "$WHICH_PYTHON" ]; then
         OBJ_ADD="$OBJ_ADD-py"
@@ -130,49 +142,82 @@ addPythonSupport ()
 
 addMesaSupport ()
 {
-    OBJ_ADD="$OBJ_ADD-mesa"
+   [ "$INCLUDE_MESA" = ON ] || return
 
-    MESA_INCLUDE_DIR=/usr/include/GL
-    MESA_LIBRARY=/usr/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so
+   MESA_INCLUDE_DIR=/usr/include/GL
+   MESA_LIBRARY=/usr/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so
 
-    addCMakeVariable "VTK_OPENGL_HAS_OSMESA=ON"
-    addCMakeVariable "OSMESA_INCLUDE_DIR=$MESA_INCLUDE_DIR"
-    addCMakeVariable "OSMESA_LIBRARY=$MESA_LIBRARY"
+   if [ -d "$MESA_INCLUDE_DIR" -a -f "$MESA_LIBRARY" ]; then
+       OBJ_ADD="$OBJ_ADD-mesa"
+       addCMakeVariable "VTK_OPENGL_HAS_OSMESA=ON"
+       addCMakeVariable "OSMESA_INCLUDE_DIR=$MESA_INCLUDE_DIR"
+       addCMakeVariable "OSMESA_LIBRARY=$MESA_LIBRARY"
+   else
+       echo "no MESA information found ... skipping"
+       INCLUDE_MESA=OFF
+   fi
 }
 
 
 buildParaView ()
 {
     # set general options
-    addCmakeVariable "DBUILD_SHARED_LIBS:BOOL=ON"
+    addCMakeVariable "BUILD_SHARED_LIBS:BOOL=ON"
 
     # set paraview environment
-    PARAVIEW_SRC_DIR=$PWD/$PARAVIEW_SRC
+    unset PARAVIEW_SRC_DIR
+    for i in $PWD $WM_PROJECT_INST_DIR
+    do
+       if [ -d $i/$PARAVIEW_SRC ]
+       then
+          PARAVIEW_SRC_DIR=$i/$PARAVIEW_SRC
+          break
+       fi
+    done
+
+    [ -d "$PARAVIEW_SRC_DIR" ] || {
+       echo "did not find $PARAVIEW_SRC in these directories:"
+       echo "  PWD=$PWD"
+       echo "  WM_PROJECT_INST_DIR=$WM_PROJECT_INST_DIR"
+       echo "abort build"
+       exit 1
+    }
+
     #PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS/obj$OBJ_ADD
     PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS
 
-    # remove existing build folder if present
-    if [ -e "$PARAVIEW_OBJ_DIR" ]; then
-        rm -rf $PARAVIEW_OBJ_DIR
+    # provide a shortcut for repeated builds - use with caution
+    if [ "$CMAKE_SKIP" = YES ]
+    then
+
+       # change to build folder
+       cd $PARAVIEW_OBJ_DIR || exit 1
+
+    else
+
+       # remove existing build folder if present
+       if [ -e "$PARAVIEW_OBJ_DIR" ]; then
+           rm -rf $PARAVIEW_OBJ_DIR
+       fi
+
+       # create paraview build folder
+       mkdir -p $PARAVIEW_OBJ_DIR
+       cd $PARAVIEW_OBJ_DIR
+
+       echo "Building $PARAVIEW_SRC"
+       echo "    MPI support    : $INCLUDE_MPI"
+       echo "    Python support : $INCLUDE_PYTHON"
+       echo "    MESA support   : $INCLUDE_MESA"
+       echo "    Source         : $PARAVIEW_SRC_DIR"
+       echo "    Target         : $PARAVIEW_OBJ_DIR"
+
+       # make paraview
+       cmake \
+           -DCMAKE_INSTALL_PREFIX=$PARAVIEW_APP_DIR \
+           $CMAKE_VARIABLES \
+           $PARAVIEW_SRC_DIR
     fi
 
-    # create paraview build folder
-    mkdir -p $PARAVIEW_OBJ_DIR
-    cd $PARAVIEW_OBJ_DIR
-
-    echo "Building $PARAVIEW_SRC"
-    echo "    MPI support    : $INCLUDE_MPI"
-    echo "    Python support : $INCLUDE_PYTHON"
-    echo "    MESA support   : $INCLUDE_MESA"
-    echo "    Source         : $PARAVIEW_SRC_DIR"
-    echo "    Target         : $PARAVIEW_OBJ_DIR"
-
-    # make paraview
-    cmake \
-        -DCMAKE_INSTALL_PREFIX=$PARAVIEW_APP_DIR \
-        $CMAKE_VARIABLES \
-        $PARAVIEW_SRC_DIR
-
     if [ -r /proc/cpuinfo ]; then
         WM_NCOMPPROCS=`egrep "^processor" /proc/cpuinfo | wc -l`
 
@@ -201,10 +246,10 @@ installParaView ()
             -print
 
         # create a softlink to the $PARAVIEW_OBJ_DIR/bin folder
-        # - work-around for chosen install location
+        # - workaround for chosen install location
         echo "    Creating paraview $PARAVIEW_MAJOR_VERSION soft link to /bin"
-        ( mkdir lib && cd lib && ln -s ../bin \
-            paraview-$PARAVIEW_MAJOR_VERSION )
+        (  mkdir lib && cd lib && ln -s ../bin \
+            paraview-$PARAVIEW_MAJOR_VERSION  )
 
         # info on symlinks to screen
         echo ""
@@ -215,7 +260,16 @@ installParaView ()
         echo "    - ParaView_DIR to $PARAVIEW_OBJ_DIR"
         echo "    - PV_PLUGIN_PATH to $FOAM_LIBBIN"
         echo "    Add $PARAVIEW_OBJ_DIR/bin to PATH"
-        #echo "   Add $ParaView_INST_DIR/lib to LD_LIBRARY_PATH"
+        # echo "   Add $ParaView_INST_DIR/lib to LD_LIBRARY_PATH"
         echo "    ---"
     fi
 }
+
+
+# for good measure - clear a few variables before using any of the functions
+
+unset VERBOSE INCLUDE_MPI INCLUDE_PYTHON INCLUDE_MESA PYTHON_LIBRARY
+unset CMAKE_VARIABLES OBJ_ADD
+unset CMAKE_SKIP
+
+#------------------------------------------------------------------------------

From 92b93a2a68db7f85875afb9c7e47b341cf643147 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 28 May 2008 13:05:06 +0200
Subject: [PATCH 02/19] added more informative warnings in dictionary

---
 src/OpenFOAM/db/dictionary/dictionary.C | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 18fac53507..8dd2263574 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -68,7 +68,8 @@ bool Foam::dictionary::add(entry* ePtr, bool mergeEntry)
             else
             {
                 IOWarningIn("dictionary::add(entry* ePtr)", (*this))
-                    << "problem replacing entry in dictionary " << name()
+                    << "problem replacing entry "<< ePtr->keyword()
+                    << " in dictionary " << name()
                     << endl;
 
                 IDLList<entry>::remove(ePtr);
@@ -91,7 +92,8 @@ bool Foam::dictionary::add(entry* ePtr, bool mergeEntry)
     else
     {
         IOWarningIn("dictionary::add(entry* ePtr)", (*this))
-            << "attempt to add an entry already in dictionary " << name()
+            << "attempt to add entry "<< ePtr->keyword()
+            << " which already exists in dictionary " << name()
             << endl;
 
         delete ePtr;

From c0a6360f0b9cab4a93fc1fe3e7c5e51198a067cf Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 29 May 2008 16:02:39 +0100
Subject: [PATCH 03/19] Corrected the setting of WM_COMPILER and renamed I32
 and I64 to Icc.

---
 etc/bashrc                                    |  19 +++--------------
 etc/cshrc                                     |  20 ++++--------------
 wmake/rules/{linux64I64 => linux64Icc}/X      |   0
 wmake/rules/{linux64I64 => linux64Icc}/c      |   0
 wmake/rules/{linux64I64 => linux64Icc}/c++    |   0
 .../rules/{linux64I64 => linux64Icc}/c++Debug |   0
 wmake/rules/{linux64I64 => linux64Icc}/c++Opt |   0
 .../rules/{linux64I64 => linux64Icc}/c++Prof  |   0
 wmake/rules/{linux64I64 => linux64Icc}/cDebug |   0
 wmake/rules/{linux64I64 => linux64Icc}/cOpt   |   0
 wmake/rules/{linux64I64 => linux64Icc}/cProf  |   0
 .../{linux64I64 => linux64Icc}/dirToString    | Bin
 .../rules/{linux64I64 => linux64Icc}/general  |   0
 wmake/rules/{linux64I64 => linux64Icc}/mplib  |   0
 .../rules/{linux64I64 => linux64Icc}/mplibLAM |   0
 .../{linux64I64 => linux64Icc}/mplibMPICH     |   0
 .../{linux64I64 => linux64Icc}/mplibOPENMPI   |   0
 wmake/rules/{linux64I64 => linux64Icc}/wmkdep | Bin
 wmake/rules/{linuxI32 => linuxIA64Icc}/X      |   0
 wmake/rules/{linuxIA64I64 => linuxIA64Icc}/c  |   0
 .../rules/{linuxIA64I64 => linuxIA64Icc}/c++  |   0
 .../rules/{linuxI32 => linuxIA64Icc}/c++Debug |   0
 .../{linuxIA64I64 => linuxIA64Icc}/c++Opt     |   0
 .../{linuxIA64I64 => linuxIA64Icc}/c++Prof    |   0
 wmake/rules/{linuxI32 => linuxIA64Icc}/cDebug |   0
 .../rules/{linuxIA64I64 => linuxIA64Icc}/cOpt |   0
 wmake/rules/{linuxI32 => linuxIA64Icc}/cProf  |   0
 .../dirToString                               | Bin
 .../{linuxIA64I64 => linuxIA64Icc}/general    |   0
 wmake/rules/{linuxI32 => linuxIA64Icc}/mplib  |   0
 .../{linuxIA64I64 => linuxIA64Icc}/mplibIMPI  |   0
 .../rules/{linuxI32 => linuxIA64Icc}/mplibLAM |   0
 .../{linuxIA64I64 => linuxIA64Icc}/mplibMPI   |   0
 .../{linuxI32 => linuxIA64Icc}/mplibMPICH     |   0
 .../{linuxI32 => linuxIA64Icc}/mplibOPENMPI   |   0
 .../{linuxIA64I64 => linuxIA64Icc}/wmkdep     | Bin
 wmake/rules/{linuxIA64I64 => linuxIcc}/X      |   0
 wmake/rules/{linuxI32 => linuxIcc}/c          |   0
 wmake/rules/{linuxI32 => linuxIcc}/c++        |   0
 .../rules/{linuxIA64I64 => linuxIcc}/c++Debug |   0
 wmake/rules/{linuxI32 => linuxIcc}/c++Opt     |   0
 wmake/rules/{linuxI32 => linuxIcc}/c++Prof    |   0
 wmake/rules/{linuxIA64I64 => linuxIcc}/cDebug |   0
 wmake/rules/{linuxI32 => linuxIcc}/cOpt       |   0
 wmake/rules/{linuxIA64I64 => linuxIcc}/cProf  |   0
 .../rules/{linuxI32 => linuxIcc}/dirToString  | Bin
 wmake/rules/{linuxI32 => linuxIcc}/general    |   0
 wmake/rules/{linuxIA64I64 => linuxIcc}/mplib  |   0
 .../rules/{linuxIA64I64 => linuxIcc}/mplibLAM |   0
 .../{linuxIA64I64 => linuxIcc}/mplibMPICH     |   0
 .../{linuxIA64I64 => linuxIcc}/mplibOPENMPI   |   0
 51 files changed, 7 insertions(+), 32 deletions(-)
 rename wmake/rules/{linux64I64 => linux64Icc}/X (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/c (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/c++ (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/c++Debug (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/c++Opt (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/c++Prof (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/cDebug (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/cOpt (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/cProf (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/dirToString (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/general (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/mplib (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/mplibLAM (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/mplibMPICH (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/mplibOPENMPI (100%)
 rename wmake/rules/{linux64I64 => linux64Icc}/wmkdep (100%)
 rename wmake/rules/{linuxI32 => linuxIA64Icc}/X (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIA64Icc}/c (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIA64Icc}/c++ (100%)
 rename wmake/rules/{linuxI32 => linuxIA64Icc}/c++Debug (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIA64Icc}/c++Opt (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIA64Icc}/c++Prof (100%)
 rename wmake/rules/{linuxI32 => linuxIA64Icc}/cDebug (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIA64Icc}/cOpt (100%)
 rename wmake/rules/{linuxI32 => linuxIA64Icc}/cProf (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIA64Icc}/dirToString (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIA64Icc}/general (100%)
 rename wmake/rules/{linuxI32 => linuxIA64Icc}/mplib (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIA64Icc}/mplibIMPI (100%)
 rename wmake/rules/{linuxI32 => linuxIA64Icc}/mplibLAM (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIA64Icc}/mplibMPI (100%)
 rename wmake/rules/{linuxI32 => linuxIA64Icc}/mplibMPICH (100%)
 rename wmake/rules/{linuxI32 => linuxIA64Icc}/mplibOPENMPI (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIA64Icc}/wmkdep (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIcc}/X (100%)
 rename wmake/rules/{linuxI32 => linuxIcc}/c (100%)
 rename wmake/rules/{linuxI32 => linuxIcc}/c++ (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIcc}/c++Debug (100%)
 rename wmake/rules/{linuxI32 => linuxIcc}/c++Opt (100%)
 rename wmake/rules/{linuxI32 => linuxIcc}/c++Prof (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIcc}/cDebug (100%)
 rename wmake/rules/{linuxI32 => linuxIcc}/cOpt (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIcc}/cProf (100%)
 rename wmake/rules/{linuxI32 => linuxIcc}/dirToString (100%)
 rename wmake/rules/{linuxI32 => linuxIcc}/general (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIcc}/mplib (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIcc}/mplibLAM (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIcc}/mplibMPICH (100%)
 rename wmake/rules/{linuxIA64I64 => linuxIcc}/mplibOPENMPI (100%)

diff --git a/etc/bashrc b/etc/bashrc
index cad3ed3774..2fd7b92aa6 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -63,9 +63,10 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
 : ${WM_OS:=Unix}; export WM_OS
 
 
-# Compiler (if set to "" use the system compiler)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export WM_COMPILER=Gcc43
+
 export WM_COMPILER_ARCH=
 export WM_COMPILER_LIB_ARCH=
 
@@ -105,13 +106,11 @@ Linux)
     # compiler specifics
     case `uname -m` in
     i686)
-        # export WM_COMPILER=I32
         ;;
 
     x86_64)
         case $WM_ARCH_OPTION in
         32)
-            # export WM_COMPILER=I64
             export WM_COMPILER_ARCH='-64'
             export WM_CC='gcc'
             export WM_CXX='g++'
@@ -122,7 +121,6 @@ Linux)
         64)
             WM_ARCH=linux64
             export WM_COMPILER_LIB_ARCH=64
-            # export WM_COMPILER=I64
             export WM_CC='gcc'
             export WM_CXX='g++'
             export WM_CFLAGS='-m64 -fPIC'
@@ -144,17 +142,6 @@ Linux)
     esac
     ;;
 
-SunOS)
-    WM_ARCH=solaris
-    ;;
-
-IRIX*)
-    WM_ARCH=sgiN32
-    # export WM_ARCH=sgi64
-    # export WM_COMPILER_LIB_ARCH=/mabi=64
-    export WM_MPLIB=MPI
-    ;;
-
 *)    	# an unsupported operating system
     cat <<USAGE
 
diff --git a/etc/cshrc b/etc/cshrc
index 203466dd7d..5492cc8c96 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -55,9 +55,10 @@ setenv WM_PROJECT_DIR $FOAM_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION
 setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
 
 
-# Compiler (if set to "" use the system compiler)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-setenv WM_COMPILER Gcc
+# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+setenv WM_COMPILER Gcc43
+
 setenv WM_COMPILER_ARCH
 setenv WM_COMPILER_LIB_ARCH
 
@@ -102,13 +103,11 @@ case Linux:
 
     switch (`uname -m`)
     case i686:
-        #setenv WM_COMPILER I32
         breaksw
     case x86_64:
         switch ($WM_ARCH_OPTION)
         case 32:
             setenv WM_ARCH linux
-            #setenv WM_COMPILER I32
             setenv WM_COMPILER_ARCH '-64'
             setenv WM_CC 'gcc'
             setenv WM_CXX 'g++'
@@ -140,17 +139,6 @@ case Linux:
     endsw
     breaksw
 
-case SunOS:
-    setenv WM_ARCH solaris
-    breaksw
-
-case IRIX*:
-    setenv WM_ARCH sgiN32
-    # setenv WM_ARCH sgi64
-    # setenv WM_COMPILER_LIB_ARCH /mabi=64
-    setenv WM_MPLIB MPI
-    breaksw
-
 default:
     echo
     echo "Your '$WM_ARCH' operating system is not supported by this release"
diff --git a/wmake/rules/linux64I64/X b/wmake/rules/linux64Icc/X
similarity index 100%
rename from wmake/rules/linux64I64/X
rename to wmake/rules/linux64Icc/X
diff --git a/wmake/rules/linux64I64/c b/wmake/rules/linux64Icc/c
similarity index 100%
rename from wmake/rules/linux64I64/c
rename to wmake/rules/linux64Icc/c
diff --git a/wmake/rules/linux64I64/c++ b/wmake/rules/linux64Icc/c++
similarity index 100%
rename from wmake/rules/linux64I64/c++
rename to wmake/rules/linux64Icc/c++
diff --git a/wmake/rules/linux64I64/c++Debug b/wmake/rules/linux64Icc/c++Debug
similarity index 100%
rename from wmake/rules/linux64I64/c++Debug
rename to wmake/rules/linux64Icc/c++Debug
diff --git a/wmake/rules/linux64I64/c++Opt b/wmake/rules/linux64Icc/c++Opt
similarity index 100%
rename from wmake/rules/linux64I64/c++Opt
rename to wmake/rules/linux64Icc/c++Opt
diff --git a/wmake/rules/linux64I64/c++Prof b/wmake/rules/linux64Icc/c++Prof
similarity index 100%
rename from wmake/rules/linux64I64/c++Prof
rename to wmake/rules/linux64Icc/c++Prof
diff --git a/wmake/rules/linux64I64/cDebug b/wmake/rules/linux64Icc/cDebug
similarity index 100%
rename from wmake/rules/linux64I64/cDebug
rename to wmake/rules/linux64Icc/cDebug
diff --git a/wmake/rules/linux64I64/cOpt b/wmake/rules/linux64Icc/cOpt
similarity index 100%
rename from wmake/rules/linux64I64/cOpt
rename to wmake/rules/linux64Icc/cOpt
diff --git a/wmake/rules/linux64I64/cProf b/wmake/rules/linux64Icc/cProf
similarity index 100%
rename from wmake/rules/linux64I64/cProf
rename to wmake/rules/linux64Icc/cProf
diff --git a/wmake/rules/linux64I64/dirToString b/wmake/rules/linux64Icc/dirToString
similarity index 100%
rename from wmake/rules/linux64I64/dirToString
rename to wmake/rules/linux64Icc/dirToString
diff --git a/wmake/rules/linux64I64/general b/wmake/rules/linux64Icc/general
similarity index 100%
rename from wmake/rules/linux64I64/general
rename to wmake/rules/linux64Icc/general
diff --git a/wmake/rules/linux64I64/mplib b/wmake/rules/linux64Icc/mplib
similarity index 100%
rename from wmake/rules/linux64I64/mplib
rename to wmake/rules/linux64Icc/mplib
diff --git a/wmake/rules/linux64I64/mplibLAM b/wmake/rules/linux64Icc/mplibLAM
similarity index 100%
rename from wmake/rules/linux64I64/mplibLAM
rename to wmake/rules/linux64Icc/mplibLAM
diff --git a/wmake/rules/linux64I64/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH
similarity index 100%
rename from wmake/rules/linux64I64/mplibMPICH
rename to wmake/rules/linux64Icc/mplibMPICH
diff --git a/wmake/rules/linux64I64/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI
similarity index 100%
rename from wmake/rules/linux64I64/mplibOPENMPI
rename to wmake/rules/linux64Icc/mplibOPENMPI
diff --git a/wmake/rules/linux64I64/wmkdep b/wmake/rules/linux64Icc/wmkdep
similarity index 100%
rename from wmake/rules/linux64I64/wmkdep
rename to wmake/rules/linux64Icc/wmkdep
diff --git a/wmake/rules/linuxI32/X b/wmake/rules/linuxIA64Icc/X
similarity index 100%
rename from wmake/rules/linuxI32/X
rename to wmake/rules/linuxIA64Icc/X
diff --git a/wmake/rules/linuxIA64I64/c b/wmake/rules/linuxIA64Icc/c
similarity index 100%
rename from wmake/rules/linuxIA64I64/c
rename to wmake/rules/linuxIA64Icc/c
diff --git a/wmake/rules/linuxIA64I64/c++ b/wmake/rules/linuxIA64Icc/c++
similarity index 100%
rename from wmake/rules/linuxIA64I64/c++
rename to wmake/rules/linuxIA64Icc/c++
diff --git a/wmake/rules/linuxI32/c++Debug b/wmake/rules/linuxIA64Icc/c++Debug
similarity index 100%
rename from wmake/rules/linuxI32/c++Debug
rename to wmake/rules/linuxIA64Icc/c++Debug
diff --git a/wmake/rules/linuxIA64I64/c++Opt b/wmake/rules/linuxIA64Icc/c++Opt
similarity index 100%
rename from wmake/rules/linuxIA64I64/c++Opt
rename to wmake/rules/linuxIA64Icc/c++Opt
diff --git a/wmake/rules/linuxIA64I64/c++Prof b/wmake/rules/linuxIA64Icc/c++Prof
similarity index 100%
rename from wmake/rules/linuxIA64I64/c++Prof
rename to wmake/rules/linuxIA64Icc/c++Prof
diff --git a/wmake/rules/linuxI32/cDebug b/wmake/rules/linuxIA64Icc/cDebug
similarity index 100%
rename from wmake/rules/linuxI32/cDebug
rename to wmake/rules/linuxIA64Icc/cDebug
diff --git a/wmake/rules/linuxIA64I64/cOpt b/wmake/rules/linuxIA64Icc/cOpt
similarity index 100%
rename from wmake/rules/linuxIA64I64/cOpt
rename to wmake/rules/linuxIA64Icc/cOpt
diff --git a/wmake/rules/linuxI32/cProf b/wmake/rules/linuxIA64Icc/cProf
similarity index 100%
rename from wmake/rules/linuxI32/cProf
rename to wmake/rules/linuxIA64Icc/cProf
diff --git a/wmake/rules/linuxIA64I64/dirToString b/wmake/rules/linuxIA64Icc/dirToString
similarity index 100%
rename from wmake/rules/linuxIA64I64/dirToString
rename to wmake/rules/linuxIA64Icc/dirToString
diff --git a/wmake/rules/linuxIA64I64/general b/wmake/rules/linuxIA64Icc/general
similarity index 100%
rename from wmake/rules/linuxIA64I64/general
rename to wmake/rules/linuxIA64Icc/general
diff --git a/wmake/rules/linuxI32/mplib b/wmake/rules/linuxIA64Icc/mplib
similarity index 100%
rename from wmake/rules/linuxI32/mplib
rename to wmake/rules/linuxIA64Icc/mplib
diff --git a/wmake/rules/linuxIA64I64/mplibIMPI b/wmake/rules/linuxIA64Icc/mplibIMPI
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplibIMPI
rename to wmake/rules/linuxIA64Icc/mplibIMPI
diff --git a/wmake/rules/linuxI32/mplibLAM b/wmake/rules/linuxIA64Icc/mplibLAM
similarity index 100%
rename from wmake/rules/linuxI32/mplibLAM
rename to wmake/rules/linuxIA64Icc/mplibLAM
diff --git a/wmake/rules/linuxIA64I64/mplibMPI b/wmake/rules/linuxIA64Icc/mplibMPI
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplibMPI
rename to wmake/rules/linuxIA64Icc/mplibMPI
diff --git a/wmake/rules/linuxI32/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH
similarity index 100%
rename from wmake/rules/linuxI32/mplibMPICH
rename to wmake/rules/linuxIA64Icc/mplibMPICH
diff --git a/wmake/rules/linuxI32/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI
similarity index 100%
rename from wmake/rules/linuxI32/mplibOPENMPI
rename to wmake/rules/linuxIA64Icc/mplibOPENMPI
diff --git a/wmake/rules/linuxIA64I64/wmkdep b/wmake/rules/linuxIA64Icc/wmkdep
similarity index 100%
rename from wmake/rules/linuxIA64I64/wmkdep
rename to wmake/rules/linuxIA64Icc/wmkdep
diff --git a/wmake/rules/linuxIA64I64/X b/wmake/rules/linuxIcc/X
similarity index 100%
rename from wmake/rules/linuxIA64I64/X
rename to wmake/rules/linuxIcc/X
diff --git a/wmake/rules/linuxI32/c b/wmake/rules/linuxIcc/c
similarity index 100%
rename from wmake/rules/linuxI32/c
rename to wmake/rules/linuxIcc/c
diff --git a/wmake/rules/linuxI32/c++ b/wmake/rules/linuxIcc/c++
similarity index 100%
rename from wmake/rules/linuxI32/c++
rename to wmake/rules/linuxIcc/c++
diff --git a/wmake/rules/linuxIA64I64/c++Debug b/wmake/rules/linuxIcc/c++Debug
similarity index 100%
rename from wmake/rules/linuxIA64I64/c++Debug
rename to wmake/rules/linuxIcc/c++Debug
diff --git a/wmake/rules/linuxI32/c++Opt b/wmake/rules/linuxIcc/c++Opt
similarity index 100%
rename from wmake/rules/linuxI32/c++Opt
rename to wmake/rules/linuxIcc/c++Opt
diff --git a/wmake/rules/linuxI32/c++Prof b/wmake/rules/linuxIcc/c++Prof
similarity index 100%
rename from wmake/rules/linuxI32/c++Prof
rename to wmake/rules/linuxIcc/c++Prof
diff --git a/wmake/rules/linuxIA64I64/cDebug b/wmake/rules/linuxIcc/cDebug
similarity index 100%
rename from wmake/rules/linuxIA64I64/cDebug
rename to wmake/rules/linuxIcc/cDebug
diff --git a/wmake/rules/linuxI32/cOpt b/wmake/rules/linuxIcc/cOpt
similarity index 100%
rename from wmake/rules/linuxI32/cOpt
rename to wmake/rules/linuxIcc/cOpt
diff --git a/wmake/rules/linuxIA64I64/cProf b/wmake/rules/linuxIcc/cProf
similarity index 100%
rename from wmake/rules/linuxIA64I64/cProf
rename to wmake/rules/linuxIcc/cProf
diff --git a/wmake/rules/linuxI32/dirToString b/wmake/rules/linuxIcc/dirToString
similarity index 100%
rename from wmake/rules/linuxI32/dirToString
rename to wmake/rules/linuxIcc/dirToString
diff --git a/wmake/rules/linuxI32/general b/wmake/rules/linuxIcc/general
similarity index 100%
rename from wmake/rules/linuxI32/general
rename to wmake/rules/linuxIcc/general
diff --git a/wmake/rules/linuxIA64I64/mplib b/wmake/rules/linuxIcc/mplib
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplib
rename to wmake/rules/linuxIcc/mplib
diff --git a/wmake/rules/linuxIA64I64/mplibLAM b/wmake/rules/linuxIcc/mplibLAM
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplibLAM
rename to wmake/rules/linuxIcc/mplibLAM
diff --git a/wmake/rules/linuxIA64I64/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplibMPICH
rename to wmake/rules/linuxIcc/mplibMPICH
diff --git a/wmake/rules/linuxIA64I64/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplibOPENMPI
rename to wmake/rules/linuxIcc/mplibOPENMPI

From 4bfb21b1b04add10048437d7e34976869b296e94 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 30 May 2008 09:04:32 +0100
Subject: [PATCH 04/19] Made WM_COMPILER externally selectable.  Default is set
 to Gcc.

---
 etc/bashrc | 2 +-
 etc/cshrc  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/bashrc b/etc/bashrc
index 2fd7b92aa6..c7eb768470 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -65,7 +65,7 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
 
 # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-export WM_COMPILER=Gcc43
+: ${WM_COMPILER:=Gcc}; export WM_COMPILER
 
 export WM_COMPILER_ARCH=
 export WM_COMPILER_LIB_ARCH=
diff --git a/etc/cshrc b/etc/cshrc
index 5492cc8c96..78f894bc55 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -57,7 +57,7 @@ setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
 
 # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-setenv WM_COMPILER Gcc43
+if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc
 
 setenv WM_COMPILER_ARCH
 setenv WM_COMPILER_LIB_ARCH

From 98e1b15fb8f1a3f2c19abffef0cb8d85aa1a447f Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 30 May 2008 09:30:28 +0100
Subject: [PATCH 05/19] Added support for .hpp and .cpp files.

---
 wmake/wmakeLnInclude | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude
index e350664674..b05d5ade81 100755
--- a/wmake/wmakeLnInclude
+++ b/wmake/wmakeLnInclude
@@ -125,7 +125,7 @@ cd $incDir
 
 find .. $findOpt \
     \( -name lnInclude -o -name -Make -o -name .svn -o -name config \) -prune  \
- -o \( -name '*.[CHh]' -o -name '*.[ch]xx' -o -name '*.type' \)  \
+ -o \( -name '*.[CHh]' -o -name '*.[ch]xx' -o -name '*.[ch]pp' -o -name '*.type' \)  \
  -a ! -name ".#*"     \
  -exec ln $lnOpt {} . \;
 

From a7508ac695c7cb62217a965ff92c07683da2c0d5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 2 Jun 2008 15:07:15 +0200
Subject: [PATCH 06/19] argList : remove FOAM_ROOT again. Use FOAM_CASE and
 delay expansion in BCs.

---
 src/OpenFOAM/global/argList/argList.C | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 93a49c5daf..8e1738a734 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -535,16 +535,6 @@ Foam::argList::argList
     // Set the case as an environment variable
     setEnv("FOAM_CASE", rootPath_/globalCase_, true);
 
-    // Set the relative parent directory as an environment variable
-    if (parRunControl_.parRun())
-    {
-        setEnv("FOAM_ROOT", "..", true);
-    }
-    else
-    {
-        setEnv("FOAM_ROOT", ".", true);
-    }
-
     // Switch on signal trapping. We have to wait until after Pstream::init
     // since this sets up its own ones.
     sigFpe_.set();

From 286223e74d5867056de63dfac5c8107b3bc0c49c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 4 Jun 2008 11:48:40 +0200
Subject: [PATCH 07/19] fixes for incorrect paraview install dir

---
 .../PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/Make/options  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/Make/options b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/Make/options
index 650b286a7d..37a3fc0cf6 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/Make/options
@@ -4,9 +4,10 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(ParaView_DIR) \
     -I$(ParaView_DIR)/VTK \
-    -I$(ParaView_DIR)/VTK/Common \
-    -I$(ParaView_DIR)/VTK/Filtering \
-    -I$(ParaView_DIR)/VTK/Rendering \
+    -I$(ParaView_INST_DIR)/VTK \
+    -I$(ParaView_INST_DIR)/VTK/Common \
+    -I$(ParaView_INST_DIR)/VTK/Filtering \
+    -I$(ParaView_INST_DIR)/VTK/Rendering \
     -I../PV3FoamReader
 
 LIB_LIBS = \

From 8c6878a9e53e43835791d76dbde9f7875f8c81ad Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 3 Jun 2008 21:34:07 +0100
Subject: [PATCH 08/19] Corrected for relacation of src/other to
 $WM_PROJECT_INST_DIR/ThirdParty

---
 Allwmake                                            | 10 ++++++----
 etc/settings.csh                                    | 13 +++++++++----
 etc/settings.sh                                     | 13 +++++++++----
 src/Allwmake                                        |  2 --
 .../MGridGenGamgAgglomeration/Allwmake              |  2 --
 .../MGridGenGAMGAgglomeration/Make/options          |  2 +-
 .../decompositionMethods/Make/options               |  2 +-
 .../parMetisDecomp/Make/options                     |  4 ++--
 8 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/Allwmake b/Allwmake
index 414bb04f62..a311597d39 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,13 +1,15 @@
 #!/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
diff --git a/etc/settings.csh b/etc/settings.csh
index 10bce2b685..73b340e9e9 100644
--- a/etc/settings.csh
+++ b/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
 
diff --git a/etc/settings.sh b/etc/settings.sh
index 8bb969a356..9d577d605e 100644
--- a/etc/settings.sh
+++ b/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
 
diff --git a/src/Allwmake b/src/Allwmake
index d98d1bed0a..1db8264e3f 100755
--- a/src/Allwmake
+++ b/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
 
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
index 79013a6d77..98f16e38eb 100755
--- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
+++ b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
@@ -1,3 +1 @@
-wmake libso ParMGridGen-1.0/MGridGen/IMlib
-wmake libso ParMGridGen-1.0/MGridGen/Lib
 wmake libso MGridGenGAMGAgglomeration
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options
index 8a23c38729..8b8d0b6913 100644
--- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options
+++ b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options
@@ -1,4 +1,4 @@
-ParMGridGen = $(LIB_SRC)/decompositionAgglomeration/MGridGenGamgAgglomeration/ParMGridGen-1.0
+ParMGridGen = ${WM_PROJECT_INST_DIR}/ThirdParty/ParMGridGen-1.0
 
 TYPE_REAL=
 #if defined(SP)
diff --git a/src/decompositionAgglomeration/decompositionMethods/Make/options b/src/decompositionAgglomeration/decompositionMethods/Make/options
index 224af2cdfc..041b8c7180 100644
--- a/src/decompositionAgglomeration/decompositionMethods/Make/options
+++ b/src/decompositionAgglomeration/decompositionMethods/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SRC)/other/metis-5.0pre2/include
+    -I${WM_PROJECT_INST_DIR}/ThirdParty/metis-5.0pre2/include
 
 LIB_LIBS = \
     -lmetis \
diff --git a/src/decompositionAgglomeration/parMetisDecomp/Make/options b/src/decompositionAgglomeration/parMetisDecomp/Make/options
index 2bbedb9930..eb2850d9e2 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$(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 = \

From 25f16691e2c1eb1331b5460753c9caee8a1b31c4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 4 Jun 2008 15:36:15 +0200
Subject: [PATCH 09/19] Add foamThirdParty script Stop tracking files in
 src/other (moved to ThirdParty).

---
 bin/foamThirdParty             | 393 +++++++++++++++++++++++++++++++++
 etc/apps/paraview3/bashrc.save |  58 -----
 2 files changed, 393 insertions(+), 58 deletions(-)
 create mode 100755 bin/foamThirdParty
 delete mode 100644 etc/apps/paraview3/bashrc.save

diff --git a/bin/foamThirdParty b/bin/foamThirdParty
new file mode 100755
index 0000000000..0ab8abc837
--- /dev/null
+++ b/bin/foamThirdParty
@@ -0,0 +1,393 @@
+#!/usr/bin/perl -w
+use strict;
+use File::Spec;
+use Getopt::Long;
+
+#############################################################################
+# SETTINGS
+#
+my %config = (
+    thirdParty => "$ENV{WM_PROJECT_INST_DIR}/ThirdParty",
+    project    => ( $ENV{WM_PROJECT} || '' ) . "-"
+      . ( $ENV{WM_PROJECT_VERSION} || '' ),
+);
+
+my %packages = (
+    lam => {
+        -opt => 1,
+        url  => "http://www.lam-mpi.org/download/files/lam-7.1.4.tar.bz2",
+    },
+
+    libccmio => {
+        -opt => 1,
+        url  =>
+          "https://wci.llnl.gov/codes/visit/3rd_party/libccmio-2.6.1.tar.gz",
+    },
+
+    openmpi => {
+        url =>
+"http://www.open-mpi.org/software/ompi/v1.2/downloads/openmpi-1.2.6.tar.bz2",
+    },
+
+    metis => {
+        url =>
+          "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.0pre2.tar.gz"
+    },
+    mico => {
+        -opt => 1,
+        url  => "http://www.mico.org/mico-2.3.12.tar.gz",
+    },
+
+    mpich => {
+        -opt => 1,
+        url  => "ftp://ftp.mcs.anl.gov/pub/mpi/old/mpich-1.2.4.tar.gz",
+    },
+
+    ParMetis => {
+        url =>
+"http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/ParMetis-3.1.tar.gz",
+    },
+
+    ParMGridGen => {
+        url =>
+"http://www-users.cs.umn.edu/~moulitsa/download/ParMGridGen-1.0.tar.gz",
+    },
+
+    zlib => { url => "http://www.zlib.net/zlib-1.2.3.tar.gz", },
+
+    hoard => {
+        -opt => 1,
+        url  =>
+          "http://www.cs.umass.edu/%7Eemery/hoard/hoard-3.7.1/hoard-371.tar.gz"
+    },
+
+##    # this really doesn't work well, but code needs minor patching anyhow:
+##    fbsdmalloc => {
+##        url =>
+##        "http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/lib/libc/stdlib/malloc.c?rev=1.171",
+##
+##    },
+);
+
+#
+# END OF SETTINGS
+############################################################################
+
+( my $Script = $0 ) =~ s{^.*/}{};
+
+# --------------------------------------------------------------------------
+sub usage {
+    my ( @req, @opt );
+
+    for ( sort keys %packages ) {
+        if ( $packages{$_}{-opt} ) {
+            push @opt, $_;
+        }
+        else {
+            push @req, $_;
+        }
+    }
+
+    $! = 0;    # clean exit
+    warn "@_\n" if @_;
+    die <<"USAGE";
+usage:
+    $Script [OPTION] [package1 .. packageN]
+
+options:
+  -help     usage
+  -status   show status  [default]
+  -list     list versions and resource locations
+  -version  list versions only
+  -dir      list unpack directory
+  -reldir   list unpack directory relative to cwd
+  -get      get packages as required (uses curl)
+  -unpack   unpack packages where required and possible
+
+Simple management of 3rd party software for '$config{project}'
+using the directory
+    $config{thirdParty}
+
+Packages:  @req
+Optional:  @opt
+
+Return codes:
+  -status -get -unpack   number of missing packages or errors
+
+USAGE
+}
+
+# --------------------------------------------------------------------------
+my %opt;
+
+# default action is -status
+@ARGV or $opt{status}++;
+GetOptions(
+    \%opt,    ##
+    "help",   "status", "list", "version", "dir",
+    "reldir", "get",    "unpack",
+  )
+  or usage;
+
+$opt{help} and usage;
+
+-d $config{thirdParty} or usage "ERROR: no '$config{thirdParty}' dir";
+
+#
+# complete the config
+#
+if ( not exists $config{sources} ) {
+    $config{sources} = "$config{thirdParty}/sources";
+    -d $config{sources} or mkdir $config{sources};
+}
+
+#
+# cleanup the packages table
+#
+for my $name ( keys %packages ) {
+    my $href = $packages{$name};
+
+    if ( not $href->{url} ) {
+        warn "$name without url\n";
+        delete $packages{$name};
+        next;
+    }
+
+    if ( not exists $href->{file} ) {
+        ( $href->{file} = $href->{url} ) =~ s{^.*/|\?.*$}{}g;
+    }
+
+    if ( not exists $href->{dir} ) {
+        ( $href->{dir} = $href->{file} ) =~ s{\.(zip|tar(\.(gz|bz2))?)$}{};
+    }
+}
+
+#
+# check for names in the packages
+#
+sub selectNames {
+    my @names;
+    my $req;
+
+    while ( @_ and $_[0] =~ /^-/ ) {
+        my $opt = shift;
+        if ( $opt =~ /^-req/ ) {
+            $req++;
+        }
+    }
+
+    if (@_) {
+        my ( %seen, @reject );
+        for my $name (@_) {
+            next if $seen{$name}++;
+            if ( exists $packages{$name} ) {
+                push @names, $name;
+            }
+            else {
+                push @reject, $name;
+            }
+        }
+
+        usage "unknown package(s): @reject" if @reject;
+    }
+    else {
+        @names =
+          grep { not $req or not $packages{$_}{-opt} } sort keys %packages;
+    }
+
+    @names or usage "no packages";
+
+    return @names;
+}
+
+#
+# list the current status
+#
+if ( $opt{status} ) {
+    my @names = selectNames @ARGV;
+
+    my $nMissing = 0;
+
+    for my $name (@names) {
+        my $href = $packages{$name};
+        my ( $dir, $file, $url ) = @$href{qw( dir file url )};
+
+        my @status;
+        if ( -e "$config{sources}/$file" ) {
+            push @status, "  packed: $config{sources}/$file";
+        }
+
+        if ( -d "$config{thirdParty}/$dir" ) {
+            push @status, "unpacked: $config{thirdParty}/$dir";
+        }
+
+        unless (@status) {
+            $nMissing++;
+            @status = "missing";
+        }
+
+        for (@status) {
+            printf "%-16s %-16s %s", $name, $dir, $_;
+
+            if ( $href->{-opt} ) {
+                print "  [optional]";
+            }
+            print "\n";
+        }
+    }
+
+    exit $nMissing;
+}
+
+#
+# show an overview of the versions and the resource locations
+#
+if ( $opt{list} ) {
+    my @names = selectNames @ARGV;
+
+    for my $name (@names) {
+        my $href = $packages{$name};
+        my ( $dir, $file, $url ) = @$href{qw( dir file url )};
+
+        printf "%-16s %-16s %s", $name, $dir, $url;
+        if ( $href->{-opt} ) {
+            print "  [optional]";
+        }
+        print "\n";
+
+    }
+
+    exit 0;
+}
+
+#
+# show the version (directory name) only
+#
+if ( $opt{version} ) {
+    my @names = selectNames @ARGV;
+
+    for my $name (@names) {
+        my $href = $packages{$name};
+        my ( $dir, $file, $url ) = @$href{qw( dir file url )};
+
+        print $dir, "\n";
+    }
+
+    exit 0;
+}
+
+#
+# show the unpack directory name
+#
+if ( $opt{dir} or $opt{reldir} ) {
+    my @names = selectNames @ARGV;
+    my $base  = $config{thirdParty};
+
+    if ( $opt{reldir} ) {
+        $base = File::Spec->abs2rel($base);
+        length $base or $base = '.';
+    }
+
+    for my $name (@names) {
+        my $href = $packages{$name};
+        my ( $dir, $file, $url ) = @$href{qw( dir file url )};
+
+        print File::Spec->catfile( $base, $dir ), "\n";
+    }
+
+    exit 0;
+}
+
+#
+# get and/or unpack packages as required and possible
+# avoid getting/unpacking optional packages
+#
+if ( $opt{get} or $opt{unpack} ) {
+    my @names = selectNames -required => @ARGV;
+
+    my $nError = 0;
+
+    for my $name (@names) {
+        my $href = $packages{$name};
+        my ( $dir, $file, $url ) = @$href{qw( dir file url )};
+
+        my $flags = "";
+        if ( $href->{-opt} ) {
+            $flags .= "[optional]";
+        }
+
+        warn '-' x 70, "\n", "$name  ($dir)  $flags\n";
+
+        if ( -d "$config{thirdParty}/$dir" ) {
+            warn "unpacked: $config{thirdParty}/$dir\n";
+            next;
+        }
+
+        if ( $opt{get} ) {
+            if ( -e "$config{sources}/$file" ) {
+                warn "  packed: $config{sources}/$file\n";
+            }
+            else {
+                my $fetch = "curl -k -o $file";
+
+                # curl seems to hang on anonymous ftp?
+                if ( $url =~ /^ftp:/ ) {
+                    $fetch = "wget -v";
+                }
+
+                system "set -x; cd $config{sources} && $fetch $url";
+
+                if ( not -e "$config{sources}/$file" ) {
+                    $nError++;
+                    warn "  download failed!?\n";
+                    next;
+                }
+            }
+        }
+
+        if ( $opt{unpack} ) {
+            if ( -e "$config{sources}/$file" ) {
+                my $unpack;
+                if ( $file =~ m{\.zip$} ) {
+                    $unpack = "unzip";
+                }
+                elsif ( $file =~ m{\.tar$} ) {
+                    $unpack = "tar -xf";
+                }
+                elsif ( $file =~ m{\.tar\.bz2$} ) {
+                    $unpack = "tar -xjf";
+                }
+                elsif ( $file =~ m{\.(tgz|tar\.gz)$} ) {
+                    $unpack = "tar -xzf";
+                }
+                else {
+                    $nError++;
+                    warn "  no unpack defined for $file\n";
+                    next;
+                }
+
+                system
+"set -x; cd $config{thirdParty} && $unpack $config{sources}/$file";
+
+                # catch isolated cases where it unpacks without a version number
+                if ( -d "$config{thirdParty}/$name"
+                    and not -d "$config{thirdParty}/$dir" )
+                {
+                    rename "$config{thirdParty}/$name",
+                      "$config{thirdParty}/$dir";
+                }
+
+                unless ( -d "$config{thirdParty}/$dir" ) {
+                    $nError++;
+                    warn "unpack failed!?\n";
+                    next;
+                }
+            }
+        }
+    }
+
+    warn '-' x 70, "\n\n";
+    exit $nError;
+}
+
+# --------------------------------------------------------------------------
diff --git a/etc/apps/paraview3/bashrc.save b/etc/apps/paraview3/bashrc.save
deleted file mode 100644
index 3c1fb6bad7..0000000000
--- a/etc/apps/paraview3/bashrc.save
+++ /dev/null
@@ -1,58 +0,0 @@
-#----------------------------------*-sh-*--------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     bashrc
-#
-# Description
-#     Setup file for ParaView3.
-#     Sourced from OpenFOAM-?.?/etc/bashrc
-#
-#------------------------------------------------------------------------------
-
-if [ "$PS1" -a "$foamDotFile" ]; then
-    if [ "$FOAM_VERBOSE" ]; then
-        echo "Executing: $foamDotFile"
-    fi
-fi
-
-export CMAKE_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.6
-
-if [ -r $CMAKE_HOME ]; then
-    export PATH=$CMAKE_HOME/bin:$PATH
-fi
-
-export ParaView_VERSION=3
-
-export ParaView_INST_DIR=$WM_PROJECT_INST_DIR/$WM_ARCH/ParaView3.2.1
-export ParaView_DIR=$ParaView_INST_DIR
-
-if [ -r $ParaView_INST_DIR ]; then
-    export PATH=$ParaView_INST_DIR/bin:$PATH
-    export LD_LIBRARY_PATH=${ParaView_INST_DIR}/lib/paraview-3.2:${LD_LIBRARY_PATH}
-
-    export PV_PLUGIN_PATH=$FOAM_LIBBIN
-fi
-
-# -----------------------------------------------------------------------------

From f9859337239a2324ea287c01d76d500b5ea867f8 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 4 Jun 2008 14:52:25 +0100
Subject: [PATCH 10/19] removing references to mico

---
 bin/foamDiffSourceList   | 1 -
 bin/foamInstallationTest | 1 -
 bin/foamPack             | 1 -
 bin/foamPackBin          | 2 +-
 bin/foamPackChanged      | 1 -
 bin/foamPackSource       | 1 -
 wmake/wcleanAll          | 1 -
 wmake/wcleanMachine      | 4 ----
 8 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/bin/foamDiffSourceList b/bin/foamDiffSourceList
index 104a322bdc..a517fdc033 100755
--- a/bin/foamDiffSourceList
+++ b/bin/foamDiffSourceList
@@ -85,7 +85,6 @@ find -H $newDir                \
 | sed                          \
  -e "\@$newDir/.git/@d"        \
  -e "\@$newDir/lib/@d"         \
- -e "\@$newDir/src/other/mico-*/platforms@d"  \
  -e "\@$newDir/src/other/mpich-*/platforms@d" \
  -e "\@$newDir/src/other/mpich-*/lib@d"       \
  -e "\@$newDir/src/other/lam-*/platforms@d"   \
diff --git a/bin/foamInstallationTest b/bin/foamInstallationTest
index 49329c11ca..72fc06e112 100755
--- a/bin/foamInstallationTest
+++ b/bin/foamInstallationTest
@@ -532,7 +532,6 @@ reportEnv '$WM_DIR'           '$PATH' "yes"
 reportEnv '$CEI_HOME'         '$PATH' "no"
 echo ""
 reportEnv '$JAVA_PATH'        '$PATH' "no"
-reportEnv '$MICO_ARCH_PATH'   '$PATH' "yes"
 reportEnv '$LAM_ARCH_PATH'    '$PATH' "yes"
 reportEnv '$MPICH_ARCH_PATH'  '$PATH' "no"
 hline #--------------------
diff --git a/bin/foamPack b/bin/foamPack
index fcf6df3d81..ee2dfaf630 100755
--- a/bin/foamPack
+++ b/bin/foamPack
@@ -87,7 +87,6 @@ find -H $packDir               \
 | sed                          \
  -e "\@$packDir/.git/@d"       \
  -e "\@$packDir/lib/@d"        \
- -e "\@$packDir/src/other/mico-*/platforms@d"  \
  -e "\@$packDir/src/other/mpich-*/platforms@d" \
  -e "\@$packDir/src/other/mpich-*/lib@d"       \
  -e "\@$packDir/src/other/lam-*/platforms@d"   \
diff --git a/bin/foamPackBin b/bin/foamPackBin
index fbe80f0fc3..f597a30dcd 100755
--- a/bin/foamPackBin
+++ b/bin/foamPackBin
@@ -73,7 +73,7 @@ dirList=$(
       $packDir/lib/$arch \
       $packDir/applications/bin/$arch \
       $packDir/wmake/rules \
-      $packDir/src/other/{mico,mpich,lam,openmpi}-*/platforms/$arch \
+      $packDir/src/other/{mpich,lam,openmpi}-*/platforms/$arch \
       ;
    do
       [ -d $dir ] && echo $dir
diff --git a/bin/foamPackChanged b/bin/foamPackChanged
index 38fbb38551..0fa188d34a 100755
--- a/bin/foamPackChanged
+++ b/bin/foamPackChanged
@@ -61,7 +61,6 @@ find -H $packDir               \
     -name "*.orig"             \
 | sed                          \
  -e "\@$packDir/lib/@d"        \
- -e "\@$packDir/src/other/mico-*/platforms@d"  \
  -e "\@$packDir/src/other/mpich-*/platforms@d" \
  -e "\@$packDir/src/other/mpich-*/lib@d"       \
  -e "\@$packDir/src/other/lam-*/platforms@d"   \
diff --git a/bin/foamPackSource b/bin/foamPackSource
index 3fa602cf1b..46c2fee474 100755
--- a/bin/foamPackSource
+++ b/bin/foamPackSource
@@ -76,7 +76,6 @@ find -H $packDir               \
 | sed                          \
  -e "\@$packDir/.git/@d"       \
  -e "\@$packDir/lib/@d"        \
- -e "\@$packDir/src/other/mico-*/platforms@d"  \
  -e "\@$packDir/src/other/mpich-*/platforms@d" \
  -e "\@$packDir/src/other/mpich-*/lib@d"       \
  -e "\@$packDir/src/other/lam-*/platforms@d"   \
diff --git a/wmake/wcleanAll b/wmake/wcleanAll
index b2354bac64..4b8fc3cbb0 100755
--- a/wmake/wcleanAll
+++ b/wmake/wcleanAll
@@ -59,6 +59,5 @@ find . -depth -type d \( -name lnInclude -o -name ii_files -o -name Templates.DB
 find . \( -name exe -o -name log -o -name so_locations \) -exec rm {} \;
 
 # rm -rf src/mpich-${MPICH_VERSION}/platforms
-# rm -rf src/mico-${MICO_VERSION}/platforms
 
 #------------------------------------------------------------------------------
diff --git a/wmake/wcleanMachine b/wmake/wcleanMachine
index 57c9e91a9b..235964f2a5 100755
--- a/wmake/wcleanMachine
+++ b/wmake/wcleanMachine
@@ -72,9 +72,5 @@ fi
 #   rm -rf src/mpich-${MPICH_VERSION}/platforms/$1
 #fi
 
-#if [ src/mico-${MICO_VERSION}/platforms/$1 ]
-#then
-#   rm -rf src/mico-${MICO_VERSION}/platforms/$1
-#fi
 
 #------------------------------------------------------------------------------

From 8b8a4f292b4936c1d57a4b9f69389c30c93563b6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 4 Jun 2008 16:16:49 +0200
Subject: [PATCH 11/19] cleanup mpi settings in etc/settings.{sh,csh}

---
 etc/settings.csh | 20 +++++++++-----------
 etc/settings.sh  | 22 ++++++++++------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/etc/settings.csh b/etc/settings.csh
index e1e8a5cd95..3fa9f1958f 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -132,9 +132,8 @@ endif
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    set ompi_version=1.2.6
-    setenv OPENMPI_HOME $thirdParty/openmpi-$ompi_version
-    setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS
+    set ompi_version=openmpi-1.2.6
+    setenv OPENMPI_ARCH_PATH $thirdParty/$ompi_version/platforms/$WM_OPTIONS
 
     # Tell OpenMPI where to find it's install directory
     setenv OPAL_PREFIX $OPENMPI_ARCH_PATH
@@ -142,32 +141,31 @@ case OPENMPI:
     AddLib $OPENMPI_ARCH_PATH/lib
     AddPath $OPENMPI_ARCH_PATH/bin
 
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/openmpi-$ompi_version
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$ompi_version
     unset ompi_version
     breaksw
 
 case LAM:
-    set lam_version=7.1.4
-    setenv LAMHOME $thirdParty/lam-$lam_version
+    set lam_version=lam-7.1.4
+    setenv LAMHOME $thirdParty/$lam_version
     setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
 
     AddLib $LAM_ARCH_PATH/lib
     AddPath $LAM_ARCH_PATH/bin
 
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/lam-$lam_version
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$lam_version
     unset lam_version
     breaksw
 
 case MPICH:
-    set mpich_version=1.2.4
-    setenv MPICH_PATH $thirdParty/mpich-$mpich_version
-    setenv MPICH_ARCH_PATH $MPICH_PATH/platforms/$WM_OPTIONS
+    set mpich_version=mpich-1.2.4
+    setenv MPICH_ARCH_PATH $thirdParty/$mpich_version/platforms/$WM_OPTIONS
     setenv MPICH_ROOT $MPICH_ARCH_PATH
 
     AddLib $MPICH_ARCH_PATH/lib
     AddPath $MPICH_ARCH_PATH/bin
 
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpich-$mpich_version
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpich_version
     unset mpich_version
     breaksw
 
diff --git a/etc/settings.sh b/etc/settings.sh
index 9522d4755f..b1302c23c4 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -145,42 +145,40 @@ thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
 
 case "$WM_MPLIB" in
 OPENMPI)
-    ompi_version=1.2.6
-    export OPENMPI_HOME=$thirdParty/openmpi-$ompi_version
-    export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS
+    ompi_version=openmpi-1.2.6
+    export OPENMPI_ARCH_PATH=$thirdParty/$ompi_version/platforms/$WM_OPTIONS
 
-    # Tell OpenMPI where to find it's install directory
+    # Tell OpenMPI where to find its install directory
     export OPAL_PREFIX=$OPENMPI_ARCH_PATH
 
     AddLib $OPENMPI_ARCH_PATH/lib
     AddPath $OPENMPI_ARCH_PATH/bin
 
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/openmpi-$ompi_version
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$ompi_version
     unset ompi_version
     ;;
 
 LAM)
-    lam_version=7.1.4
-    export LAMHOME=$thirdParty/lam-$lam_version
+    lam_version=lam-7.1.4
+    export LAMHOME=$thirdParty/$lam_version
     export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
 
     AddLib  $LAM_ARCH_PATH/lib
     AddPath $LAM_ARCH_PATH/bin
 
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/lam-$lam_version
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$lam_version
     unset lam_version
     ;;
 
 MPICH)
-    mpich_version=1.2.4
-    export MPICH_PATH=$thirdParty/mpich-$mpich_version
-    export MPICH_ARCH_PATH=$MPICH_PATH/platforms/$WM_OPTIONS
+    mpich_version=mpich-1.2.4
+    export MPICH_ARCH_PATH=$thirdParty/$mpich_version/platforms/$WM_OPTIONS
     export MPICH_ROOT=$MPICH_ARCH_PATH
 
     AddLib  $MPICH_ARCH_PATH/lib
     AddPath $MPICH_ARCH_PATH/bin
 
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-$mpich_version
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpich_version
     unset mpich_version
     ;;
 

From 14fefb0554ec256d796fe958811efd85e6e2ec37 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 5 Jun 2008 10:53:44 +0200
Subject: [PATCH 12/19] Use uniform MPI_ARCH_PATH instead of
 {OPENMPI,LAM,..}_ARCH_PATH

---
 bin/foamInstallationTest               |  5 +-
 etc/settings.csh                       | 62 +++++++++----------
 etc/settings.sh                        | 85 ++++++++++++--------------
 wmake/rules/General/mplibMPICH         |  4 +-
 wmake/rules/linux64Gcc/mplibGAMMA      |  4 +-
 wmake/rules/linux64Gcc/mplibLAM        |  4 +-
 wmake/rules/linux64Gcc/mplibMPICH      |  4 +-
 wmake/rules/linux64Gcc/mplibMPICH-GM   |  4 +-
 wmake/rules/linux64Gcc/mplibOPENMPI    |  4 +-
 wmake/rules/linux64Gcc43/mplibGAMMA    |  4 +-
 wmake/rules/linux64Gcc43/mplibLAM      |  4 +-
 wmake/rules/linux64Gcc43/mplibMPICH    |  4 +-
 wmake/rules/linux64Gcc43/mplibMPICH-GM |  4 +-
 wmake/rules/linux64Gcc43/mplibOPENMPI  |  4 +-
 wmake/rules/linux64Icc/mplibLAM        |  4 +-
 wmake/rules/linux64Icc/mplibMPICH      |  4 +-
 wmake/rules/linux64Icc/mplibOPENMPI    |  4 +-
 wmake/rules/linuxGcc/mplibGAMMA        |  4 +-
 wmake/rules/linuxGcc/mplibLAM          |  4 +-
 wmake/rules/linuxGcc/mplibMPICH        |  4 +-
 wmake/rules/linuxGcc/mplibMPICH-GM     |  4 +-
 wmake/rules/linuxGcc/mplibOPENMPI      |  4 +-
 wmake/rules/linuxGcc43/mplibGAMMA      |  4 +-
 wmake/rules/linuxGcc43/mplibLAM        |  4 +-
 wmake/rules/linuxGcc43/mplibMPICH      |  4 +-
 wmake/rules/linuxGcc43/mplibMPICH-GM   |  4 +-
 wmake/rules/linuxGcc43/mplibOPENMPI    |  4 +-
 wmake/rules/linuxIA64Gcc/mplibLAM      |  4 +-
 wmake/rules/linuxIA64Gcc/mplibMPICH    |  4 +-
 wmake/rules/linuxIA64Gcc/mplibOPENMPI  |  4 +-
 wmake/rules/linuxIA64Icc/mplibLAM      |  4 +-
 wmake/rules/linuxIA64Icc/mplibMPICH    |  4 +-
 wmake/rules/linuxIA64Icc/mplibOPENMPI  |  4 +-
 wmake/rules/linuxIcc/mplibLAM          |  4 +-
 wmake/rules/linuxIcc/mplibMPICH        |  4 +-
 wmake/rules/linuxIcc/mplibOPENMPI      |  4 +-
 wmake/rules/linuxmingw32/mplibGAMMA    |  4 +-
 wmake/rules/linuxmingw32/mplibLAM      |  4 +-
 wmake/rules/linuxmingw32/mplibMPICH    |  4 +-
 wmake/rules/linuxmingw32/mplibMPICH-GM |  4 +-
 wmake/rules/linuxmingw32/mplibOPENMPI  |  4 +-
 wmake/rules/solarisGcc/mplibLAM        |  4 +-
 wmake/rules/solarisGcc/mplibMPICH      |  4 +-
 wmake/rules/solarisGcc/mplibOPENMPI    |  4 +-
 44 files changed, 153 insertions(+), 163 deletions(-)

diff --git a/bin/foamInstallationTest b/bin/foamInstallationTest
index 72fc06e112..5a6980ddce 100755
--- a/bin/foamInstallationTest
+++ b/bin/foamInstallationTest
@@ -532,8 +532,7 @@ reportEnv '$WM_DIR'           '$PATH' "yes"
 reportEnv '$CEI_HOME'         '$PATH' "no"
 echo ""
 reportEnv '$JAVA_PATH'        '$PATH' "no"
-reportEnv '$LAM_ARCH_PATH'    '$PATH' "yes"
-reportEnv '$MPICH_ARCH_PATH'  '$PATH' "no"
+reportEnv '$MPI_ARCH_PATH'    '$PATH' "yes"
 hline #--------------------
 #
 heading "Checking the FOAM env variables set on the LD_LIBRARY_PATH..."
@@ -543,7 +542,7 @@ echo "$COL1 $COL2 $COL3 $COL4 $COL5"
 hline #--------------------
 reportEnv '$FOAM_LIBBIN'      '$LD_LIBRARY_PATH' "yes"
 reportEnv '$FOAM_USER_LIBBIN' '$LD_LIBRARY_PATH' "no"
-reportEnv '$LAM_ARCH_PATH'    '$LD_LIBRARY_PATH' "yes"
+reportEnv '$MPI_ARCH_PATH'    '$LD_LIBRARY_PATH' "yes"
 hline #--------------------
 #
 heading "Software versions"
diff --git a/etc/settings.csh b/etc/settings.csh
index ae04e5b7d2..865d486ad0 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -132,62 +132,59 @@ endif
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    set ompi_version=openmpi-1.2.6
-    setenv OPENMPI_ARCH_PATH $thirdParty/$ompi_version/platforms/$WM_OPTIONS
-    setenv MPI_ARCH_PATH $OPENMPI_ARCH_PATH
+    set mpi_version=openmpi-1.2.6
+    setenv MPI_ARCH_PATH $thirdParty/$mpi_version/platforms/$WM_OPTIONS
 
     # Tell OpenMPI where to find its install directory
-    setenv OPAL_PREFIX $OPENMPI_ARCH_PATH
+    setenv OPAL_PREFIX $MPI_ARCH_PATH
 
-    AddLib $OPENMPI_ARCH_PATH/lib
-    AddPath $OPENMPI_ARCH_PATH/bin
+    AddLib  $MPI_ARCH_PATH/lib
+    AddPath $MPI_ARCH_PATH/bin
 
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$ompi_version
-    unset ompi_version
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+    unset mpi_version
     breaksw
 
 case LAM:
-    set lam_version=lam-7.1.4
-    setenv LAMHOME $thirdParty/$lam_version
-    setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
-    setenv MPI_ARCH_PATH $LAM_ARCH_PATH
+    set mpi_version=lam-7.1.4
+    setenv MPI_ARCH_PATH $thirdParty/$mpi_version/platforms/$WM_OPTIONS
+    setenv LAMHOME $thirdParty/$mpi_version
+    # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
 
-    AddLib $LAM_ARCH_PATH/lib
-    AddPath $LAM_ARCH_PATH/bin
+    AddLib  $MPI_ARCH_PATH/lib
+    AddPath $MPI_ARCH_PATH/bin
 
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$lam_version
-    unset lam_version
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+    unset mpi_version
     breaksw
 
 case MPICH:
-    set mpich_version=mpich-1.2.4
-    setenv MPICH_ARCH_PATH $thirdParty/$mpich_version/platforms/$WM_OPTIONS
-    setenv MPICH_ROOT $MPICH_ARCH_PATH
-    setenv MPI_ARCH_PATH $MPICH_ARCH_PATH
+    set mpi_version=mpich-1.2.4
+    setenv MPI_ARCH_PATH $thirdParty/$mpi_version/platforms/$WM_OPTIONS
+    setenv MPICH_ROOT $MPI_ARCH_PATH
 
-    AddLib $MPICH_ARCH_PATH/lib
-    AddPath $MPICH_ARCH_PATH/bin
+    AddLib  $MPI_ARCH_PATH/lib
+    AddPath $MPI_ARCH_PATH/bin
 
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpich_version
-    unset mpich_version
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+    unset mpi_version
     breaksw
 
 case MPICH-GM:
-    setenv MPICH_PATH /opt/mpi
-    setenv MPICH_ARCH_PATH $MPICH_PATH
-    setenv MPICH_ROOT $MPICH_ARCH_PATH
+    setenv MPI_ARCH_PATH /opt/mpi
+    setenv MPICH_PATH $MPI_ARCH_PATH
+    setenv MPICH_ROOT $MPI_ARCH_PATH
     setenv GM_LIB_PATH /opt/gm/lib64
-    setenv MPI_ARCH_PATH $MPICH_ARCH_PATH
 
-    AddLib $MPICH_ARCH_PATH/lib
-    AddLib $GM_LIB_PATH
-    AddPath $MPICH_ARCH_PATH/bin
+    AddLib  $MPI_ARCH_PATH/lib
+    AddLib  $GM_LIB_PATH
+    AddPath $MPI_ARCH_PATH/bin
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpich-gm
     breaksw
 
 case GAMMA:
-    setenv GAMMA_ARCH_PATH /usr
+    setenv MPI_ARCH_PATH /usr
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/gamma
     breaksw
 
@@ -222,5 +219,4 @@ endif
 #    setenv LD_PRELOAD $FOAM_LIBBIN/libhoard.so:${LD_PRELOAD}
 #endif
 
-
 # -----------------------------------------------------------------------------
diff --git a/etc/settings.sh b/etc/settings.sh
index bf202613e8..1c971323b3 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -39,18 +39,22 @@ fi
 
 AddPath()
 {
-    if [ $# -ge 1 ]; then
+    while [ $# -ge 1 ]
+    do
         [ -d $1 ] || mkdir -p $1
         export PATH=$1:$PATH
-    fi
+        shift
+    done
 }
 
 AddLib()
 {
-    if [ $# -ge 1 ]; then
+    while [ $# -ge 1 ]
+    do
         [ -d $1 ] || mkdir -p $1
         export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
-    fi
+        shift
+    done
 }
 
 
@@ -91,7 +95,6 @@ export FOAM_RUN=$WM_PROJECT_USER_DIR/run
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
 
-
 # Compiler settings
 # ~~~~~~~~~~~~~~~~~
 WM_COMPILER_BIN=
@@ -117,7 +120,7 @@ OpenFOAM)
     if [ ! -d "$WM_COMPILER_DIR" ]
     then
         echo
-        echo "Warning in $1:"
+        echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
         echo "    Cannot find $WM_COMPILER_DIR installation."
         echo "    Please install this compiler version or if you wish to use the system compiler,"
         echo "    change the WM_COMPILER_INST setting to 'System' in this file"
@@ -135,73 +138,66 @@ if [ "$WM_COMPILER_BIN" != "" ]; then
 fi
 
 
-# Third-party software
-# ~~~~~~~~~~~~~~~~~~~~
-thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
-
-
 # Communications library
 # ~~~~~~~~~~~~~~~~~~~~~~
 
+unset MPI_ARCH_PATH
+
 case "$WM_MPLIB" in
 OPENMPI)
-    ompi_version=openmpi-1.2.6
-    export OPENMPI_ARCH_PATH=$thirdParty/$ompi_version/platforms/$WM_OPTIONS
-    export MPI_ARCH_PATH=$OPENMPI_ARCH_PATH
+    mpi_version=openmpi-1.2.6
+    export MPI_ARCH_PATH=$thirdParty/$mpi_version/platforms/$WM_OPTIONS
 
     # Tell OpenMPI where to find its install directory
-    export OPAL_PREFIX=$OPENMPI_ARCH_PATH
+    export OPAL_PREFIX=$MPI_ARCH_PATH
 
-    AddLib $OPENMPI_ARCH_PATH/lib
-    AddPath $OPENMPI_ARCH_PATH/bin
+    AddLib  $MPI_ARCH_PATH/lib
+    AddPath $MPI_ARCH_PATH/bin
 
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$ompi_version
-    unset ompi_version
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+    unset mpi_version
     ;;
 
 LAM)
-    lam_version=lam-7.1.4
-    export LAMHOME=$thirdParty/$lam_version
-    export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
-    export MPI_ARCH_PATH=$LAM_ARCH_PATH
+    mpi_version=lam-7.1.4
+    export MPI_ARCH_PATH=$thirdParty/$mpi_version/platforms/$WM_OPTIONS
+    export LAMHOME=$thirdParty/$mpi_version
+    # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
 
-    AddLib  $LAM_ARCH_PATH/lib
-    AddPath $LAM_ARCH_PATH/bin
+    AddLib  $MPI_ARCH_PATH/lib
+    AddPath $MPI_ARCH_PATH/bin
 
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$lam_version
-    unset lam_version
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+    unset mpi_version
     ;;
 
 MPICH)
-    mpich_version=mpich-1.2.4
-    export MPICH_ARCH_PATH=$thirdParty/$mpich_version/platforms/$WM_OPTIONS
-    export MPICH_ROOT=$MPICH_ARCH_PATH
-    export MPI_ARCH_PATH=$MPICH_ARCH_PATH
+    mpi_version=mpich-1.2.4
+    export MPI_ARCH_PATH=$thirdParty/$mpi_version/platforms/$WM_OPTIONS
+    export MPICH_ROOT=$MPI_ARCH_PATH
 
-    AddLib  $MPICH_ARCH_PATH/lib
-    AddPath $MPICH_ARCH_PATH/bin
+    AddLib  $MPI_ARCH_PATH/lib
+    AddPath $MPI_ARCH_PATH/bin
 
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpich_version
-    unset mpich_version
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+    unset mpi_version
     ;;
 
 MPICH-GM)
-    export MPICH_PATH=/opt/mpi
-    export MPICH_ARCH_PATH=$MPICH_PATH
-    export MPICH_ROOT=$MPICH_ARCH_PATH
+    export MPI_ARCH_PATH=/opt/mpi
+    export MPICH_PATH=$MPI_ARCH_PATH
+    export MPICH_ROOT=$MPI_ARCH_PATH
     export GM_LIB_PATH=/opt/gm/lib64
-    export MPI_ARCH_PATH=$MPICH_ARCH_PATH
 
-    AddLib $MPICH_ARCH_PATH/lib
-    AddLib $GM_LIB_PATH
-    AddPath $MPICH_ARCH_PATH/bin
+    AddLib  $MPI_ARCH_PATH/lib
+    AddLib  $GM_LIB_PATH
+    AddPath $MPI_ARCH_PATH/bin
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-gm
     ;;
 
 GAMMA)
-    export GAMMA_ARCH_PATH=/usr
-
+    export MPI_ARCH_PATH=/usr
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/gamma
     ;;
 
@@ -234,5 +230,4 @@ export MPI_BUFFER_SIZE=20000000
 #    export LD_PRELOAD=$FOAM_LIBBIN/libhoard.so:$LD_PRELOAD
 #fi
 
-
 # -----------------------------------------------------------------------------
diff --git a/wmake/rules/General/mplibMPICH b/wmake/rules/General/mplibMPICH
index d586ba3e03..ac17f7c1d2 100644
--- a/wmake/rules/General/mplibMPICH
+++ b/wmake/rules/General/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA
index dc67a60a0b..d62c6250ff 100644
--- a/wmake/rules/linux64Gcc/mplibGAMMA
+++ b/wmake/rules/linux64Gcc/mplibGAMMA
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(GAMMA_ARCH_PATH)/include
-PLIBS      = -L$(GAMMA_ARCH_PATH)/lib -lgamma
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc/mplibLAM b/wmake/rules/linux64Gcc/mplibLAM
index ce18f75860..6762b843c1 100644
--- a/wmake/rules/linux64Gcc/mplibLAM
+++ b/wmake/rules/linux64Gcc/mplibLAM
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(LAM_ARCH_PATH)/include
-PLIBS      = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH
index d586ba3e03..ac17f7c1d2 100644
--- a/wmake/rules/linux64Gcc/mplibMPICH
+++ b/wmake/rules/linux64Gcc/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc/mplibMPICH-GM b/wmake/rules/linux64Gcc/mplibMPICH-GM
index 74fd965808..88493ebc70 100644
--- a/wmake/rules/linux64Gcc/mplibMPICH-GM
+++ b/wmake/rules/linux64Gcc/mplibMPICH-GM
@@ -1,3 +1,3 @@
 PFLAGS     =
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linux64Gcc/mplibOPENMPI b/wmake/rules/linux64Gcc/mplibOPENMPI
index ea9b4d2299..834d2d3e22 100644
--- a/wmake/rules/linux64Gcc/mplibOPENMPI
+++ b/wmake/rules/linux64Gcc/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS      = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA
index dc67a60a0b..d62c6250ff 100644
--- a/wmake/rules/linux64Gcc43/mplibGAMMA
+++ b/wmake/rules/linux64Gcc43/mplibGAMMA
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(GAMMA_ARCH_PATH)/include
-PLIBS      = -L$(GAMMA_ARCH_PATH)/lib -lgamma
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc43/mplibLAM b/wmake/rules/linux64Gcc43/mplibLAM
index ce18f75860..6762b843c1 100644
--- a/wmake/rules/linux64Gcc43/mplibLAM
+++ b/wmake/rules/linux64Gcc43/mplibLAM
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(LAM_ARCH_PATH)/include
-PLIBS      = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH
index d586ba3e03..ac17f7c1d2 100644
--- a/wmake/rules/linux64Gcc43/mplibMPICH
+++ b/wmake/rules/linux64Gcc43/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc43/mplibMPICH-GM
index 74fd965808..88493ebc70 100644
--- a/wmake/rules/linux64Gcc43/mplibMPICH-GM
+++ b/wmake/rules/linux64Gcc43/mplibMPICH-GM
@@ -1,3 +1,3 @@
 PFLAGS     =
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI
index ea9b4d2299..834d2d3e22 100644
--- a/wmake/rules/linux64Gcc43/mplibOPENMPI
+++ b/wmake/rules/linux64Gcc43/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS      = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linux64Icc/mplibLAM b/wmake/rules/linux64Icc/mplibLAM
index 92290b21b5..9fa7c2752e 100644
--- a/wmake/rules/linux64Icc/mplibLAM
+++ b/wmake/rules/linux64Icc/mplibLAM
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(LAM_ARCH_PATH)/include
-PLIBS      = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lutil
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lutil
diff --git a/wmake/rules/linux64Icc/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH
index d586ba3e03..ac17f7c1d2 100644
--- a/wmake/rules/linux64Icc/mplibMPICH
+++ b/wmake/rules/linux64Icc/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Icc/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI
index ea9b4d2299..834d2d3e22 100644
--- a/wmake/rules/linux64Icc/mplibOPENMPI
+++ b/wmake/rules/linux64Icc/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS      = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA
index dc67a60a0b..d62c6250ff 100644
--- a/wmake/rules/linuxGcc/mplibGAMMA
+++ b/wmake/rules/linuxGcc/mplibGAMMA
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(GAMMA_ARCH_PATH)/include
-PLIBS      = -L$(GAMMA_ARCH_PATH)/lib -lgamma
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc/mplibLAM b/wmake/rules/linuxGcc/mplibLAM
index ce18f75860..6762b843c1 100644
--- a/wmake/rules/linuxGcc/mplibLAM
+++ b/wmake/rules/linuxGcc/mplibLAM
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(LAM_ARCH_PATH)/include
-PLIBS      = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH
index d586ba3e03..ac17f7c1d2 100644
--- a/wmake/rules/linuxGcc/mplibMPICH
+++ b/wmake/rules/linuxGcc/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc/mplibMPICH-GM b/wmake/rules/linuxGcc/mplibMPICH-GM
index 74fd965808..88493ebc70 100644
--- a/wmake/rules/linuxGcc/mplibMPICH-GM
+++ b/wmake/rules/linuxGcc/mplibMPICH-GM
@@ -1,3 +1,3 @@
 PFLAGS     =
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxGcc/mplibOPENMPI b/wmake/rules/linuxGcc/mplibOPENMPI
index ea9b4d2299..834d2d3e22 100644
--- a/wmake/rules/linuxGcc/mplibOPENMPI
+++ b/wmake/rules/linuxGcc/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS      = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA
index dc67a60a0b..d62c6250ff 100644
--- a/wmake/rules/linuxGcc43/mplibGAMMA
+++ b/wmake/rules/linuxGcc43/mplibGAMMA
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(GAMMA_ARCH_PATH)/include
-PLIBS      = -L$(GAMMA_ARCH_PATH)/lib -lgamma
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc43/mplibLAM b/wmake/rules/linuxGcc43/mplibLAM
index ce18f75860..6762b843c1 100644
--- a/wmake/rules/linuxGcc43/mplibLAM
+++ b/wmake/rules/linuxGcc43/mplibLAM
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(LAM_ARCH_PATH)/include
-PLIBS      = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH
index d586ba3e03..ac17f7c1d2 100644
--- a/wmake/rules/linuxGcc43/mplibMPICH
+++ b/wmake/rules/linuxGcc43/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc43/mplibMPICH-GM
index 74fd965808..88493ebc70 100644
--- a/wmake/rules/linuxGcc43/mplibMPICH-GM
+++ b/wmake/rules/linuxGcc43/mplibMPICH-GM
@@ -1,3 +1,3 @@
 PFLAGS     =
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI
index ea9b4d2299..834d2d3e22 100644
--- a/wmake/rules/linuxGcc43/mplibOPENMPI
+++ b/wmake/rules/linuxGcc43/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS      = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxIA64Gcc/mplibLAM b/wmake/rules/linuxIA64Gcc/mplibLAM
index ce18f75860..6762b843c1 100644
--- a/wmake/rules/linuxIA64Gcc/mplibLAM
+++ b/wmake/rules/linuxIA64Gcc/mplibLAM
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(LAM_ARCH_PATH)/include
-PLIBS      = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxIA64Gcc/mplibMPICH b/wmake/rules/linuxIA64Gcc/mplibMPICH
index d586ba3e03..ac17f7c1d2 100644
--- a/wmake/rules/linuxIA64Gcc/mplibMPICH
+++ b/wmake/rules/linuxIA64Gcc/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxIA64Gcc/mplibOPENMPI b/wmake/rules/linuxIA64Gcc/mplibOPENMPI
index ea9b4d2299..834d2d3e22 100644
--- a/wmake/rules/linuxIA64Gcc/mplibOPENMPI
+++ b/wmake/rules/linuxIA64Gcc/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS      = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxIA64Icc/mplibLAM b/wmake/rules/linuxIA64Icc/mplibLAM
index 92290b21b5..9fa7c2752e 100644
--- a/wmake/rules/linuxIA64Icc/mplibLAM
+++ b/wmake/rules/linuxIA64Icc/mplibLAM
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(LAM_ARCH_PATH)/include
-PLIBS      = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lutil
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lutil
diff --git a/wmake/rules/linuxIA64Icc/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH
index d586ba3e03..ac17f7c1d2 100644
--- a/wmake/rules/linuxIA64Icc/mplibMPICH
+++ b/wmake/rules/linuxIA64Icc/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxIA64Icc/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI
index ea9b4d2299..834d2d3e22 100644
--- a/wmake/rules/linuxIA64Icc/mplibOPENMPI
+++ b/wmake/rules/linuxIA64Icc/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS      = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxIcc/mplibLAM b/wmake/rules/linuxIcc/mplibLAM
index 92290b21b5..9fa7c2752e 100644
--- a/wmake/rules/linuxIcc/mplibLAM
+++ b/wmake/rules/linuxIcc/mplibLAM
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(LAM_ARCH_PATH)/include
-PLIBS      = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lutil
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lutil
diff --git a/wmake/rules/linuxIcc/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH
index d586ba3e03..ac17f7c1d2 100644
--- a/wmake/rules/linuxIcc/mplibMPICH
+++ b/wmake/rules/linuxIcc/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxIcc/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI
index ea9b4d2299..834d2d3e22 100644
--- a/wmake/rules/linuxIcc/mplibOPENMPI
+++ b/wmake/rules/linuxIcc/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS      = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA
index dc67a60a0b..d62c6250ff 100644
--- a/wmake/rules/linuxmingw32/mplibGAMMA
+++ b/wmake/rules/linuxmingw32/mplibGAMMA
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(GAMMA_ARCH_PATH)/include
-PLIBS      = -L$(GAMMA_ARCH_PATH)/lib -lgamma
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxmingw32/mplibLAM b/wmake/rules/linuxmingw32/mplibLAM
index ce18f75860..6762b843c1 100644
--- a/wmake/rules/linuxmingw32/mplibLAM
+++ b/wmake/rules/linuxmingw32/mplibLAM
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(LAM_ARCH_PATH)/include
-PLIBS      = -L$(LAM_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH
index d586ba3e03..ac17f7c1d2 100644
--- a/wmake/rules/linuxmingw32/mplibMPICH
+++ b/wmake/rules/linuxmingw32/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxmingw32/mplibMPICH-GM b/wmake/rules/linuxmingw32/mplibMPICH-GM
index 74fd965808..88493ebc70 100644
--- a/wmake/rules/linuxmingw32/mplibMPICH-GM
+++ b/wmake/rules/linuxmingw32/mplibMPICH-GM
@@ -1,3 +1,3 @@
 PFLAGS     =
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI
index ea9b4d2299..834d2d3e22 100644
--- a/wmake/rules/linuxmingw32/mplibOPENMPI
+++ b/wmake/rules/linuxmingw32/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS      = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/solarisGcc/mplibLAM b/wmake/rules/solarisGcc/mplibLAM
index f14c793d9c..fc109a63b5 100644
--- a/wmake/rules/solarisGcc/mplibLAM
+++ b/wmake/rules/solarisGcc/mplibLAM
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(LAM_ARCH_PATH)/include
-PLIBS      = -L$(LAM_ARCH_PATH)/lib -lmpi -llam
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam
diff --git a/wmake/rules/solarisGcc/mplibMPICH b/wmake/rules/solarisGcc/mplibMPICH
index 46572fd7fe..cd9ff0e478 100644
--- a/wmake/rules/solarisGcc/mplibMPICH
+++ b/wmake/rules/solarisGcc/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = 
-PINC       = -I$(MPICH_ARCH_PATH)/include
-PLIBS      = -L$(MPICH_ARCH_PATH)/lib -lmpich -lrt -laio
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio
diff --git a/wmake/rules/solarisGcc/mplibOPENMPI b/wmake/rules/solarisGcc/mplibOPENMPI
index ea9b4d2299..834d2d3e22 100644
--- a/wmake/rules/solarisGcc/mplibOPENMPI
+++ b/wmake/rules/solarisGcc/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_ARCH_PATH)/include
-PLIBS      = -L$(OPENMPI_ARCH_PATH)/lib -lmpi
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi

From c461ad8fc96a1a177f206af3901fd4e34f20c93e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 5 Jun 2008 11:50:01 +0200
Subject: [PATCH 13/19] made ccm26ToFoam build conditional on ThirdParty
 library

---
 .../utilities/mesh/conversion/Optional/Allwmake       | 11 +++++++++++
 .../mesh/conversion/Optional/ccm26ToFoam/Allwmake     |  4 ----
 .../Optional/ccm26ToFoam/{ccm26ToFoam => }/Make/files |  0
 .../ccm26ToFoam/{ccm26ToFoam => }/Make/options        |  9 +++++----
 .../ccm26ToFoam/{ccm26ToFoam => }/ccm26ToFoam.C       |  0
 5 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100755 applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake
 rename applications/utilities/mesh/conversion/Optional/ccm26ToFoam/{ccm26ToFoam => }/Make/files (100%)
 rename applications/utilities/mesh/conversion/Optional/ccm26ToFoam/{ccm26ToFoam => }/Make/options (53%)
 rename applications/utilities/mesh/conversion/Optional/ccm26ToFoam/{ccm26ToFoam => }/ccm26ToFoam.C (100%)

diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index e69de29bb2..008c5cf8c4 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Build optional components (eg, may depend on third-party libraries)
+set -x
+
+# if the library exists, assume there are headers too
+if [ -e $FOAM_LIBBIN/libccmio.so ]
+then
+   wmake ccm26ToFoam
+fi
+
+# end
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake
deleted file mode 100755
index c37eb78a66..0000000000
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -x
-
-wmake ccm26ToFoam
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/files b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/files
similarity index 100%
rename from applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/files
rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/files
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/options b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
similarity index 53%
rename from applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/options
rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
index 061793379c..9ec0ccab03 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/options
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
@@ -1,11 +1,12 @@
+thirdParty=$(WM_PROJECT_INST_DIR)/ThirdParty
+
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/other/libccmio \
-    -I$(LIB_SRC)/other/libccmio/libccmio/lnInclude
+    -I$(thirdParty)/libccmio \
+    -I$(thirdParty)/libccmio/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -lccmio \
-    -ladf
+    -lccmio
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
similarity index 100%
rename from applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/ccm26ToFoam.C
rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C

From fc6781832351a073dcbdb6c8a63b2d1f1eade625 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 5 Jun 2008 13:17:31 +0200
Subject: [PATCH 14/19] Introduced Makefile variable 'THIRD_PARTY'

---
 .../mesh/conversion/Optional/ccm26ToFoam/Make/options       | 6 ++----
 src/decompositionAgglomeration/Allwmake                     | 5 ++---
 .../MGridGenGamgAgglomeration/Allwmake                      | 1 -
 .../MGridGenGAMGAgglomerate.C                               | 0
 .../MGridGenGAMGAgglomeration.C                             | 0
 .../MGridGenGAMGAgglomeration.H                             | 0
 .../{MGridGenGAMGAgglomeration => }/Make/files              | 0
 .../{MGridGenGAMGAgglomeration => }/Make/options            | 2 +-
 .../decompositionMethods/Make/options                       | 2 +-
 src/decompositionAgglomeration/parMetisDecomp/Make/options  | 4 ++--
 wmake/Makefile                                              | 1 +
 11 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100755 src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
 rename src/decompositionAgglomeration/MGridGenGamgAgglomeration/{MGridGenGAMGAgglomeration => }/MGridGenGAMGAgglomerate.C (100%)
 rename src/decompositionAgglomeration/MGridGenGamgAgglomeration/{MGridGenGAMGAgglomeration => }/MGridGenGAMGAgglomeration.C (100%)
 rename src/decompositionAgglomeration/MGridGenGamgAgglomeration/{MGridGenGAMGAgglomeration => }/MGridGenGAMGAgglomeration.H (100%)
 rename src/decompositionAgglomeration/MGridGenGamgAgglomeration/{MGridGenGAMGAgglomeration => }/Make/files (100%)
 rename src/decompositionAgglomeration/MGridGenGamgAgglomeration/{MGridGenGAMGAgglomeration => }/Make/options (79%)

diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
index 9ec0ccab03..d10f04194a 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
@@ -1,10 +1,8 @@
-thirdParty=$(WM_PROJECT_INST_DIR)/ThirdParty
-
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(thirdParty)/libccmio \
-    -I$(thirdParty)/libccmio/lnInclude
+    -I$(THIRD_PARTY)/libccmio \
+    -I$(THIRD_PARTY)/libccmio/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
diff --git a/src/decompositionAgglomeration/Allwmake b/src/decompositionAgglomeration/Allwmake
index bd4828e991..62018ac3fc 100755
--- a/src/decompositionAgglomeration/Allwmake
+++ b/src/decompositionAgglomeration/Allwmake
@@ -3,12 +3,11 @@ set -x
 
 wmake libso decompositionMethods
 
-if [ -d $FOAM_MPI_LIBBIN ]
+if [ -d "$FOAM_MPI_LIBBIN" ]
 then
     wmake libso parMetisDecomp
 fi
 
-( cd MGridGenGamgAgglomeration && ./Allwmake )
-
+wmake libso MGridGenGamgAgglomeration
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
deleted file mode 100755
index 98f16e38eb..0000000000
--- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
+++ /dev/null
@@ -1 +0,0 @@
-wmake libso MGridGenGAMGAgglomeration
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomerate.C b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomerate.C
rename to src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomeration.C b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomeration.C
rename to src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomeration.H b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomeration.H
rename to src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/files b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/files
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/files
rename to src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/files
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options
similarity index 79%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options
rename to src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options
index 8b8d0b6913..a158e92026 100644
--- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options
+++ b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options
@@ -1,4 +1,4 @@
-ParMGridGen = ${WM_PROJECT_INST_DIR}/ThirdParty/ParMGridGen-1.0
+ParMGridGen = $(THIRD_PARTY)/ParMGridGen-1.0
 
 TYPE_REAL=
 #if defined(SP)
diff --git a/src/decompositionAgglomeration/decompositionMethods/Make/options b/src/decompositionAgglomeration/decompositionMethods/Make/options
index 041b8c7180..bd781ef9ca 100644
--- a/src/decompositionAgglomeration/decompositionMethods/Make/options
+++ b/src/decompositionAgglomeration/decompositionMethods/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I${WM_PROJECT_INST_DIR}/ThirdParty/metis-5.0pre2/include
+    -I$(THIRD_PARTY)/metis-5.0pre2/include
 
 LIB_LIBS = \
     -lmetis \
diff --git a/src/decompositionAgglomeration/parMetisDecomp/Make/options b/src/decompositionAgglomeration/parMetisDecomp/Make/options
index eb2850d9e2..be8ac3eea1 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${WM_PROJECT_INST_DIR}/ThirdParty/ParMetis-3.1/ParMETISLib \
-    -I${WM_PROJECT_INST_DIR}/ThirdParty/ParMetis-3.1 \
+    -I$(THIRD_PARTY)/ParMetis-3.1/ParMETISLib \
+    -I$(THIRD_PARTY)/ParMetis-3.1 \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
diff --git a/wmake/Makefile b/wmake/Makefile
index 317d78e7cc..9a52485e24 100644
--- a/wmake/Makefile
+++ b/wmake/Makefile
@@ -59,6 +59,7 @@ LIB_DIR            = $(WM_PROJECT_DIR)/lib
 LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS)
 OBJECTS_DIR        = $(MAKE_DIR)/$(WM_OPTIONS)
 CLASSES_DIR        = $(MAKE_DIR)/classes
+THIRD_PARTY        = $(WM_PROJECT_INST_DIR)/ThirdParty
 
 SYS_INC            =
 SYS_LIBS           =

From 220b4c128ba679dca48d3acc87b208e91f9853c3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 5 Jun 2008 15:17:24 +0200
Subject: [PATCH 15/19] documentation: updated README

---
 README | 148 +++++++++++++++------------------------------------------
 1 file changed, 37 insertions(+), 111 deletions(-)

diff --git a/README b/README
index 7137010e97..e698d955a2 100644
--- a/README
+++ b/README
@@ -23,20 +23,19 @@
   7.  Documentation
   8.  Help
   9.  Reporting Bugs
-  A.  Network settings
-  B.  Running OpenFOAM in 32-bit mode
+  A.  Running OpenFOAM in 32-bit mode
 
 
 2. System requirements
 ~~~~~~~~~~~~~~~~~~~~~~
-  OpenFOAM generally requires that the host machine operates a basic level
-  of networking.  To check your system setup, execute the foamSystemCheck
+  OpenFOAM is developed and tested on Linux, but should work with other
+  Unix style system.  To check your system setup, execute the foamSystemCheck
   script in the bin directory of the OpenFOAM installation. If no problems
-  are reported, proceed to "3. Installation"; otherwise see the
-  appendix "A. Network settings" and/or contact your system administrator.
+  are reported, proceed to "3. Installation"; otherwise contact your
+  system administrator.
 
   If the user wishes to run OpenFOAM in 32/64-bit mode they should consult
-  the appendix "B. Running OpenFOAM in 32-bit mode".
+  the appendix "A. Running OpenFOAM in 32-bit mode".
 
 
 3. Installation
@@ -48,14 +47,16 @@
   The environment variable settings are contained in files in an etc/
   directory in the OpenFOAM release. e.g. in
 
-      $HOME/OpenFOAM/OpenFOAM-dev/etc/
+      $HOME/OpenFOAM/OpenFOAM-<VERSION>/etc/
+
+      where <VERSION> corresponds to the version 1.4, 1.5, ...
 
   a)
     EITHER, if running bash or ksh (if in doubt type 'echo $SHELL'),
     source the etc/bashrc file by adding the following line to the end
     of your $HOME/.bashrc file:
 
-        . $HOME/OpenFOAM/OpenFOAM-dev/etc/bashrc
+        . $HOME/OpenFOAM/OpenFOAM-<VERSION>/etc/bashrc
 
     Then update the environment variables by sourcing the $HOME/.bashrc file
     by typing in the terminal:
@@ -66,7 +67,7 @@
     OR, if running tcsh or csh, source the etc/cshrc file by adding the
     following line to the end of your $HOME/.cshrc file:
 
-        source $HOME/OpenFOAM/OpenFOAM-dev/etc/cshrc
+        source $HOME/OpenFOAM/OpenFOAM-<VERSION>/etc/cshrc
 
     Then update the environment variables by sourcing the $HOME/.cshrc file
     by typing in the terminal:
@@ -85,39 +86,42 @@
     the appropriate resource file. Here is a bash/ksh/sh example:
 
         export FOAM_INST_DIR=/data/app/OpenFOAM
-        foamDotFile=$FOAM_INST_DIR/OpenFOAM-dev/etc/bashrc
+        foamDotFile=$FOAM_INST_DIR/OpenFOAM-<VERSION>/etc/bashrc
         [ -f $foamDotFile ] && . $foamDotFile
 
     and a csh example:
 
         setenv FOAM_INST_DIR /data/app/OpenFOAM
-        foamDotFile=$FOAM_INST_DIR/OpenFOAM-dev/etc/bashrc
+        foamDotFile=$FOAM_INST_DIR/OpenFOAM-<VERSION>/etc/bashrc
         if ( -f $foamDotFile ) source $foamDotFile
 
 
-    The value set in '$FOAM_INST_DIR' will be used to locate the rest
-    of the OpenFOAM installation.
-
+    The value set in '$FOAM_INST_DIR' will be used to locate the remaining
+    parts of the OpenFOAM installation.
 
 
 4. Building from Sources (Optional)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  If you cannot find an appropriate binary pack for your platform you can
+
+  If you cannot find an appropriate binary pack for your platform, you can
   build the complete OpenFOAM from the source-pack.  First you will need to
-  compile or obtain a recent version of gcc (we recommend gcc-4.1.?) for
-  your platform which may be obtained from http://gcc.gnu.org/.  Install the
-  compiler in $WM_PROJECT_INST_DIR/$WM_ARCH/gcc-4.1.? and change the gcc
-  version number in $WM_PROJECT_DIR/.bashrc and $WM_PROJECT_DIR/.cshrc as
-  appropriate and update the environment variables as in section 3.
+  compile or obtain a recent version of gcc (we recomend gcc-4.2.?) for
+  your platform, which may be obtained from http://gcc.gnu.org/.
+
+  Install the compiler in
+  $WM_PROJECT_INST_DIR/ThirdParty/gcc-<GCC_VERSION>/platforms/$WM_ARCH$WM_COMPILER_ARCH/
+  and change the gcc version number in $WM_PROJECT_DIR/etc/settings.sh and
+  $WM_PROJECT_DIR/etc/settings.csh appropriately and finally update the
+  environment variables as in section 3.
 
   Now go to the top-level source directory $WM_PROJECT_DIR and type
   ./Allwmake, which is the name of the top-level build script for building
-  the whole of OpenFOAM.  In principle this will build everything but
+  the whole of OpenFOAM.  In principle this will build everything, but
   sometimes problems occur with the build order and it is necessary to
   update the environment variables and re-execute Allwmake.  If you
   experience difficulties with building the source-pack or your platform is
-  not currently supported please contact enquiries@OpenCFD.co.uk to
-  negotiate a support contract and we will do the port and maintiain it in
+  not currently supported please contact <enquiries@OpenCFD.co.uk> to
+  negotiate a support contract and we will do the port and maintain it in
   future releases.
 
 
@@ -132,21 +136,22 @@
 
 6. Getting Started
 ~~~~~~~~~~~~~~~~~~
-  Create a project directory within the $HOME/OpenFOAM directory named
-  <userName>-dev (e.g. 'chris-dev' for user chris) and create a
-  directory named 'run' within it, e.g. by typing:
 
-      mkdir -p $HOME/OpenFOAM/${LOGNAME}-dev/run
+  Create a project directory within the $HOME/OpenFOAM directory named
+  <USER>-<VERSION> (e.g. 'chris-1.5' for user chris and OpenFOAM version 1.5)
+  and create a directory named 'run' within it, e.g. by typing:
+
+      mkdir -p $HOME/OpenFOAM/${USER}-${WM_PROJECT_VERSION}/run
 
   Copy the 'tutorial' examples directory in the OpenFOAM distribution to the
   'run' directory.  If OpenFOAM environment variables are set correctly,
   then the following command will be correct:
 
-      cp -r $WM_PROJECT_DIR/tutorials $HOME/OpenFOAM/${LOGNAME}-dev/run
+      cp -r $WM_PROJECT_DIR/tutorials $HOME/OpenFOAM/${USER}-${WM_PROJECT_VERSION}/run
 
   Run the first example case of incompressible laminar flow in a cavity:
 
-      cd $HOME/OpenFOAM/${LOGNAME}-dev/run/tutorials/icoFoam/cavity
+      cd $HOME/OpenFOAM/${USER}-${WM_PROJECT_VERSION}/run/tutorials/icoFoam/cavity
       blockMesh
       icoFoam
 
@@ -167,87 +172,7 @@
     http://www.OpenFOAM.org/bugs.html
 
 
-A. Network settings
-~~~~~~~~~~~~~~~~~~~
-  OpenFOAM requires a basic level of networking to be set up.  Firstly, the
-  host name must be set - to test, type 'uname -a'.  The running shell must
-  be tcsh, csh, bash or ksh - to test type 'echo $SHELL'
-
-  The user must be able to 'ping' the host machine itself (<host>) - to
-  test, type 'ping -c 1 <host>'
-
-  If the ping fails then it is possible that that the entry for the host
-  machine is missing, incorrect or duplicated in the /etc/hosts file.  The
-  user can check this by typing 'grep <host> /etc/hosts' which should return
-  a single line, typically of the form:
-
-      <IPaddress> <host>.<domain> <host>
-
-  The <IPaddress> must correspond to that in the networking settings of the
-  machine which can also be checked by typing on Linux '/sbin/ifconfig'
-  which should produce lines of output that include something similar to the
-  following:
-
-      eth0  Link encap:Ethernet HWaddr ...
-            inet addr:<IPaddress> ...
-
-  If the user is connected to a network that uses dynamic IP addresses, they
-  must be particularly careful to ensure that an entry for their hostname/IP
-  exists in the /etc/hosts file. If the server frequently reallocates IP
-  addresses across the network, it is advisable that the /etc/hosts file is
-  updated automatically when any changes occur.
-
-  The user should also be able to contact any other machine that it needs
-  to, either a remote licence host or other machines that are being used
-  within some parallel computation. Essentially the user needs to be able to
-  ping these machines as described in preceeding sections.
-
-  The machine must have one of (or both) remote (rsh) and secure shell (ssh)
-  running on his/her account. To check whether rsh is running correctly, the
-  user should type 'rsh <host> ls'. Alternatively the user can check if ssh
-  is running correctly by typing 'ssh <host> ls'. In either case, the output
-  to the command should produce a file/directory listing for the current
-  directory and no other text. If neither command works, we recommend the
-  user set up rsh for their use as follows:
-
-  Check the rsh executable actually exists, e.g. the path to the executable
-  should be returned when typing 'which rsh'. Check with the system
-  administrator that rsh is enabled on the user's account; if not, request
-  that it is enabled. Create a '.rhosts' file in the $HOME directory
-  containing entries to access any machines they need to access, i.e. their
-  own machine and, if different, the licence host machine. The entries are
-  of the form: '<host> <user>'.
-
-  Remote shell accesses the .bashrc (or .cshrc) file and will not run
-  correctly if there is a problem with this file. In particular the user
-  should be careful with the following:
-
-  The ~/.cshrc (or ~/.bashrc) file should not contain errors that prevent it
-  from executing fully at startup; all error messages during execution of
-  the ~/.bashrc (or ~/.cshrc) file should be investigated and acted upon to
-  eliminate them. echo (print to screen) statements within ~/.bashrc (or
-  ~/.cshrc) must not be executed during the running of rsh. This does not
-  mean that echo statements are forbidden from the ~/.cshrc (or ~/.bashrc)
-  file, but they must be enclosed in a control structure, e.g. an if
-  statement, that ensures they are not executed when rsh is executed.
-  For ~.bashrc:
-
-      if [ "$PS1" ]; then
-         echo "..."
-      fi
-
-    # or, alternatively
-
-      if /usr/bin/tty -s 2>/dev/null; then
-         echo "..."
-      fi
-
-  and, for ~.cshrc:
-
-      if ($?prompt) then ; echo "..." ; endif
-
-
-B. Running OpenFOAM in 32-bit mode on 64-bit machines
+A. Running OpenFOAM in 32-bit mode on 64-bit machines
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   Those users with an installation of Linux on a 64-bit machine may install
   either or both of the 32-bit version of OpenFOAM (linux) or the 64-bit
@@ -256,3 +181,4 @@ B. Running OpenFOAM in 32-bit mode on 64-bit machines
   variable $WM_32 (to anything, e.g. "on") before sourcing the etc/bashrc
   (or etc/cshrc) file.  Unsetting $WM_32 and sourcing the bashrc file will
   set up the user to run in 64-bit mode.
+

From aa68159ae4d4c09fe635865c7ea9221f2d4c2994 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 5 Jun 2008 15:29:53 +0200
Subject: [PATCH 16/19] wmake must be made before other targets.

---
 Allwmake     |  5 +++--
 wmake/wmkdir | 16 ++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Allwmake b/Allwmake
index a311597d39..515d1cdf9a 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,9 +1,10 @@
 #!/bin/sh
 set -x
 
-(cd $WM_PROJECT_INST_DIR/ThirdParty && ./Allwmake)
+# wmake is required for subsequent targets
+(cd wmake/src && make)
 
-(cd wmake && ./makeWmake)
+(cd $WM_PROJECT_INST_DIR/ThirdParty && ./Allwmake)
 
 (cd src && ./Allwmake)
 
diff --git a/wmake/wmkdir b/wmake/wmkdir
index ef89acc924..54c85c0aa3 100755
--- a/wmake/wmkdir
+++ b/wmake/wmkdir
@@ -27,17 +27,21 @@
 #     wmkdir
 #
 # Description
-#     Script which makes a directory is not already constucted.
+#     Script that makes a directory is not already constructed.
 #     Usage : wmkdir <directoryName>
 #
 #------------------------------------------------------------------------------
 
-if [ $# = 1 ]
+if [ $# -eq 1 ]
 then
-    if [ ! -d $1 ]
-    then
-        mkdir -p $1
-    fi
+   # provide help
+   if [ "$1" = "-h" -o "$1" = "-help" ]
+   then
+      echo "usage: ${0##*/} <dir>"
+      echo "       mkdir if directory does not already exist"
+   else
+      [ -d "$1" ] || mkdir -p "$1"
+   fi
 fi
 
 

From b2fd02df8d182933d4928e5ad54ee41dcfe91800 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 6 Jun 2008 10:17:32 +0200
Subject: [PATCH 17/19] Doxygen : fixed rogue classes, simplified INPUT

---
 doc/Doxygen/Doxyfile                          | 35 +------------
 .../containers/HashTables/HashSet/HashSet.H   |  5 ++
 src/OpenFOAM/global/foamVersion.H             |  2 +-
 .../basic/coupled/coupledPolyPatch.H          |  7 +--
 .../autoHexMeshDriver/autoHexMeshDriver.C     |  3 --
 .../autoHexMeshDriver/autoHexMeshDriver.H     | 10 ++--
 .../autoHexMeshDriver/pointData/pointData.H   |  3 +-
 .../meshRefinement/meshRefinement.C           |  3 --
 .../meshRefinement/meshRefinement.H           |  9 ++--
 .../meshRefinement/meshRefinementBaffles.C    |  3 --
 .../meshRefinement/meshRefinementMerge.C      |  3 --
 .../meshRefinement/meshRefinementRefine.C     |  3 --
 .../refinementSurfaces/refinementSurfaces.C   |  5 +-
 .../refinementSurfaces/refinementSurfaces.H   |  2 +-
 .../trackedParticle/ExactParticle.H           |  2 +-
 .../trackedParticle/trackedParticle.H         |  2 +-
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.H |  7 +--
 .../polyTopoChange/addPatchCellLayer.H        | 52 ++++++++++---------
 .../polyTopoChange/combineFaces.H             |  2 +-
 src/finiteVolume/finiteVolume/fvc/fvc.H       |  2 +-
 src/finiteVolume/finiteVolume/fvm/fvm.H       |  4 +-
 .../limitedSchemes/LimitedScheme/LimitFuncs.C | 14 -----
 .../limitedSchemes/LimitedScheme/LimitFuncs.H |  9 +++-
 .../ReactingCloud/ReactingCloudThermoTypes.H  |  2 +-
 .../cloudAbsorptionEmission.H                 |  2 +-
 .../scatter/cloudScatter/cloudScatter.H       |  2 +-
 src/lagrangian/molecule/molecule/molecule.H   |  3 +-
 .../searchableSurface/triSurfaceMesh.H        |  2 +-
 .../foamCalcFunctions/calcType/calcType.H     |  7 +++
 .../field/components/components.H             |  2 +-
 .../foamCalcFunctions/field/div/div.H         |  2 +-
 .../foamCalcFunctions/field/mag/mag.H         |  2 +-
 .../foamCalcFunctions/field/magGrad/magGrad.H |  2 +-
 .../foamCalcFunctions/field/magSqr/magSqr.H   |  2 +-
 .../forces/forceCoeffs/forceCoeffs.H          |  2 +-
 src/postProcessing/forces/forces/forces.H     |  5 +-
 .../sampledSurface/writers/dx/dxWriters.H     |  4 +-
 .../writers/foamFile/foamFile.H               |  3 +-
 .../writers/foamFile/foamFileWriters.H        |  4 +-
 .../sampledSurface/writers/null/nullWriters.H |  4 +-
 .../writers/raw/rawSurfaceWriters.H           |  4 +-
 .../sampledSurface/writers/stl/stlWriters.H   |  4 +-
 .../sampledSurface/writers/surfaceWriters.H   |  4 +-
 .../sampledSurface/writers/vtk/vtkWriters.H   |  4 +-
 .../barotropicCompressibilityModel.H          |  8 +++
 .../triSurfaceFields/triSurfaceFields.H       |  2 +-
 46 files changed, 118 insertions(+), 145 deletions(-)

diff --git a/doc/Doxygen/Doxyfile b/doc/Doxygen/Doxyfile
index 88a67c002d..cce0feda75 100644
--- a/doc/Doxygen/Doxyfile
+++ b/doc/Doxygen/Doxyfile
@@ -477,40 +477,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM \
-                         $(WM_PROJECT_DIR)/src/Pstream \
-                         $(WM_PROJECT_DIR)/src/finiteVolume \
-                         $(WM_PROJECT_DIR)/src/transportModels/incompressible \
-                         $(WM_PROJECT_DIR)/src/transportModels/interfaceProperties \
-                         $(WM_PROJECT_DIR)/src/thermophysicalModels/thermophysicalFunctions \
-                         $(WM_PROJECT_DIR)/src/thermophysicalModels/specie \
-                         $(WM_PROJECT_DIR)/src/thermophysicalModels/liquids \
-                         $(WM_PROJECT_DIR)/src/thermophysicalModels/liquidMixture \
-                         $(WM_PROJECT_DIR)/src/thermophysicalModels/basic \
-                         $(WM_PROJECT_DIR)/src/thermophysicalModels/combustion \
-                         $(WM_PROJECT_DIR)/src/thermophysicalModels/pdfs \
-                         $(WM_PROJECT_DIR)/src/thermophysicalModels/chemistryModel \
-                         $(WM_PROJECT_DIR)/src/thermophysicalModels/laminarFlameSpeed \
-                         $(WM_PROJECT_DIR)/src/turbulenceModels/incompressible \
-                         $(WM_PROJECT_DIR)/src/turbulenceModels/compressible \
-                         $(WM_PROJECT_DIR)/src/LESmodels/LESfilters \
-                         $(WM_PROJECT_DIR)/src/LESmodels/incompressible \
-                         $(WM_PROJECT_DIR)/src/LESmodels/compressible \
-                         $(WM_PROJECT_DIR)/src/errorEstimation \
-                         $(WM_PROJECT_DIR)/src/dynamicMesh \
-                         $(WM_PROJECT_DIR)/src/triSurface \
-                         $(WM_PROJECT_DIR)/src/edgeMesh \
-                         $(WM_PROJECT_DIR)/src/lagrangian/basic \
-                         $(WM_PROJECT_DIR)/src/lagrangian/solidParticle \
-                         $(WM_PROJECT_DIR)/src/lagrangian/dieselSpray \
-                         $(WM_PROJECT_DIR)/src/engine \
-                         $(WM_PROJECT_DIR)/src/ODE \
-                         $(WM_PROJECT_DIR)/src/randomProcesses \
-                         $(WM_PROJECT_DIR)/src/sampling \
-                         $(WM_PROJECT_DIR)/src/meshTools \
-                         $(WM_PROJECT_DIR)/src/dynamicFvMesh \
-                         $(WM_PROJECT_DIR)/src/topoChangerFvMesh \
-                         $(WM_PROJECT_DIR)/src/fvMotionSolver \
+INPUT                  = $(WM_PROJECT_DIR)/src \
                          $(WM_PROJECT_DIR)/applications/utilities \
                          $(WM_PROJECT_DIR)/applications/solvers
 
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index 5c7f893671..4bad027fd1 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -28,6 +28,11 @@ Class
 Description
     A HashTable with word keys but without contents.
 
+Class
+    Foam::wordHashSet
+
+Description
+    A HashSet with (the default) word keys.
 \*---------------------------------------------------------------------------*/
 
 #ifndef HashSet_H
diff --git a/src/OpenFOAM/global/foamVersion.H b/src/OpenFOAM/global/foamVersion.H
index e6d1630da2..d46dd65150 100644
--- a/src/OpenFOAM/global/foamVersion.H
+++ b/src/OpenFOAM/global/foamVersion.H
@@ -30,7 +30,7 @@ Description
 
 
 Global
-    foamVersion
+    Foam::FOAMversion
 
 Description
     OpenFOAM version number static string.
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index 5c37ea0528..e272e7db70 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -23,11 +23,12 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    coupledPolyPatch
+    Foam::coupledPolyPatch
 
 Description
-    coupledPolyPatch is an abstract base class for patches that couple regions
-    of the computational domain e.g. cyclic and processor-processor links.
+    The coupledPolyPatch is an abstract base class for patches that couple
+    regions of the computational domain e.g. cyclic and processor-processor
+    links.
 
 SourceFiles
     coupledPolyPatch.C
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
index 6435d491d9..b753e26785 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    autoHexMeshDriver
-
 \*----------------------------------------------------------------------------*/
 
 #include "autoHexMeshDriver.H"
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
index fccb96a337..6576e3699c 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    autoHexMeshDriver
+    Foam::autoHexMeshDriver
 
 Description
     main meshing driver.
@@ -85,9 +85,9 @@ class autoHexMeshDriver
         //- Extrusion controls
         enum extrudeMode
         {
-            NOEXTRUDE,      // Do not extrude. No layers added.
-            EXTRUDE,        // Extrude
-            EXTRUDEREMOVE   // Extrude but afterwards remove added faces locally
+            NOEXTRUDE,      /*!< Do not extrude. No layers added. */
+            EXTRUDE,        /*!< Extrude */
+            EXTRUDEREMOVE   /*!< Extrude but afterwards remove added faces locally */
         };
 
 
@@ -107,7 +107,7 @@ class autoHexMeshDriver
             }
         };
 
-        // Combine operator class to combine normal with other normal.
+        //- Combine operator class to combine normal with other normal.
         class nomalsCombine
         {
         public:
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H b/src/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
index e989184699..7b5634eb50 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
@@ -23,11 +23,12 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    pointData
+    Foam::pointData
 
 Description
     Holds information regarding nearest wall point. Used in pointEdgeWave.
     (so not standard meshWave)
+
     To be used in wall distance calculation.
 
 SourceFiles
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index ffac7a5e8d..14dc51dca6 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    meshRefinement
-
 \*----------------------------------------------------------------------------*/
 
 #include "Pstream.H"
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
index 1919c860f8..ef71ed989d 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
@@ -23,11 +23,12 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    meshRefinement
+    Foam::meshRefinement
 
 Description
     Helper class which maintains intersections of (changing) mesh with
     (static) surfaces.
+
     Maintains
     - per face any intersections of this edge with any of the surfaces
 
@@ -90,9 +91,9 @@ public:
         //- Enumeration for how the userdata is to be mapped upon refinement.
         enum mapType
         {
-            MASTERONLY = 1, // maintain master only
-            KEEPALL = 2,    // have slaves (upon refinement) from master
-            REMOVE = 4      // set value to -1 any face that has been refined
+            MASTERONLY = 1, /*!< maintain master only */
+            KEEPALL = 2,    /*!< have slaves (upon refinement) from master */
+            REMOVE = 4      /*!< set value to -1 any face that has been refined */
         };
 
 
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index c37f3cc36d..5e6a4be44a 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    meshRefinement
-
 \*----------------------------------------------------------------------------*/
 
 #include "meshRefinement.H"
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
index 74ee5b4bf3..f8e7b366a4 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    meshRefinement
-
 \*----------------------------------------------------------------------------*/
 
 #include "meshRefinement.H"
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
index 48f1ba8d9f..bc0ffe26c5 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    meshRefinement
-
 \*----------------------------------------------------------------------------*/
 
 #include "meshRefinement.H"
diff --git a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index 6dbccc7c14..cbe1be1ad3 100644
--- a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    refinementSurfaces
-
 \*----------------------------------------------------------------------------*/
 
 #include "refinementSurfaces.H"
@@ -261,7 +258,7 @@ Foam::refinementSurfaces::refinementSurfaces
                     << " which has regions " << regionNames
                     << abort(FatalError);
             }
-            
+
             label globalRegionI = regionOffset_[surfI] + regionI;
 
             minLevel_[globalRegionI] = iter();
diff --git a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
index 9e0b720d68..625fef00a4 100644
--- a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
+++ b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    refinementSurfaces
+    Foam::refinementSurfaces
 
 Description
     Container for triSurfaces used for surface-driven refinement.
diff --git a/src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H b/src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
index df4d0c61c3..80146fc700 100644
--- a/src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
+++ b/src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    ExactParticle
+    Foam::ExactParticle
 
 Description
     Special version of Particle to do tracking on non-convex cells.
diff --git a/src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H b/src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
index e064a4da81..2678be6b86 100644
--- a/src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
+++ b/src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    trackedParticle
+    Foam::trackedParticle
 
 Description
     Particle class that marks cells it passes through. Used to mark cells
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
index ea47f6e3fa..e2c0ac5992 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
@@ -23,11 +23,12 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    dynamicRefineFvMesh
+    Foam::dynamicRefineFvMesh
 
 Description
-    fvMesh with built-in refinement. Determines which cells to refine/unrefine
-    and does all in update().
+    A fvMesh with built-in refinement.
+
+    Determines which cells to refine/unrefine and does all in update().
 
 SourceFiles
     dynamicRefineFvMesh.C
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index 7e443d76f7..015238970d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -23,27 +23,29 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    addPatchCellLayer
+    Foam::addPatchCellLayer
 
 Description
-    Adds layers of cells to outside of polyPatch. Call setRefinement with
-    offset vector for every patch point and number of layers per patch face
-    and number of layers per patch point.
+    Adds layers of cells to outside of polyPatch.
+
+    Call setRefinement with offset vector for every patch point and number
+    of layers per patch face and number of layers per patch point.
     - offset vector should be zero for any non-manifold point and synchronised
-    on coupled points before calling this.
+      on coupled points before calling this.
     - offset vector of zero will not add any points.
     - gets supplied the number of extruded layers both per face and per
       point. Usually the point nlayers is the max of surrounding face nlayers.
 
-        point nlayers:
-         0 : no extrusion. Any surrounding face being extruded becomes 'prism'
-        >0 : should be max of surrounding face nlayers.
+      point nlayers:
+       -  0 : no extrusion. Any surrounding face being extruded becomes 'prism'
+       - >0 : should be max of surrounding face nlayers.
 
     - differing face nlayers: 'termination' : (e.g. from 2 to 4 layers) match
       at original patch face side.
 
         E.g. 2 boundary faces on patches a,b. 2 layers for a, 3 for b.
 
+    @verbatim
         Was:
 
            a      b         <- patch of boundary face
@@ -51,7 +53,6 @@ Description
         |      |      |     <- original cells
         +------+------+
 
-
         Becomes:
 
            a      b         <- patch of boundary face
@@ -61,6 +62,7 @@ Description
         +------+------+
         |      |      |     <- original cells
         +------+------+
+    @endverbatim
 
 
     - added faces get same patchID as face they are extruded from
@@ -70,24 +72,26 @@ Description
 
     E.g. 3 boundary faces on patches a,b. b gets extruded, a doesn't.
 
-       a      b      b          <- patch of boundary face
-    +------+------+------+
-    |      |      |      |      <- cells
-    +------+------+------+
+    @verbatim
+           a      b      b          <- patch of boundary face
+        +------+------+------+
+        |      |      |      |      <- cells
+        +------+------+------+
 
 
-           ^      ^             <- wanted extrusion vector (none at far right)
-       a   |  b   |  b          <- patch of boundary face
-    +------+------+------+
-    |      |      |      |      <- cells
-    +------+------+------+
+               ^      ^             <- wanted extrusion vector (none at far right)
+           a   |  b   |  b          <- patch of boundary face
+        +------+------+------+
+        |      |      |      |      <- cells
+        +------+------+------+
 
-              b
-           +------+\ b          1. prism cell added onto second b face since
-       a  a|      | ----\          only one side gets extruded.
-    +------+------+------+      2. side-face gets patch a, not b.
-    |      |      |      |
-    +------+------+------+
+                  b
+               +------+\ b          1. prism cell added onto second b face since
+           a  a|      | ----\          only one side gets extruded.
+        +------+------+------+      2. side-face gets patch a, not b.
+        |      |      |      |
+        +------+------+------+
+    @endverbatim
 
 
 SourceFiles
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
index c7b76fa874..60f412eb16 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    combineFaces
+    Foam::combineFaces
 
 Description
     Combines boundary faces into single face. The faces get the patch
diff --git a/src/finiteVolume/finiteVolume/fvc/fvc.H b/src/finiteVolume/finiteVolume/fvc/fvc.H
index 4c410483bc..4dc3daad9d 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvc.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvc.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-InNamespace
+Namespace
     Foam::fvc
 
 Description
diff --git a/src/finiteVolume/finiteVolume/fvm/fvm.H b/src/finiteVolume/finiteVolume/fvm/fvm.H
index 4e534f6e02..754d089b8a 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvm.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvm.H
@@ -27,7 +27,9 @@ Namespace
 
 Description
     Namespace of functions to calculate implicit derivatives returning a
-    matrix. Time derivatives are calculated using Euler-implicit, backward
+    matrix.
+
+    Temporal derivatives are calculated using Euler-implicit, backward
     differencing or Crank-Nicholson. Spatial derivatives are calculated
     using Gauss' Theorem.
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C
index eade866f54..ba6b3d2239 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C
@@ -22,20 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Class to create the weighting-factors based on the NVD
-    (Normalised Variable Diagram).
-    The particular differencing scheme class is supplied as a template argument,
-    the weight function of which is called by the weight function of this class
-    for the internal faces as well as faces of coupled patches
-    (e.g. processor-processor patches). The weight function is supplied the
-    central-differencing weighting factor, the face-flux, the cell and face
-    gradients (from which the normalised variable distribution may be created)
-    and the cell centre distance.
-
-    This code organisation is both neat and efficient, allowing for convenient
-    implementation of new schemes to run on parallelised cases.
-
 \*---------------------------------------------------------------------------*/
 
 #include "volFields.H"
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
index 406ea8b810..2e1749af1f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
@@ -22,12 +22,19 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
+Namespace
+    Foam::limitFuncs
+
+Description
+    Namespace for limiting functions
+
+
 Class
     Foam::limitFuncs::LimitFuncs
 
 Description
     Class to create NVD/TVD limited weighting-factors.
- 
+
     The particular differencing scheme class is supplied as a template
     argument, the weight function of which is called by the weight function
     of this class for the internal faces as well as faces of coupled
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudThermoTypes.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudThermoTypes.H
index 9fe413101d..bd739253f7 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudThermoTypes.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudThermoTypes.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
+Typedefs
     Foam::cloudThermoTypes
 
 Description
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
index 0f4c9e5a53..20f4ceab3a 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::cloudAbsorptionEmission
+    Foam::radiation::cloudAbsorptionEmission
 
 Description
     Retrieves absorption/emission data from a cloud object
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
index 579a3faaf2..26185f6362 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::scatterModel
+    Foam::radiation::cloudScatter
 
 Description
     Cloud radiation scatter model
diff --git a/src/lagrangian/molecule/molecule/molecule.H b/src/lagrangian/molecule/molecule/molecule.H
index 0f9b478d05..68cff646b1 100755
--- a/src/lagrangian/molecule/molecule/molecule.H
+++ b/src/lagrangian/molecule/molecule/molecule.H
@@ -23,9 +23,10 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    molecule
+    Foam::molecule
 
 Description
+    Foam::molecule
 
 SourceFiles
     moleculeI.H
diff --git a/src/meshTools/triSurface/searchableSurface/triSurfaceMesh.H b/src/meshTools/triSurface/searchableSurface/triSurfaceMesh.H
index 6d99d8a080..4f47b212da 100644
--- a/src/meshTools/triSurface/searchableSurface/triSurfaceMesh.H
+++ b/src/meshTools/triSurface/searchableSurface/triSurfaceMesh.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    triSurfaceMesh
+    Foam::triSurfaceMesh
 
 Description
     IOoject and searching on triSurface
diff --git a/src/postProcessing/foamCalcFunctions/calcType/calcType.H b/src/postProcessing/foamCalcFunctions/calcType/calcType.H
index 5e7d1079d2..99809aaae1 100644
--- a/src/postProcessing/foamCalcFunctions/calcType/calcType.H
+++ b/src/postProcessing/foamCalcFunctions/calcType/calcType.H
@@ -22,6 +22,13 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
+Namespace
+    Foam::calcTypes
+
+Description
+    Namespace for post-processing calculation functions
+
+
 Class
     Foam::calcType
 
diff --git a/src/postProcessing/foamCalcFunctions/field/components/components.H b/src/postProcessing/foamCalcFunctions/field/components/components.H
index 8c66325a62..6567f45ed6 100644
--- a/src/postProcessing/foamCalcFunctions/field/components/components.H
+++ b/src/postProcessing/foamCalcFunctions/field/components/components.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::components
+    Foam::calcTypes::components
 
 Description
     Writes scalar fields corresponding to each component of the supplied
diff --git a/src/postProcessing/foamCalcFunctions/field/div/div.H b/src/postProcessing/foamCalcFunctions/field/div/div.H
index 7b920d369d..39c5a9e98b 100644
--- a/src/postProcessing/foamCalcFunctions/field/div/div.H
+++ b/src/postProcessing/foamCalcFunctions/field/div/div.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::div
+    Foam::calcTypes::div
 
 Description
     Writes scalar fields corresponding to the divergence of the supplied
diff --git a/src/postProcessing/foamCalcFunctions/field/mag/mag.H b/src/postProcessing/foamCalcFunctions/field/mag/mag.H
index 179d5b235d..8c1bebde56 100644
--- a/src/postProcessing/foamCalcFunctions/field/mag/mag.H
+++ b/src/postProcessing/foamCalcFunctions/field/mag/mag.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::mag
+    Foam::calcTypes::mag
 
 Description
     Calculates and writes the magnitude of a field for each time
diff --git a/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H b/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
index 9ab358bdfb..48911fd4d9 100644
--- a/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
+++ b/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::magGrad
+    Foam::calcTypes::magGrad
 
 Description
     Writes scalar fields corresponding to the magnitude ot the gradient
diff --git a/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H b/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
index 7609763e9e..f2ca53d3ed 100644
--- a/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
+++ b/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::magSqr
+    Foam::calcTypes::magSqr
 
 Description
     Calculates and writes the magnitude-sqaured of a field for each time
diff --git a/src/postProcessing/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/forces/forceCoeffs/forceCoeffs.H
index 846bcbc47c..977ef135a8 100644
--- a/src/postProcessing/forces/forceCoeffs/forceCoeffs.H
+++ b/src/postProcessing/forces/forceCoeffs/forceCoeffs.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    forceCoeffs
+    Foam::forceCoeffs
 
 Description
     Derived from the forces function object, creates a specialisation to
diff --git a/src/postProcessing/forces/forces/forces.H b/src/postProcessing/forces/forces/forces.H
index 25bbe02f99..1c730b34b5 100644
--- a/src/postProcessing/forces/forces/forces.H
+++ b/src/postProcessing/forces/forces/forces.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    forces
+    Foam::forces
 
 Description
     Calculates the forces and moments by integrating the pressure and
@@ -77,8 +77,7 @@ public:
     // pressure/viscous forces Tuples.
     typedef Tuple2<pressureViscous, pressureViscous> forcesMoments;
 
-    // Sum operation class used to accumulate the pressure and viscous
-    // forces and moments
+    //- Sum operation class to accumulate the pressure, viscous forces and moments
     class sumOp
     {
     public:
diff --git a/src/sampling/sampledSurface/writers/dx/dxWriters.H b/src/sampling/sampledSurface/writers/dx/dxWriters.H
index 7a3f9e27a9..39dfedabdd 100644
--- a/src/sampling/sampledSurface/writers/dx/dxWriters.H
+++ b/src/sampling/sampledSurface/writers/dx/dxWriters.H
@@ -22,8 +22,8 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    dxWriters
+InClass
+    Foam::dxWriters
 
 Description
 
diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFile.H b/src/sampling/sampledSurface/writers/foamFile/foamFile.H
index 532e920a45..69b020ec51 100644
--- a/src/sampling/sampledSurface/writers/foamFile/foamFile.H
+++ b/src/sampling/sampledSurface/writers/foamFile/foamFile.H
@@ -23,9 +23,10 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    foamFile
+    Foam::foamFile
 
 Description
+    A surfaceWriter for foamFiles
 
 SourceFiles
     foamFile.C
diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileWriters.H b/src/sampling/sampledSurface/writers/foamFile/foamFileWriters.H
index d321c0d509..61868b618e 100644
--- a/src/sampling/sampledSurface/writers/foamFile/foamFileWriters.H
+++ b/src/sampling/sampledSurface/writers/foamFile/foamFileWriters.H
@@ -22,8 +22,8 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    foamFileWriters
+InClass
+    Foam::foamFileWriters
 
 Description
 
diff --git a/src/sampling/sampledSurface/writers/null/nullWriters.H b/src/sampling/sampledSurface/writers/null/nullWriters.H
index ebf4d63a5b..a12d33fc59 100644
--- a/src/sampling/sampledSurface/writers/null/nullWriters.H
+++ b/src/sampling/sampledSurface/writers/null/nullWriters.H
@@ -22,8 +22,8 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    nullWriters
+InClass
+    Foam::nullWriters
 
 Description
 
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriters.H b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriters.H
index af54c85c78..e3e76fef57 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriters.H
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriters.H
@@ -22,8 +22,8 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    rawSurfaceWriters
+InClass
+    Foam::rawSurfaceWriters
 
 Description
 
diff --git a/src/sampling/sampledSurface/writers/stl/stlWriters.H b/src/sampling/sampledSurface/writers/stl/stlWriters.H
index 15d1f77802..735587ef8b 100644
--- a/src/sampling/sampledSurface/writers/stl/stlWriters.H
+++ b/src/sampling/sampledSurface/writers/stl/stlWriters.H
@@ -22,8 +22,8 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    stlWriters
+InClass
+    Foam::stlWriters
 
 Description
 
diff --git a/src/sampling/sampledSurface/writers/surfaceWriters.H b/src/sampling/sampledSurface/writers/surfaceWriters.H
index 0d3d72c058..4640c1c4bf 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriters.H
+++ b/src/sampling/sampledSurface/writers/surfaceWriters.H
@@ -22,8 +22,8 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    surfaceWriter
+InClass
+    Foam::surfaceWriters
 
 Description
 
diff --git a/src/sampling/sampledSurface/writers/vtk/vtkWriters.H b/src/sampling/sampledSurface/writers/vtk/vtkWriters.H
index 9ec1f75c20..1e8e0cea19 100644
--- a/src/sampling/sampledSurface/writers/vtk/vtkWriters.H
+++ b/src/sampling/sampledSurface/writers/vtk/vtkWriters.H
@@ -22,8 +22,8 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    vtkWriters
+InClass
+    Foam::vtkWriters
 
 Description
 
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
index 87110a662a..adcdb08ec0 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
@@ -22,10 +22,18 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
+Namespace
+    Foam::compressibilityModels
+
+Description
+    Namespace for compressibility models.
+
+
 Class
     Foam::barotropicCompressibilityModel
 
 Description
+    Abstract class for barotropic compressibility models
 
 SourceFiles
     barotropicCompressibilityModel.C
diff --git a/src/triSurface/triSurfaceFields/triSurfaceFields.H b/src/triSurface/triSurfaceFields/triSurfaceFields.H
index 82af3c7984..55e69f593e 100644
--- a/src/triSurface/triSurfaceFields/triSurfaceFields.H
+++ b/src/triSurface/triSurfaceFields/triSurfaceFields.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
+InClass
     Foam::triSurfaceFields
 
 Description

From c6dedaff331157713ab915a29e5ab2cbd7d5ad19 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 6 Jun 2008 13:59:24 +0200
Subject: [PATCH 18/19] remove references to src/other in bin/ and .gitignore

---
 .gitignore             | 6 +-----
 bin/foamDiffSourceList | 4 ----
 bin/foamPack           | 4 ----
 bin/foamPackBin        | 1 -
 bin/foamPackChanged    | 4 ----
 bin/foamPackSource     | 4 ----
 6 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf6e6444d2..e12007df5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,13 +38,9 @@ doc/[Dd]oxygen/latex
 doc/[Dd]oxygen/man
 
 # source packages - anywhere
+*.tar.bz2
 *.tar.gz
 *.tgz
 
-# specific locations
-applications/utilities/preProcessing/FoamX/Java/Make/classes
-
-# other 3rd party sources
-src/other
 
 # end-of-file
diff --git a/bin/foamDiffSourceList b/bin/foamDiffSourceList
index a517fdc033..d4f340894d 100755
--- a/bin/foamDiffSourceList
+++ b/bin/foamDiffSourceList
@@ -85,10 +85,6 @@ find -H $newDir                \
 | sed                          \
  -e "\@$newDir/.git/@d"        \
  -e "\@$newDir/lib/@d"         \
- -e "\@$newDir/src/other/mpich-*/platforms@d" \
- -e "\@$newDir/src/other/mpich-*/lib@d"       \
- -e "\@$newDir/src/other/lam-*/platforms@d"   \
- -e "\@$newDir/src/other/openmpi-*/platforms@d"   \
  -e '\@applications/bin/@d'      \
  -e '\@/t/@d'                    \
  -e '\@Make[.A-Za-z]*/[^/]*/@d'  \
diff --git a/bin/foamPack b/bin/foamPack
index ee2dfaf630..40b7821ab2 100755
--- a/bin/foamPack
+++ b/bin/foamPack
@@ -87,10 +87,6 @@ find -H $packDir               \
 | sed                          \
  -e "\@$packDir/.git/@d"       \
  -e "\@$packDir/lib/@d"        \
- -e "\@$packDir/src/other/mpich-*/platforms@d" \
- -e "\@$packDir/src/other/mpich-*/lib@d"       \
- -e "\@$packDir/src/other/lam-*/platforms@d"   \
- -e "\@$packDir/src/other/openmpi-*/platforms@d"   \
  -e '\@applications/bin/@d'       \
  -e '\@/t/@d'                     \
  -e '\@Make[.A-Za-z]*/[^/]*/@d'   \
diff --git a/bin/foamPackBin b/bin/foamPackBin
index f597a30dcd..68258adab2 100755
--- a/bin/foamPackBin
+++ b/bin/foamPackBin
@@ -73,7 +73,6 @@ dirList=$(
       $packDir/lib/$arch \
       $packDir/applications/bin/$arch \
       $packDir/wmake/rules \
-      $packDir/src/other/{mpich,lam,openmpi}-*/platforms/$arch \
       ;
    do
       [ -d $dir ] && echo $dir
diff --git a/bin/foamPackChanged b/bin/foamPackChanged
index 0fa188d34a..3a96ec563f 100755
--- a/bin/foamPackChanged
+++ b/bin/foamPackChanged
@@ -61,10 +61,6 @@ find -H $packDir               \
     -name "*.orig"             \
 | sed                          \
  -e "\@$packDir/lib/@d"        \
- -e "\@$packDir/src/other/mpich-*/platforms@d" \
- -e "\@$packDir/src/other/mpich-*/lib@d"       \
- -e "\@$packDir/src/other/lam-*/platforms@d"   \
- -e "\@$packDir/src/other/openmpi-*/platforms@d"   \
  -e '\@applications/bin/@d'      \
  -e '\@/t/@d'                    \
  -e '\@Make[.A-Za-z]*/[^/]*/@d'  \
diff --git a/bin/foamPackSource b/bin/foamPackSource
index 46c2fee474..2033e400c4 100755
--- a/bin/foamPackSource
+++ b/bin/foamPackSource
@@ -76,10 +76,6 @@ find -H $packDir               \
 | sed                          \
  -e "\@$packDir/.git/@d"       \
  -e "\@$packDir/lib/@d"        \
- -e "\@$packDir/src/other/mpich-*/platforms@d" \
- -e "\@$packDir/src/other/mpich-*/lib@d"       \
- -e "\@$packDir/src/other/lam-*/platforms@d"   \
- -e "\@$packDir/src/other/openmpi-*/platforms@d"   \
  -e '\@applications/bin/@d'       \
  -e '\@/t/@d'                     \
  -e '\@Make[.A-Za-z]*/[^/]*/@d'   \

From 11db15e82ce2e2a0cf6d511f64e49eb08870228e Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 6 Jun 2008 16:39:37 +0100
Subject: [PATCH 19/19] re-labelling read sets/zones

---
 .../graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
index 8ba3a93d30..2ade90c00f 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
@@ -63,7 +63,7 @@
 
 <!-- Include sets check box -->
         <IntVectorProperty
-            name="IncludeSets / Zones"
+            name="IncludeSets"
             command="SetIncludeSets"
             number_of_elements="1"
             default_values="0">