From 7bcd0d5bcec9be5cd7783855a4b99b8e1e37037e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 26 Mar 2009 18:14:00 +0000
Subject: [PATCH 01/11] no calculation at startup

---
 .../radiation/radiationModel/radiationModel/radiationModel.C    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
index 92c6397fb5..2aaa7d7e67 100644
--- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
@@ -128,7 +128,7 @@ void Foam::radiation::radiationModel::correct()
         return;
     }
 
-    if ((time_.timeIndex() == 0) || (time_.timeIndex() % solverFreq_ == 0))
+    if (time_.timeIndex() % solverFreq_ == 0)
     {
         calculate();
     }

From fc09d219affe2ff72935005f0f93d962ea0f7509 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 26 Mar 2009 22:32:10 +0000
Subject: [PATCH 02/11] indentation

---
 applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index 3c257d249d..8d97ad9048 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -59,7 +59,8 @@
 
     rho = thermo->rho();
     rho.relax();
-    Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
+    Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value()
+        << endl;
 
     pd == p - (rho*gh + pRef);
 }

From bf19a3c70793cc071b04590d7608518f51978688 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Mon, 30 Mar 2009 11:05:59 +0100
Subject: [PATCH 03/11] synchronisation at start of loop

---
 .../meshRefinement/meshRefinementBaffles.C    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index c5941aeadc..e154576ad9 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -1212,6 +1212,17 @@ void Foam::meshRefinement::findCellZoneTopo
     // by changing cell zone every time we cross a surface.
     while (true)
     {
+        // Synchronise regionToCellZone.
+        // Note:
+        // - region numbers are identical on all processors
+        // - keepRegion is identical ,,
+        // - cellZones are identical ,,
+        // This done at top of loop to account for geometric matching
+        // not being synchronised.
+        Pstream::listCombineGather(regionToCellZone, maxEqOp<label>());
+        Pstream::listCombineScatter(regionToCellZone);
+
+
         bool changed = false;
 
         // Internal faces
@@ -1292,14 +1303,6 @@ void Foam::meshRefinement::findCellZoneTopo
         {
             break;
         }
-
-        // Synchronise regionToCellZone.
-        // Note:
-        // - region numbers are identical on all processors
-        // - keepRegion is identical ,,
-        // - cellZones are identical ,,
-        Pstream::listCombineGather(regionToCellZone, maxEqOp<label>());
-        Pstream::listCombineScatter(regionToCellZone);
     }
 
 

From 103b37d5e11e6e87a39fb31dca69cd317154670d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Wed, 1 Apr 2009 10:33:50 +0100
Subject: [PATCH 04/11] unmapped particle did not get cellID set

---
 .../utilities/preProcessing/mapFields/mapLagrangian.C       | 1 +
 src/lagrangian/basic/Particle/Particle.H                    | 3 +++
 src/lagrangian/basic/Particle/ParticleI.H                   | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/applications/utilities/preProcessing/mapFields/mapLagrangian.C b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
index 9d04dcfbec..d3f35d02a3 100644
--- a/applications/utilities/preProcessing/mapFields/mapLagrangian.C
+++ b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
@@ -223,6 +223,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
                         {
                             unmappedSource.erase(sourceParticleI);
                             addParticles.append(sourceParticleI);
+			    iter().cell()=targetCell;
                             targetParcels.addParticle
                             (
                                 sourceParcels.remove(&iter())
diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H
index 664eca0463..75a0b04174 100644
--- a/src/lagrangian/basic/Particle/Particle.H
+++ b/src/lagrangian/basic/Particle/Particle.H
@@ -329,6 +329,9 @@ public:
             //- Return current particle position
             inline vector& position();
 
+            //- Return current cell particle is in
+            inline label& cell();
+
             //- Return current cell particle is in
             inline label cell() const;
 
diff --git a/src/lagrangian/basic/Particle/ParticleI.H b/src/lagrangian/basic/Particle/ParticleI.H
index 5751ca56cd..075d96705d 100644
--- a/src/lagrangian/basic/Particle/ParticleI.H
+++ b/src/lagrangian/basic/Particle/ParticleI.H
@@ -303,6 +303,12 @@ inline label Particle<ParticleType>::cell() const
     return celli_;
 }
 
+template<class ParticleType>
+inline label& Particle<ParticleType>::cell()
+{
+    return celli_;
+}
+
 
 template<class ParticleType>
 inline label Particle<ParticleType>::face() const

From afd820ddd1aa7539fd1c276a0510c2925d689a6b Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 1 Apr 2009 17:02:52 +0100
Subject: [PATCH 05/11] Reintroduced WM_OS because the build system currently
 uses it.

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

diff --git a/etc/bashrc b/etc/bashrc
index ce10b39e78..3b001711bc 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -77,6 +77,12 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
 export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
 
 
+# Operating System/Platform
+# ~~~~~~~~~~~~~~~~~~~~~~~~~
+# WM_OS = Unix | ????
+: ${WM_OS:=Unix}; export WM_OS
+
+
 # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 : ${WM_COMPILER:=Gcc}; export WM_COMPILER
diff --git a/etc/cshrc b/etc/cshrc
index a46cf3ee47..034a5bfbfa 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -71,6 +71,12 @@ setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
 setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
 
 
+# Operating System/Platform
+# ~~~~~~~~~~~~~~~~~~~~~~~~~
+# WM_OS = Unix | ????
+if ( ! $?WM_OS ) setenv WM_OS Unix
+
+
 # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc

From 918b7051c0b07e5447bdd23cf76c231521e21c76 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 2 Apr 2009 10:52:40 +0100
Subject: [PATCH 06/11] updates

---
 .../radiation/radiationConstants/radiationConstants.H       | 6 ++++++
 .../radiation/radiationModel/fvDOM/fvDOM/fvDOM.C            | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/thermophysicalModels/radiation/radiationConstants/radiationConstants.H b/src/thermophysicalModels/radiation/radiationConstants/radiationConstants.H
index 9ec85039a2..2e7e5602e8 100644
--- a/src/thermophysicalModels/radiation/radiationConstants/radiationConstants.H
+++ b/src/thermophysicalModels/radiation/radiationConstants/radiationConstants.H
@@ -30,6 +30,9 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
+#ifndef radiationConstants_H
+#define radiationConstants_H
+
 #include "dimensionedScalar.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -43,5 +46,8 @@ namespace radiation
 }
 }
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
index 6d07cc3bea..f548d0046a 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
@@ -265,10 +265,10 @@ bool Foam::radiation::fvDOM::read()
 {
     if (radiationModel::read())
     {
-        // nothing to read
+//      Only reading solution parameters - not changing ray geometry
 
-//        coeffs_.lookup("nTheta") >> nTheta_;
-//        coeffs_.lookup("nPhi") >> nPhi_;
+        coeffs_.readIfPresent("convergence", convergence_);
+        coeffs_.readIfPresent("maxIter", maxIter_);
 
         return true;
     }

From 9c95fd034bc11d7e9aa1e3443664dcef8f8c25f6 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 2 Apr 2009 12:26:41 +0100
Subject: [PATCH 07/11] Added initial support for LinuxPPC.

---
 etc/bashrc                              | 13 +++++++++++++
 etc/cshrc                               | 18 ++++++++++++++++++
 wmake/rules/linuxPPC64Gcc/X             |  3 +++
 wmake/rules/linuxPPC64Gcc/c             | 16 ++++++++++++++++
 wmake/rules/linuxPPC64Gcc/c++           | 21 +++++++++++++++++++++
 wmake/rules/linuxPPC64Gcc/c++Debug      |  2 ++
 wmake/rules/linuxPPC64Gcc/c++Opt        |  2 ++
 wmake/rules/linuxPPC64Gcc/c++Prof       |  2 ++
 wmake/rules/linuxPPC64Gcc/cDebug        |  2 ++
 wmake/rules/linuxPPC64Gcc/cOpt          |  2 ++
 wmake/rules/linuxPPC64Gcc/cProf         |  2 ++
 wmake/rules/linuxPPC64Gcc/general       | 11 +++++++++++
 wmake/rules/linuxPPC64Gcc/mplib         |  3 +++
 wmake/rules/linuxPPC64Gcc/mplibGAMMA    |  3 +++
 wmake/rules/linuxPPC64Gcc/mplibHPMPI    |  3 +++
 wmake/rules/linuxPPC64Gcc/mplibLAM      |  3 +++
 wmake/rules/linuxPPC64Gcc/mplibMPICH    |  3 +++
 wmake/rules/linuxPPC64Gcc/mplibMPICH-GM |  3 +++
 wmake/rules/linuxPPC64Gcc/mplibOPENMPI  |  3 +++
 wmake/rules/linuxPPC64Gcc/mplibQSMPI    |  4 ++++
 20 files changed, 119 insertions(+)
 create mode 100644 wmake/rules/linuxPPC64Gcc/X
 create mode 100644 wmake/rules/linuxPPC64Gcc/c
 create mode 100644 wmake/rules/linuxPPC64Gcc/c++
 create mode 100644 wmake/rules/linuxPPC64Gcc/c++Debug
 create mode 100644 wmake/rules/linuxPPC64Gcc/c++Opt
 create mode 100644 wmake/rules/linuxPPC64Gcc/c++Prof
 create mode 100644 wmake/rules/linuxPPC64Gcc/cDebug
 create mode 100644 wmake/rules/linuxPPC64Gcc/cOpt
 create mode 100644 wmake/rules/linuxPPC64Gcc/cProf
 create mode 100644 wmake/rules/linuxPPC64Gcc/general
 create mode 100644 wmake/rules/linuxPPC64Gcc/mplib
 create mode 100644 wmake/rules/linuxPPC64Gcc/mplibGAMMA
 create mode 100644 wmake/rules/linuxPPC64Gcc/mplibHPMPI
 create mode 100644 wmake/rules/linuxPPC64Gcc/mplibLAM
 create mode 100644 wmake/rules/linuxPPC64Gcc/mplibMPICH
 create mode 100644 wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
 create mode 100644 wmake/rules/linuxPPC64Gcc/mplibOPENMPI
 create mode 100644 wmake/rules/linuxPPC64Gcc/mplibQSMPI

diff --git a/etc/bashrc b/etc/bashrc
index 3b001711bc..26dc8c2dfc 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -152,10 +152,12 @@ Linux)
             ;;
         esac
         ;;
+
     ia64)
         WM_ARCH=linuxIA64
         export WM_COMPILER=I64
         ;;
+
     mips64)
         WM_ARCH=SiCortex64
         export WM_COMPILER_LIB_ARCH=64
@@ -166,6 +168,17 @@ Linux)
         export WM_LDFLAGS='-mabi=64 -G0'
         export WM_MPLIB=MPI
         ;;
+
+    ppc64)
+        WM_ARCH=linuxPPC64
+        export WM_COMPILER_LIB_ARCH=64
+        export WM_CC='gcc'
+        export WM_CXX='g++'
+        export WM_CFLAGS='-m64 -fPIC'
+        export WM_CXXFLAGS='-m64 -fPIC'
+        export WM_LDFLAGS='-m64'
+        ;;
+
     *)
         echo Unknown processor type `uname -m` for Linux
         ;;
diff --git a/etc/cshrc b/etc/cshrc
index 034a5bfbfa..f4147422f9 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -120,6 +120,7 @@ case Linux:
     switch (`uname -m`)
     case i686:
         breaksw
+
     case x86_64:
         switch ($WM_ARCH_OPTION)
         case 32:
@@ -131,6 +132,7 @@ case Linux:
             setenv WM_CXXFLAGS '-m32 -fPIC'
             setenv WM_LDFLAGS '-m32'
             breaksw
+
         case 64:
             setenv WM_ARCH linux64
             setenv WM_COMPILER_LIB_ARCH 64
@@ -140,15 +142,19 @@ case Linux:
             setenv WM_CXXFLAGS '-m64 -fPIC'
             setenv WM_LDFLAGS '-m64'
             breaksw
+
         default:
             echo Unknown WM_ARCH_OPTION $WM_ARCH_OPTION, should be 32 or 64
             breaksw
+
         endsw
         breaksw
+
     case ia64:
         setenv WM_ARCH linuxIA64
         setenv WM_COMPILER I64
         breaksw
+
     case mips64:
         setenv WM_ARCH SiCortex64
         setenv WM_COMPILER_LIB_ARCH 64
@@ -159,9 +165,21 @@ case Linux:
         setenv WM_LDFLAGS '-mabi=64 -G0'
         setenv WM_MPLIB MPI
         breaksw
+
+    case ppc64:
+        setenv WM_ARCH linuxPPC64
+        setenv WM_COMPILER_LIB_ARCH 64
+        setenv WM_CC 'gcc'
+        setenv WM_CXX 'g++'
+        setenv WM_CFLAGS '-m64 -fPIC'
+        setenv WM_CXXFLAGS '-m64 -fPIC'
+        setenv WM_LDFLAGS '-m64'
+        breaksw
+
     default:
         echo Unknown processor type `uname -m` for Linux
         breaksw
+
     endsw
     breaksw
 
diff --git a/wmake/rules/linuxPPC64Gcc/X b/wmake/rules/linuxPPC64Gcc/X
new file mode 100644
index 0000000000..5d1f9c5cc5
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/X
@@ -0,0 +1,3 @@
+XFLAGS     =
+XINC       = $(XFLAGS) -I/usr/X11R6/include
+XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11
diff --git a/wmake/rules/linuxPPC64Gcc/c b/wmake/rules/linuxPPC64Gcc/c
new file mode 100644
index 0000000000..6c0a9e3b49
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/c
@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = gcc -m64 -mcpu=power5+
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++
new file mode 100644
index 0000000000..7590b089a3
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/c++
@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = g++ -m64 -mcpu=power5+
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-40
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS)
diff --git a/wmake/rules/linuxPPC64Gcc/c++Debug b/wmake/rules/linuxPPC64Gcc/c++Debug
new file mode 100644
index 0000000000..19bdb9c334
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxPPC64Gcc/c++Opt b/wmake/rules/linuxPPC64Gcc/c++Opt
new file mode 100644
index 0000000000..2aedabd628
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/c++Opt
@@ -0,0 +1,2 @@
+c++DBUG     =
+c++OPT      = -O3
diff --git a/wmake/rules/linuxPPC64Gcc/c++Prof b/wmake/rules/linuxPPC64Gcc/c++Prof
new file mode 100644
index 0000000000..3bda4dad55
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linuxPPC64Gcc/cDebug b/wmake/rules/linuxPPC64Gcc/cDebug
new file mode 100644
index 0000000000..72b638f458
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linuxPPC64Gcc/cOpt b/wmake/rules/linuxPPC64Gcc/cOpt
new file mode 100644
index 0000000000..e6512b7aab
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/cOpt
@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3 -fno-gcse
diff --git a/wmake/rules/linuxPPC64Gcc/cProf b/wmake/rules/linuxPPC64Gcc/cProf
new file mode 100644
index 0000000000..ca3ac9bf5f
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general
new file mode 100644
index 0000000000..2626ab65d1
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/general
@@ -0,0 +1,11 @@
+CPP        = /lib/cpp $(GFLAGS)
+LD         = ld -m elf64ppc
+
+PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/X
+include $(RULES)/c
+include $(RULES)/c++
+include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linuxPPC64Gcc/mplib b/wmake/rules/linuxPPC64Gcc/mplib
new file mode 100644
index 0000000000..8a84b40146
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplib
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = 
+PLIBS      = 
diff --git a/wmake/rules/linuxPPC64Gcc/mplibGAMMA b/wmake/rules/linuxPPC64Gcc/mplibGAMMA
new file mode 100644
index 0000000000..d62c6250ff
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibGAMMA
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxPPC64Gcc/mplibHPMPI b/wmake/rules/linuxPPC64Gcc/mplibHPMPI
new file mode 100644
index 0000000000..574492a236
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibHPMPI
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
diff --git a/wmake/rules/linuxPPC64Gcc/mplibLAM b/wmake/rules/linuxPPC64Gcc/mplibLAM
new file mode 100644
index 0000000000..6762b843c1
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibLAM
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH b/wmake/rules/linuxPPC64Gcc/mplibMPICH
new file mode 100644
index 0000000000..ac17f7c1d2
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibMPICH
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
new file mode 100644
index 0000000000..88493ebc70
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI
new file mode 100644
index 0000000000..834d2d3e22
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI
@@ -0,0 +1,3 @@
+PFLAGS     = -DOMPI_SKIP_MPICXX
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxPPC64Gcc/mplibQSMPI b/wmake/rules/linuxPPC64Gcc/mplibQSMPI
new file mode 100644
index 0000000000..95ea327379
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibQSMPI
@@ -0,0 +1,4 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
+

From cbd181fa90cde2c2d5c3d4cff3fecf9c96de49d3 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 2 Apr 2009 13:11:14 +0100
Subject: [PATCH 08/11] do not strip non-existent dirs

---
 bin/foamCleanPath | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/bin/foamCleanPath b/bin/foamCleanPath
index 5eb203f553..dca96f490e 100755
--- a/bin/foamCleanPath
+++ b/bin/foamCleanPath
@@ -27,12 +27,12 @@
 #     foamCleanPath
 #
 # Description
-#     Usage: foamCleanPath path [wildcard] .. [wildcard]
+#     Usage: foamCleanPath [-strip] path [wildcard] .. [wildcard]
 #
 #     Prints its argument (which should be a ':' separated path)
 #     without all
 #         - duplicate elements
-#         - non-accessible directories
+#         - (if '-strip') non-accessible directories
 #         - elements whose start matches a wildcard
 #
 #     Note:
@@ -42,16 +42,25 @@
 if [ "$#" -lt 1 -o "$1" = "-h" -o "$1" = "-help" ]
 then
    cat <<USAGE 1>&2
-Usage: ${0##*/} path [wildcard] .. [wildcard]
+Usage: ${0##*/} [-strip] path [wildcard] .. [wildcard]
 
     Prints its argument (which should be a ':' separated list) cleansed from
       - duplicate elements
-      - non-accessible directories
       - elements whose start matches one of the wildcard(s)
+      - (if '-strip') non-accessible directories
 USAGE
    exit 1
 fi
 
+
+strip=''
+if [ "$1" = "-strip" ]
+then
+    strip=true
+    shift
+fi
+
+
 dirList="$1"
 shift
 
@@ -94,6 +103,10 @@ do
         then
             dirList="$dirList $dir"
         fi
+    elif [ "$strip" != "true" ]
+    then
+        # Print non-existing directories if not in 'strip' mode.
+        dirList="$dirList $dir"
     fi
 done
 

From bfb8d042fd28b73210b0b6479d727d6e133bc8fa Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 2 Apr 2009 13:29:28 +0100
Subject: [PATCH 09/11] split of decompositionAgglomeration

---
 .../utilities/mesh/generation/snappyHexMesh/Make/options   | 3 +--
 .../utilities/mesh/manipulation/renumberMesh/Make/options  | 2 +-
 .../utilities/parallelProcessing/decomposePar/Make/options | 2 +-
 .../parallelProcessing/redistributeMeshPar/Make/options    | 2 +-
 src/Allwmake                                               | 5 ++++-
 src/autoMesh/Make/options                                  | 2 +-
 .../Allwmake                                               | 2 --
 .../decompositionMethods/Make/files                        | 0
 .../decompositionMethods/Make/options                      | 0
 .../decompositionMethod/decompositionMethod.C              | 0
 .../decompositionMethod/decompositionMethod.H              | 0
 .../decompositionMethods/geomDecomp/geomDecomp.C           | 0
 .../decompositionMethods/geomDecomp/geomDecomp.H           | 0
 .../hierarchGeomDecomp/hierarchGeomDecomp.C                | 0
 .../hierarchGeomDecomp/hierarchGeomDecomp.H                | 0
 .../decompositionMethods/manualDecomp/manualDecomp.C       | 0
 .../decompositionMethods/manualDecomp/manualDecomp.H       | 0
 .../decompositionMethods/metisDecomp/metisDecomp.C         | 0
 .../decompositionMethods/metisDecomp/metisDecomp.H         | 0
 .../simpleGeomDecomp/simpleGeomDecomp.C                    | 0
 .../simpleGeomDecomp/simpleGeomDecomp.H                    | 0
 .../parMetisDecomp/Make/files                              | 0
 .../parMetisDecomp/Make/options                            | 0
 .../parMetisDecomp/parMetisDecomp.C                        | 0
 .../parMetisDecomp/parMetisDecomp.H                        | 0
 .../parMetisDecomp/parMetisDecompTemplates.C               | 0
 src/fvAgglomerationMethods/Allwmake                        | 7 +++++++
 .../MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C    | 0
 .../MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C  | 0
 .../MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H  | 0
 .../MGridGenGamgAgglomeration/Make/files                   | 0
 .../MGridGenGamgAgglomeration/Make/options                 | 0
 src/meshTools/Make/options                                 | 2 +-
 33 files changed, 17 insertions(+), 10 deletions(-)
 rename src/{decompositionAgglomeration => decompositionMethods}/Allwmake (88%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/Make/files (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/Make/options (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/decompositionMethod/decompositionMethod.C (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/decompositionMethod/decompositionMethod.H (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/geomDecomp/geomDecomp.C (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/geomDecomp/geomDecomp.H (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/manualDecomp/manualDecomp.C (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/manualDecomp/manualDecomp.H (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/metisDecomp/metisDecomp.C (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/metisDecomp/metisDecomp.H (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/parMetisDecomp/Make/files (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/parMetisDecomp/Make/options (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/parMetisDecomp/parMetisDecomp.C (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/parMetisDecomp/parMetisDecomp.H (100%)
 rename src/{decompositionAgglomeration => decompositionMethods}/parMetisDecomp/parMetisDecompTemplates.C (100%)
 create mode 100755 src/fvAgglomerationMethods/Allwmake
 rename src/{decompositionAgglomeration => fvAgglomerationMethods}/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C (100%)
 rename src/{decompositionAgglomeration => fvAgglomerationMethods}/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C (100%)
 rename src/{decompositionAgglomeration => fvAgglomerationMethods}/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H (100%)
 rename src/{decompositionAgglomeration => fvAgglomerationMethods}/MGridGenGamgAgglomeration/Make/files (100%)
 rename src/{decompositionAgglomeration => fvAgglomerationMethods}/MGridGenGamgAgglomeration/Make/options (100%)

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index d9eb36aa34..1c74c3aff5 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
     /* -g -DFULLDEBUG -O0 */ \
-    -I$(LIB_SRC)/decompositionAgglomeration/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/autoMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
@@ -9,7 +9,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -L$(FOAM_MPI_LIBBIN) -lparMetisDecompositionMethod \
     -lfiniteVolume \
     -ldecompositionMethods \
     -lmeshTools \
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
index 2dcae6b386..8a7e5d1674 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/decompositionAgglomeration/decompositionMethods/lnInclude
+    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options
index 706b6dc58f..4b1adfd7ba 100644
--- a/applications/utilities/parallelProcessing/decomposePar/Make/options
+++ b/applications/utilities/parallelProcessing/decomposePar/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/decompositionAgglomeration/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
index 7836a4fbf7..c0f7a08776 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/decompositionAgglomeration/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
diff --git a/src/Allwmake b/src/Allwmake
index f22e0729db..3168208c49 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -18,7 +18,8 @@ wmake libso triSurface
 wmake libso edgeMesh
 wmake libso surfMesh
 
-decompositionAgglomeration/Allwmake
+# Decomposition methods needed by meshTools
+decompositionMethods/Allwmake
 
 wmake libso meshTools
 wmake libso finiteVolume
@@ -44,4 +45,6 @@ conversion/Allwmake
 wmake libso autoMesh
 wmake libso errorEstimation
 
+fvAgglomerationMethods/Allwmake
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/autoMesh/Make/options b/src/autoMesh/Make/options
index 4589b7ac3f..f1687b7eb1 100644
--- a/src/autoMesh/Make/options
+++ b/src/autoMesh/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/decompositionAgglomeration/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
diff --git a/src/decompositionAgglomeration/Allwmake b/src/decompositionMethods/Allwmake
similarity index 88%
rename from src/decompositionAgglomeration/Allwmake
rename to src/decompositionMethods/Allwmake
index 3294fe48c3..f71ea71b86 100755
--- a/src/decompositionAgglomeration/Allwmake
+++ b/src/decompositionMethods/Allwmake
@@ -9,6 +9,4 @@ then
     (WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso parMetisDecomp)
 fi
 
-wmake libso MGridGenGamgAgglomeration
-
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/decompositionAgglomeration/decompositionMethods/Make/files b/src/decompositionMethods/decompositionMethods/Make/files
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/Make/files
rename to src/decompositionMethods/decompositionMethods/Make/files
diff --git a/src/decompositionAgglomeration/decompositionMethods/Make/options b/src/decompositionMethods/decompositionMethods/Make/options
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/Make/options
rename to src/decompositionMethods/decompositionMethods/Make/options
diff --git a/src/decompositionAgglomeration/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/decompositionMethod/decompositionMethod.C
rename to src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
diff --git a/src/decompositionAgglomeration/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/decompositionMethod/decompositionMethod.H
rename to src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H
diff --git a/src/decompositionAgglomeration/decompositionMethods/geomDecomp/geomDecomp.C b/src/decompositionMethods/decompositionMethods/geomDecomp/geomDecomp.C
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/geomDecomp/geomDecomp.C
rename to src/decompositionMethods/decompositionMethods/geomDecomp/geomDecomp.C
diff --git a/src/decompositionAgglomeration/decompositionMethods/geomDecomp/geomDecomp.H b/src/decompositionMethods/decompositionMethods/geomDecomp/geomDecomp.H
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/geomDecomp/geomDecomp.H
rename to src/decompositionMethods/decompositionMethods/geomDecomp/geomDecomp.H
diff --git a/src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
rename to src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
diff --git a/src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H b/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
rename to src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
diff --git a/src/decompositionAgglomeration/decompositionMethods/manualDecomp/manualDecomp.C b/src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.C
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/manualDecomp/manualDecomp.C
rename to src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.C
diff --git a/src/decompositionAgglomeration/decompositionMethods/manualDecomp/manualDecomp.H b/src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.H
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/manualDecomp/manualDecomp.H
rename to src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.H
diff --git a/src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.C b/src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.C
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.C
rename to src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.C
diff --git a/src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.H b/src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.H
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.H
rename to src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.H
diff --git a/src/decompositionAgglomeration/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C b/src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
rename to src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
diff --git a/src/decompositionAgglomeration/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H b/src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
similarity index 100%
rename from src/decompositionAgglomeration/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
rename to src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
diff --git a/src/decompositionAgglomeration/parMetisDecomp/Make/files b/src/decompositionMethods/parMetisDecomp/Make/files
similarity index 100%
rename from src/decompositionAgglomeration/parMetisDecomp/Make/files
rename to src/decompositionMethods/parMetisDecomp/Make/files
diff --git a/src/decompositionAgglomeration/parMetisDecomp/Make/options b/src/decompositionMethods/parMetisDecomp/Make/options
similarity index 100%
rename from src/decompositionAgglomeration/parMetisDecomp/Make/options
rename to src/decompositionMethods/parMetisDecomp/Make/options
diff --git a/src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C b/src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
similarity index 100%
rename from src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C
rename to src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
diff --git a/src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.H b/src/decompositionMethods/parMetisDecomp/parMetisDecomp.H
similarity index 100%
rename from src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.H
rename to src/decompositionMethods/parMetisDecomp/parMetisDecomp.H
diff --git a/src/decompositionAgglomeration/parMetisDecomp/parMetisDecompTemplates.C b/src/decompositionMethods/parMetisDecomp/parMetisDecompTemplates.C
similarity index 100%
rename from src/decompositionAgglomeration/parMetisDecomp/parMetisDecompTemplates.C
rename to src/decompositionMethods/parMetisDecomp/parMetisDecompTemplates.C
diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
new file mode 100755
index 0000000000..17118db818
--- /dev/null
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -0,0 +1,7 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake libso MGridGenGamgAgglomeration
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
rename to src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
rename to src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
rename to src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/files b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/files
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/files
rename to src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/files
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options
rename to src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options
index d550c78e4c..1d1560eb5a 100644
--- a/src/meshTools/Make/options
+++ b/src/meshTools/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
-    -I$(LIB_SRC)/decompositionAgglomeration/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 LIB_LIBS = \

From 70f3da7a3bb37212068d905e38453d34c4611b3e Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 2 Apr 2009 23:06:27 +0100
Subject: [PATCH 10/11] Making lib and bin directories is no longer needed
 following the change to foamCleanPath.

---
 etc/settings.csh | 23 -----------------------
 etc/settings.sh  | 26 +-------------------------
 2 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/etc/settings.csh b/etc/settings.csh
index d36a91ad5b..d0a1e99665 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -35,8 +35,6 @@
 alias _foamAddPath 'set path=(\!* $path)'
 # prefix to LD_LIBRARY_PATH
 alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
-# make directory if it doesn't already exist
-alias _foamMkDir 'if ( ! -d \!* ) mkdir -p \!*'
 
 # location of the jobControl directory
 setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
@@ -71,12 +69,6 @@ _foamAddPath $FOAM_USER_APPBIN
 _foamAddLib  $FOAM_LIBBIN
 _foamAddLib  $FOAM_USER_LIBBIN
 
-# create these directories if necessary:
-_foamMkDir $FOAM_LIBBIN
-_foamMkDir $FOAM_APPBIN
-_foamMkDir $FOAM_USER_LIBBIN
-_foamMkDir $FOAM_USER_APPBIN
-
 
 # Select compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -130,9 +122,6 @@ case OPENMPI:
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin
-    _foamMkDir   $MPI_ARCH_PATH/lib
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -147,9 +136,6 @@ case LAM:
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin
-    _foamMkDir   $MPI_ARCH_PATH/lib
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -163,9 +149,6 @@ case MPICH:
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin
-    _foamMkDir   $MPI_ARCH_PATH/lib
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -180,9 +163,6 @@ case MPICH-GM:
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
     _foamAddLib  $GM_LIB_PATH
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin
-    _foamMkDir   $MPI_ARCH_PATH/lib
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpich-gm
     breaksw
@@ -246,8 +226,6 @@ default:
 endsw
 
 _foamAddLib $FOAM_MPI_LIBBIN
-# before compiling, this directory may not exist:
-_foamMkDir  $FOAM_MPI_LIBBIN
 
 
 # Set the minimum MPI buffer size (used by all platforms except SGI MPI)
@@ -281,7 +259,6 @@ endif
 # ~~~~~~~~~~~~~~~~~~~~
 unalias _foamAddPath
 unalias _foamAddLib
-unalias _foamMkDir
 unset minBufferSize
 
 # -----------------------------------------------------------------------------
diff --git a/etc/settings.sh b/etc/settings.sh
index 046f624cde..14258eac67 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -52,17 +52,6 @@ _foamAddLib()
 }
 
 
-# make directories if they don't already exist
-_foamMkDir()
-{
-   while [ $# -ge 1 ]
-   do
-      [ -d $1 ] || mkdir -p $1
-      shift
-   done
-}
-
-
 # location of the jobControl directory
 export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl
 
@@ -94,9 +83,6 @@ export PATH=$WM_DIR:$WM_PROJECT_DIR/bin:$PATH
 _foamAddPath $FOAM_APPBIN $FOAM_USER_APPBIN
 _foamAddLib  $FOAM_LIBBIN $FOAM_USER_LIBBIN
 
-# create these directories if necessary:
-_foamMkDir $FOAM_LIBBIN $FOAM_USER_LIBBIN $FOAM_APPBIN $FOAM_USER_APPBIN
-
 
 # Compiler settings
 # ~~~~~~~~~~~~~~~~~
@@ -160,8 +146,6 @@ OPENMPI)
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin $MPI_ARCH_PATH/lib
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -176,8 +160,6 @@ LAM)
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin $MPI_ARCH_PATH/lib
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -191,8 +173,6 @@ MPICH)
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin $MPI_ARCH_PATH/lib
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -207,8 +187,6 @@ MPICH-GM)
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
     _foamAddLib  $GM_LIB_PATH
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin $MPI_ARCH_PATH/lib
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-gm
     ;;
@@ -274,8 +252,6 @@ QSMPI)
 esac
 
 _foamAddLib $FOAM_MPI_LIBBIN
-# before compiling, this directory may not exist:
-_foamMkDir  $FOAM_MPI_LIBBIN
 
 
 # Set the minimum MPI buffer size (used by all platforms except SGI MPI)
@@ -304,6 +280,6 @@ export MPI_BUFFER_SIZE
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset _foamAddPath _foamAddLib _foamMkDir minBufferSize
+unset _foamAddPath _foamAddLib minBufferSize
 
 # -----------------------------------------------------------------------------

From 394bcfd6a38d76711b627e1c6056461f61587b95 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 2 Apr 2009 23:06:58 +0100
Subject: [PATCH 11/11] Compile the .L file directly.

---
 src/thermophysicalModels/combustion/Make/files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/thermophysicalModels/combustion/Make/files b/src/thermophysicalModels/combustion/Make/files
index fb7defdcb6..70e985783d 100644
--- a/src/thermophysicalModels/combustion/Make/files
+++ b/src/thermophysicalModels/combustion/Make/files
@@ -13,7 +13,7 @@ reactingMixture     = $(mixtures)/reactingMixture
 $(chemistryReader)/chemistryReader.C
 $(foamChemistryReader)/foamChemistryReader.C
 $(chemkinReader)/chemkinReader.C
-$(chemkinReader)/chemkinLexer.C
+$(chemkinReader)/chemkinLexer.L
 
 $(combustionMixture)/combustionMixture.C
 $(reactingMixture)/reactingMixture.C