From 068e6779e43e249733bda73fd8dd6d3b29d0a9cc Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 15 Feb 2010 19:22:07 +0000
Subject: [PATCH 01/25] STYLE: Header clean-up for Thermo and Reacting Parcels

---
 .../parcels/Templates/ReactingParcel/ReactingParcel.H        | 5 -----
 .../parcels/Templates/ThermoParcel/ThermoParcel.H            | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 1c7ed466d2..986f420b95 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -39,11 +39,6 @@ SourceFiles
 #ifndef ReactingParcel_H
 #define ReactingParcel_H
 
-#include "IOstream.H"
-#include "autoPtr.H"
-#include "interpolationCellPoint.H"
-#include "contiguous.H"
-
 #include "ThermoParcel.H"
 #include "ReactingCloud.H"
 #include "reactingParcel.H"
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 4bcdc43707..7ef2e02016 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -40,11 +40,6 @@ SourceFiles
 #ifndef ThermoParcel_H
 #define ThermoParcel_H
 
-#include "IOstream.H"
-#include "autoPtr.H"
-#include "interpolationCellPoint.H"
-#include "contiguous.H"
-
 #include "KinematicParcel.H"
 #include "ThermoCloud.H"
 

From 0d1833a44e09d2de56f4869b6f1a97c2d1c70123 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 18 Feb 2010 16:16:08 +0000
Subject: [PATCH 02/25] Thermodynamics: Corrected the boundary condition for
 Cp.

---
 .../basic/psiThermo/ePsiThermo/ePsiThermo.C                    | 3 +--
 .../basic/psiThermo/hPsiThermo/hPsiThermo.C                    | 3 +--
 .../basic/psiThermo/hsPsiThermo/hsPsiThermo.C                  | 3 +--
 .../basic/rhoThermo/hRhoThermo/hRhoThermo.C                    | 3 +--
 .../basic/rhoThermo/hsRhoThermo/hsRhoThermo.C                  | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
index 789f35bed9..2d255977be 100644
--- a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
@@ -246,8 +246,7 @@ Foam::tmp<Foam::volScalarField> Foam::ePsiThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0),
-            this->T_.boundaryField().types()
+            dimensionSet(0, 2, -2, -1, 0)
         )
     );
 
diff --git a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
index ab85557cf4..11f1e1b2b6 100644
--- a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
@@ -244,8 +244,7 @@ Foam::tmp<Foam::volScalarField> Foam::hPsiThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0),
-            this->T_.boundaryField().types()
+            dimensionSet(0, 2, -2, -1, 0)
         )
     );
 
diff --git a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
index 2683e3f851..cb33763fd6 100644
--- a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
@@ -244,8 +244,7 @@ Foam::tmp<Foam::volScalarField> Foam::hsPsiThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0),
-            this->T_.boundaryField().types()
+            dimensionSet(0, 2, -2, -1, 0)
         )
     );
 
diff --git a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
index ce3486fa15..3aca91c124 100644
--- a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
@@ -243,8 +243,7 @@ Foam::tmp<Foam::volScalarField> Foam::hRhoThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0),
-            this->T_.boundaryField().types()
+            dimensionSet(0, 2, -2, -1, 0)
         )
     );
 
diff --git a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
index 1e5e118077..fe0a4aedc4 100644
--- a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
@@ -243,8 +243,7 @@ Foam::tmp<Foam::volScalarField> Foam::hsRhoThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimEnergy/dimMass/dimTemperature,
-            this->T_.boundaryField().types()
+            dimEnergy/dimMass/dimTemperature
         )
     );
 

From c1e7fd9ef6e363c288a470bb42b55b5da75175ec Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 18 Feb 2010 16:16:37 +0000
Subject: [PATCH 03/25] multiRegionHeater tutorial: Changed to generate the
 split-mesh and fields at time 0 rather th an 0.001.

---
 .../multiRegionHeater/Allclean                | 21 +++++++++++++++++++
 .../multiRegionHeater/Allrun                  |  2 +-
 .../snappyMultiRegionHeater/Allclean          |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100755 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean

diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
new file mode 100755
index 0000000000..a76e8dff53
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+rm -rf VTK
+rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf 0/bottomAir
+rm -rf 0/topAir
+rm -rf 0/heater
+rm -rf 0/leftSolid
+rm -rf 0/rightSolid
+rm -f 0/cellToRegion
+rm -rf constant/bottomAir/polyMesh
+rm -rf constant/topAir/polyMesh
+rm -rf constant/heater/polyMesh
+rm -rf constant/leftSolid/polyMesh
+rm -rf constant/rightSolid/polyMesh
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index 56cc2a348c..231c46e6ec 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -11,7 +11,7 @@ runApplication setSet -batch makeCellSets.setSet
 rm -f constant/polyMesh/sets/*_old
 
 runApplication setsToZones -noFlipMap
-runApplication splitMeshRegions -cellZones
+runApplication splitMeshRegions -cellZones -overwrite
 
 # remove fluid fields from solid regions (important for post-processing)
 for i in heater leftSolid rightSolid
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
index 6771f180d8..a76e8dff53 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
@@ -11,6 +11,7 @@ rm -rf 0/topAir
 rm -rf 0/heater
 rm -rf 0/leftSolid
 rm -rf 0/rightSolid
+rm -f 0/cellToRegion
 rm -rf constant/bottomAir/polyMesh
 rm -rf constant/topAir/polyMesh
 rm -rf constant/heater/polyMesh

From 91532a8bcba60fc047e0241914cba0c2c64facea Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 19 Feb 2010 12:47:01 +0000
Subject: [PATCH 04/25] STYLE: removed unused variable.

---
 .../pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
index 20727c1752..e25244da12 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
@@ -57,7 +57,6 @@ void Foam::cyclicPointPatch::calcGeometry(PstreamBuffers&)
 {
     const edgeList& cp = cyclicPolyPatch_.coupledPoints();
     const labelList& mp = cyclicPolyPatch_.meshPoints();
-    const pointField& points = cyclicPolyPatch_.points();
 
     DynamicList<label> separated;
     forAll(cp, i)

From e794f35c86e0ca9a92df3e106f2a2c9ec1f3a561 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 19 Feb 2010 12:49:48 +0000
Subject: [PATCH 05/25] ENH: moved read index out of UIPstream into
 PstreamBuffers

So now we can read multiple times (using UIPstream) from PstreamBuffers
    PstreamBuffers pBufs
    UIPstream str1(procI, pBufs);
    str1>> ..
    UIPstream str2(procI, pBufs);
    str1>> ..
---
 src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C |  3 ++-
 src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H |  3 +++
 .../db/IOstreams/Pstreams/PstreamBuffers.C    | 21 +++++++++++++++++++
 .../db/IOstreams/Pstreams/PstreamBuffers.H    |  7 +++++++
 .../db/IOstreams/Pstreams/UIPstream.C         | 14 -------------
 .../db/IOstreams/Pstreams/UIPstream.H         |  8 ++-----
 src/Pstream/dummy/UIPread.C                   |  4 +++-
 src/Pstream/mpi/UIPread.C                     |  5 +++--
 src/Pstream/mpi/UOPwrite.C                    |  8 +++----
 9 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
index a970d6104c..8842768098 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
@@ -38,7 +38,8 @@ Foam::IPstream::IPstream
 )
 :
     Pstream(commsType, bufSize),
-    UIPstream(commsType, fromProcNo, buf_)
+    UIPstream(commsType, fromProcNo, buf_, externalBufPosition_),
+    externalBufPosition_(0)
 {}
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
index acc59de87b..201e1b7f1d 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
@@ -55,6 +55,9 @@ class IPstream
     public UIPstream
 {
 
+    //- Receive index
+    label externalBufPosition_;
+
 public:
 
     // Constructors
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index 41cb1c4f11..b2e4d8df06 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -51,10 +51,31 @@ Foam::PstreamBuffers::PstreamBuffers
     version_(version),
     sendBuf_(UPstream::nProcs()),
     recvBuf_(UPstream::nProcs()),
+    recvBufPos_(UPstream::nProcs(),  0),
     finishedSendsCalled_(false)
 {}
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::PstreamBuffers::~PstreamBuffers()
+{
+    // Check that all data has been consumed.
+    forAll(recvBufPos_, procI)
+    {
+        if (recvBufPos_[procI] < recvBuf_[procI].size())
+        {
+            FatalErrorIn("PstreamBuffers::~PstreamBuffers()")
+                << "Message from processor " << procI
+                << " not fully consumed. messageSize:" << recvBuf_[procI].size()
+                << " bytes of which only " << recvBufPos_[procI]
+                << " consumed."
+                << Foam::abort(FatalError);
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void Foam::PstreamBuffers::finishedSends(const bool block)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index 75f26f1d6a..c2dc745bea 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -106,6 +106,9 @@ class PstreamBuffers
         //- receive buffer
         List<DynamicList<char> > recvBuf_;
 
+        //- read position in recvBuf_
+        labelList recvBufPos_;
+
         bool finishedSendsCalled_;
 
     // Private member functions
@@ -129,6 +132,10 @@ public:
             IOstream::versionNumber version=IOstream::currentVersion
         );
 
+    // Destructor
+
+        ~PstreamBuffers();
+
 
     // Member functions
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C
index 4c38db6c69..f4c37633f3 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C
@@ -77,20 +77,6 @@ inline void Foam::UIPstream::readFromBuffer
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::UIPstream::~UIPstream()
-{
-    if (externalBufPosition_ < messageSize_)
-    {
-        FatalErrorIn("UIPstream::~UIPstream()")
-            << "Message not fully consumed. messageSize:" << messageSize_
-            << " bytes of which only " << externalBufPosition_
-            << " consumed." << Foam::abort(FatalError);
-    }
-}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::Istream& Foam::UIPstream::read(token& t)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
index aebef123b1..30e4e96119 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
@@ -63,7 +63,7 @@ class UIPstream
 
         DynamicList<char>& externalBuf_;
 
-        label externalBufPosition_;
+        label& externalBufPosition_;
 
         const int tag_;
 
@@ -94,6 +94,7 @@ public:
             const commsTypes commsType,
             const int fromProcNo,
             DynamicList<char>& externalBuf,
+            label& externalBufPosition,
             const int tag = UPstream::msgType(),
             streamFormat format=BINARY,
             versionNumber version=currentVersion
@@ -103,11 +104,6 @@ public:
         UIPstream(const int fromProcNo, PstreamBuffers&);
 
 
-    // Destructor
-
-        ~UIPstream();
-
-
     // Member functions
 
         // Inquiry
diff --git a/src/Pstream/dummy/UIPread.C b/src/Pstream/dummy/UIPread.C
index a91a007e43..da9613af37 100644
--- a/src/Pstream/dummy/UIPread.C
+++ b/src/Pstream/dummy/UIPread.C
@@ -36,6 +36,7 @@ Foam::UIPstream::UIPstream
     const commsTypes commsType,
     const int fromProcNo,
     DynamicList<char>& externalBuf,
+    label& externalBufPosition,
     const int tag,
     streamFormat format,
     versionNumber version
@@ -45,7 +46,7 @@ Foam::UIPstream::UIPstream
     Istream(format, version),
     fromProcNo_(fromProcNo),
     externalBuf_(externalBuf),
-    externalBufPosition_(0),
+    externalBufPosition_(externalBufPosition),
     tag_(tag),
     messageSize_(0)
 {
@@ -56,6 +57,7 @@ Foam::UIPstream::UIPstream
             "const commsTypes,"
             "const int fromProcNo,"
             "DynamicList<char>&,"
+            "label&,"
             "const int tag,"
             "streamFormat, versionNumber"
         ")"
diff --git a/src/Pstream/mpi/UIPread.C b/src/Pstream/mpi/UIPread.C
index fb6a9ec7d7..9a70f456b9 100644
--- a/src/Pstream/mpi/UIPread.C
+++ b/src/Pstream/mpi/UIPread.C
@@ -40,6 +40,7 @@ Foam::UIPstream::UIPstream
     const commsTypes commsType,
     const int fromProcNo,
     DynamicList<char>& externalBuf,
+    label& externalBufPosition,
     const int tag,
     streamFormat format,
     versionNumber version
@@ -49,7 +50,7 @@ Foam::UIPstream::UIPstream
     Istream(format, version),
     fromProcNo_(fromProcNo),
     externalBuf_(externalBuf),
-    externalBufPosition_(0),
+    externalBufPosition_(externalBufPosition),
     tag_(tag),
     messageSize_(0)
 {
@@ -122,7 +123,7 @@ Foam::UIPstream::UIPstream(const int fromProcNo, PstreamBuffers& buffers)
     Istream(buffers.format_, buffers.version_),
     fromProcNo_(fromProcNo),
     externalBuf_(buffers.recvBuf_[fromProcNo]),
-    externalBufPosition_(0),
+    externalBufPosition_(buffers.recvBufPos_[fromProcNo]),
     tag_(buffers.tag_),
     messageSize_(0)
 {
diff --git a/src/Pstream/mpi/UOPwrite.C b/src/Pstream/mpi/UOPwrite.C
index 9f8726d9a0..8d272fc0ca 100644
--- a/src/Pstream/mpi/UOPwrite.C
+++ b/src/Pstream/mpi/UOPwrite.C
@@ -45,7 +45,7 @@ bool Foam::UOPstream::write
 {
     if (debug)
     {
-        Pout<< "UIPstream::write : starting write to:" << toProcNo
+        Pout<< "UOPstream::write : starting write to:" << toProcNo
             << " tag:" << tag << " size:" << label(bufSize)
             << " commsType:" << UPstream::commsTypeNames[commsType]
             << Foam::endl;
@@ -67,7 +67,7 @@ bool Foam::UOPstream::write
 
         if (debug)
         {
-            Pout<< "UIPstream::write : finished write to:" << toProcNo
+            Pout<< "UOPstream::write : finished write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
                 << " commsType:" << UPstream::commsTypeNames[commsType]
                 << Foam::endl;
@@ -87,7 +87,7 @@ bool Foam::UOPstream::write
 
         if (debug)
         {
-            Pout<< "UIPstream::write : finished write to:" << toProcNo
+            Pout<< "UOPstream::write : finished write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
                 << " commsType:" << UPstream::commsTypeNames[commsType]
                 << Foam::endl;
@@ -110,7 +110,7 @@ bool Foam::UOPstream::write
 
         if (debug)
         {
-            Pout<< "UIPstream::write : started write to:" << toProcNo
+            Pout<< "UOPstream::write : started write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
                 << " commsType:" << UPstream::commsTypeNames[commsType]
                 << " request:" << PstreamGlobals::outstandingRequests_.size()

From 536e2fd41382d2c5a451f5c67f5f474f511c0ed3 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Wed, 24 Feb 2010 14:14:08 +0000
Subject: [PATCH 06/25] BUG: fvMotionSolver/pointPatchFields which store p0,
 the initial position of patch points.  Adding autoMap and rmap functions to
 correctly handle p0 on decomposition and reconstruction.

---
 ...llatingDisplacementPointPatchVectorField.C | 26 ++++++++++
 ...llatingDisplacementPointPatchVectorField.H | 16 +++++++
 ...OscillatingVelocityPointPatchVectorField.C | 26 ++++++++++
 ...OscillatingVelocityPointPatchVectorField.H | 16 +++++++
 ...oscillatingVelocityPointPatchVectorField.C | 26 ++++++++++
 ...oscillatingVelocityPointPatchVectorField.H | 16 +++++++
 ...gidBodyDisplacementPointPatchVectorField.C | 48 +++++++++++++++----
 ...gidBodyDisplacementPointPatchVectorField.H | 20 +++++++-
 8 files changed, 184 insertions(+), 10 deletions(-)

diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
index 1b6a9e6d5a..2a29097f9d 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
@@ -123,6 +123,32 @@ angularOscillatingDisplacementPointPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void angularOscillatingDisplacementPointPatchVectorField::autoMap
+(
+    const pointPatchFieldMapper& m
+)
+{
+    fixedValuePointPatchField<vector>::autoMap(m);
+
+    p0_.autoMap(m);
+}
+
+
+void angularOscillatingDisplacementPointPatchVectorField::rmap
+(
+    const pointPatchField<vector>& ptf,
+    const labelList& addr
+)
+{
+    const angularOscillatingDisplacementPointPatchVectorField& aODptf =
+        refCast<const angularOscillatingDisplacementPointPatchVectorField>(ptf);
+
+    fixedValuePointPatchField<vector>::rmap(aODptf, addr);
+
+    p0_.rmap(aODptf.p0_, addr);
+}
+
+
 void angularOscillatingDisplacementPointPatchVectorField::updateCoeffs()
 {
     if (this->updated())
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
index ed986cf2e0..6cb005940a 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
@@ -132,6 +132,22 @@ public:
 
     // Member functions
 
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const pointPatchFieldMapper&
+            );
+
+            //- Reverse map the given pointPatchField onto this pointPatchField
+            virtual void rmap
+            (
+                const pointPatchField<vector>&,
+                const labelList&
+            );
+
+
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
index 868cc70abb..aa84419f1f 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
@@ -123,6 +123,32 @@ angularOscillatingVelocityPointPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void angularOscillatingVelocityPointPatchVectorField::autoMap
+(
+    const pointPatchFieldMapper& m
+)
+{
+    fixedValuePointPatchField<vector>::autoMap(m);
+
+    p0_.autoMap(m);
+}
+
+
+void angularOscillatingVelocityPointPatchVectorField::rmap
+(
+    const pointPatchField<vector>& ptf,
+    const labelList& addr
+)
+{
+    const angularOscillatingVelocityPointPatchVectorField& aOVptf =
+        refCast<const angularOscillatingVelocityPointPatchVectorField>(ptf);
+
+    fixedValuePointPatchField<vector>::rmap(aOVptf, addr);
+
+    p0_.rmap(aOVptf.p0_, addr);
+}
+
+
 void angularOscillatingVelocityPointPatchVectorField::updateCoeffs()
 {
     if (this->updated())
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
index 6ca391228b..ff5a451563 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
@@ -132,6 +132,22 @@ public:
 
     // Member functions
 
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const pointPatchFieldMapper&
+            );
+
+            //- Reverse map the given pointPatchField onto this pointPatchField
+            virtual void rmap
+            (
+                const pointPatchField<vector>&,
+                const labelList&
+            );
+
+
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
index 412c9561a2..6b9d63630f 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
@@ -111,6 +111,32 @@ oscillatingVelocityPointPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void oscillatingVelocityPointPatchVectorField::autoMap
+(
+    const pointPatchFieldMapper& m
+)
+{
+    fixedValuePointPatchField<vector>::autoMap(m);
+
+    p0_.autoMap(m);
+}
+
+
+void oscillatingVelocityPointPatchVectorField::rmap
+(
+    const pointPatchField<vector>& ptf,
+    const labelList& addr
+)
+{
+    const oscillatingVelocityPointPatchVectorField& oVptf =
+        refCast<const oscillatingVelocityPointPatchVectorField>(ptf);
+
+    fixedValuePointPatchField<vector>::rmap(oVptf, addr);
+
+    p0_.rmap(oVptf.p0_, addr);
+}
+
+
 void oscillatingVelocityPointPatchVectorField::updateCoeffs()
 {
     if (this->updated())
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
index ec4892f621..b6f003540c 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
@@ -129,6 +129,22 @@ public:
 
     // Member functions
 
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const pointPatchFieldMapper&
+            );
+
+            //- Reverse map the given pointPatchField onto this pointPatchField
+            virtual void rmap
+            (
+                const pointPatchField<vector>&,
+                const labelList&
+            );
+
+
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
index d35eefd671..e8e9d4b628 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -48,7 +48,7 @@ uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
 :
     fixedValuePointPatchField<vector>(p, iF),
     motion_(),
-    p0_(p.localPoints()),
+    initialPoints_(p.localPoints()),
     rhoInf_(1.0)
 {}
 
@@ -70,13 +70,13 @@ uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
         updateCoeffs();
     }
 
-    if (dict.found("p0"))
+    if (dict.found("initialPoints"))
     {
-        p0_ = vectorField("p0", dict , p.size());
+        initialPoints_ = vectorField("initialPoints", dict , p.size());
     }
     else
     {
-        p0_ = p.localPoints();
+        initialPoints_ = p.localPoints();
     }
 }
 
@@ -92,7 +92,7 @@ uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
 :
     fixedValuePointPatchField<vector>(ptf, p, iF, mapper),
     motion_(ptf.motion_),
-    p0_(ptf.p0_, mapper),
+    initialPoints_(ptf.initialPoints_, mapper),
     rhoInf_(ptf.rhoInf_)
 {}
 
@@ -106,13 +106,42 @@ uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
 :
     fixedValuePointPatchField<vector>(ptf, iF),
     motion_(ptf.motion_),
-    p0_(ptf.p0_),
+    initialPoints_(ptf.initialPoints_),
     rhoInf_(ptf.rhoInf_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::autoMap
+(
+    const pointPatchFieldMapper& m
+)
+{
+    fixedValuePointPatchField<vector>::autoMap(m);
+
+    initialPoints_.autoMap(m);
+}
+
+
+void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::rmap
+(
+    const pointPatchField<vector>& ptf,
+    const labelList& addr
+)
+{
+    const uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField& uSDoFptf =
+    refCast
+    <
+        const uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
+    >(ptf);
+
+    fixedValuePointPatchField<vector>::rmap(uSDoFptf, addr);
+
+    initialPoints_.rmap(uSDoFptf.initialPoints_, addr);
+}
+
+
 void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
 {
     if (this->updated())
@@ -138,7 +167,10 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
     // Do not modify the accelerations, except with gravity, where available
     motion_.updateForce(gravity*motion_.mass(), vector::zero, t.deltaTValue());
 
-    Field<vector>::operator=(motion_.currentPosition(p0_) - p0_);
+    Field<vector>::operator=
+    (
+        motion_.currentPosition(initialPoints_) - initialPoints_
+    );
 
     fixedValuePointPatchField<vector>::updateCoeffs();
 }
@@ -153,7 +185,7 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::write
     motion_.write(os);
     os.writeKeyword("rhoInf")
         << rhoInf_ << token::END_STATEMENT << nl;
-    p0_.writeEntry("p0", os);
+    initialPoints_.writeEntry("initialPoints", os);
     writeEntry("value", os);
 }
 
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
index fb4177d104..a250601f3e 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
@@ -57,8 +57,8 @@ class uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
         //- Six dof motion object
         sixDoFRigidBodyMotion motion_;
 
-        //- Reference positions of points on the patch
-        pointField p0_;
+        //- Initial positions of points on the patch
+        pointField initialPoints_;
 
         //- Reference density required by the forces object for
         //  incompressible calculations.  Retained here to give
@@ -136,6 +136,22 @@ public:
 
     // Member functions
 
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const pointPatchFieldMapper&
+            );
+
+            //- Reverse map the given pointPatchField onto this pointPatchField
+            virtual void rmap
+            (
+                const pointPatchField<vector>&,
+                const labelList&
+            );
+
+
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field

From a3ae26c4727c169c7e476f223fff3dbe8ccd8312 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 25 Feb 2010 18:39:35 +0000
Subject: [PATCH 07/25] STYLE: added definition of strain rate to viscosity
 model header

---
 .../viscosityModel/viscosityModel.H              | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
index 7e6a00d5d7..b65266e8e4 100644
--- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
+++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
@@ -32,7 +32,12 @@ Class
     Foam::viscosityModel
 
 Description
-    An abstract base class for incompressible viscosityModels
+    An abstract base class for incompressible viscosityModels.
+
+    The strain rate is defined by:
+
+        mag(symm(grad(U)))
+
 
 SourceFiles
     viscosityModel.C
@@ -131,10 +136,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~viscosityModel()
-        {}
+    //- Destructor
+    virtual ~viscosityModel()
+    {}
 
 
     // Member Functions
@@ -145,7 +149,7 @@ public:
             return viscosityProperties_;
         }
 
-        //- Return the strain rate mag(grad(U))
+        //- Return the strain rate
         tmp<volScalarField> strainRate() const;
 
         //- Return the laminar viscosity

From 22ac629da5515f5b8101a43837c068ff3eb4d71b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 1 Mar 2010 14:49:47 +0000
Subject: [PATCH 08/25] BUG: Detect derived-from-wall boundary conditions

---
 .../incompressible/boundaryFoam/interrogateWallPatches.H        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
index 27ddd24544..10855d9cc6 100644
--- a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
+++ b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
@@ -11,7 +11,7 @@ forAll(patches, patchi)
 {
     const fvPatch& currPatch = patches[patchi];
 
-    if (isType<wallFvPatch>(currPatch))
+    if (isA<wallFvPatch>(currPatch))
     {
         const vectorField nf = currPatch.nf();
 

From 27634a044e06d3c512a7956340b44550e903c9fc Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 1 Mar 2010 14:50:41 +0000
Subject: [PATCH 09/25] STYLE: Add help to command-line arguments

---
 .../conversion/polyDualMesh/polyDualMeshApp.C | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
index 0ccb7a6862..03832883cc 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
@@ -358,9 +358,22 @@ int main(int argc, char *argv[])
     timeSelector::addOptions(true, false);
 
     argList::validArgs.append("feature angle[0-180]");
-    argList::addBoolOption("splitAllFaces");
-    argList::addBoolOption("concaveMultiCells");
-    argList::addBoolOption("doNotPreserveFaceZones");
+    argList::addBoolOption
+    (
+        "splitAllFaces",
+        "have multiple faces inbetween cells"
+    );
+    argList::addBoolOption
+    (
+        "concaveMultiCells",
+        "split cells on concave boundary edges into multiple cells"
+    );
+    argList::addBoolOption
+    (
+        "doNotPreserveFaceZones",
+        "disable the default behaviour of preserving faceZones by having"
+        " multiple faces inbetween cells"
+    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"

From 45fdd0e5732d4174cf98b60c99a9ac97d55863f7 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 1 Mar 2010 14:51:54 +0000
Subject: [PATCH 10/25] ENH: use non-blocking comms

---
 .../algorithms/MeshWave/FaceCellWave.C        | 65 +++++--------------
 .../algorithms/MeshWave/FaceCellWave.H        | 17 -----
 2 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
index a85e071ba5..017c20d692 100644
--- a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
+++ b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
@@ -466,40 +466,6 @@ void Foam::FaceCellWave<Type>::transform
 }
 
 
-// Send face info to neighbour.
-template <class Type>
-void Foam::FaceCellWave<Type>::sendPatchInfo
-(
-    const label neighbour,
-    const label nFaces,
-    const labelList& faceLabels,
-    const List<Type>& faceInfo
-) const
-{
-    OPstream toNeighbour(Pstream::blocking, neighbour);
-
-    writeFaces(nFaces, faceLabels, faceInfo, toNeighbour);
-}
-
-
-// Receive face info from neighbour
-template <class Type>
-Foam::label Foam::FaceCellWave<Type>::receivePatchInfo
-(
-    const label neighbour,
-    labelList& faceLabels,
-    List<Type>& faceInfo
-) const
-{
-    IPstream fromNeighbour(Pstream::blocking, neighbour);
-
-    label nFaces = 0;
-    readFaces(nFaces, faceLabels, faceInfo, fromNeighbour);
-
-    return nFaces;
-}
-
-
 // Offset mesh face. Used for transferring from one cyclic half to the other.
 template <class Type>
 void Foam::FaceCellWave<Type>::offset
@@ -523,6 +489,8 @@ void Foam::FaceCellWave<Type>::handleProcPatches()
 {
     // Send all
 
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+
     forAll(mesh_.boundaryMesh(), patchI)
     {
         const polyPatch& patch = mesh_.boundaryMesh()[patchI];
@@ -564,16 +532,13 @@ void Foam::FaceCellWave<Type>::handleProcPatches()
                     << endl;
             }
 
-            sendPatchInfo
-            (
-                procPatch.neighbProcNo(),
-                nSendFaces,
-                sendFaces,
-                sendFacesInfo
-            );
+            UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs);
+            writeFaces(nSendFaces, sendFaces, sendFacesInfo, toNeighbour);
         }
     }
 
+    pBufs.finishedSends();
+
     // Receive all
 
     forAll(mesh_.boundaryMesh(), patchI)
@@ -586,16 +551,20 @@ void Foam::FaceCellWave<Type>::handleProcPatches()
                 refCast<const processorPolyPatch>(patch);
 
             // Allocate buffers
-            label nReceiveFaces;
+            label nReceiveFaces = 0;
             labelList receiveFaces(patch.size());
             List<Type> receiveFacesInfo(patch.size());
 
-            nReceiveFaces = receivePatchInfo
-            (
-                procPatch.neighbProcNo(),
-                receiveFaces,
-                receiveFacesInfo
-            );
+            {
+                UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
+                readFaces
+                (
+                    nReceiveFaces,
+                    receiveFaces,
+                    receiveFacesInfo,
+                    fromNeighbour
+                );
+            }
 
             if (debug)
             {
diff --git a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
index 00c89d415b..6bf08d8e92 100644
--- a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
+++ b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
@@ -225,23 +225,6 @@ class FaceCellWave
                 List<Type>& faceInfo
             ) const;
 
-            //- Send info to neighbour
-            void sendPatchInfo
-            (
-                const label neighbour,
-                const label nFaces,
-                const labelList&,
-                const List<Type>&
-            ) const;
-
-            //- Receive info from neighbour. Returns number of faces received.
-            label receivePatchInfo
-            (
-                const label neighbour,
-                labelList&,
-                List<Type>&
-            ) const;
-
             //- Offset face labels by constant value
             static void offset
             (

From d6de32b039a1fa0c30c20b62097d72d33556bc49 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 1 Mar 2010 14:56:02 +0000
Subject: [PATCH 11/25] ENH: enable out-of-the-box building with system scotch
 on Debian.

---
 src/parallel/decompositionMethods/Make/options | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/parallel/decompositionMethods/Make/options b/src/parallel/decompositionMethods/Make/options
index fe6e8b6a05..3949e7e1d9 100644
--- a/src/parallel/decompositionMethods/Make/options
+++ b/src/parallel/decompositionMethods/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(WM_THIRD_PARTY_DIR)/scotch_5.1/include \
+    -I/usr/include/scotch \
     -I../metisDecomp/lnInclude
 
 LIB_LIBS = \

From 85a481906a9200565e58bc3cdf1b832682adc6be Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 1 Mar 2010 15:14:03 +0000
Subject: [PATCH 12/25] ENH: Added new WM_MPLIB setting.

This signals that we are using the system installed openmpi version.
---
 wmake/rules/General/mplibSYSTEMOPENMPI       |   1 +
 wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI |   1 +
 wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI    |   1 +
 wmake/rules/linux64Gcc/dirToString           | Bin 0 -> 9744 bytes
 wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI    |   1 +
 wmake/rules/linux64Gcc/wmkdep                | Bin 0 -> 32427 bytes
 wmake/rules/linux64Gcc42/dirToString         | Bin 0 -> 9657 bytes
 wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI  |   1 +
 wmake/rules/linux64Gcc42/wmkdep              | Bin 0 -> 31867 bytes
 wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI  |   1 +
 wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI  |   1 +
 wmake/rules/linux64Icc/mplibSYSTEMOPENMPI    |   1 +
 wmake/rules/linuxGcc/dirToString             | Bin 0 -> 7218 bytes
 wmake/rules/linuxGcc/mplibSYSTEMOPENMPI      |   1 +
 wmake/rules/linuxGcc/wmkdep                  | Bin 0 -> 26672 bytes
 wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI    |   1 +
 wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI    |   1 +
 wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI    |   1 +
 wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI  |   1 +
 wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI  |   1 +
 wmake/rules/linuxIcc/mplibSYSTEMOPENMPI      |   1 +
 wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI |   1 +
 wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI  |   1 +
 wmake/rules/solarisGcc/mplibSYSTEMOPENMPI    |   1 +
 24 files changed, 18 insertions(+)
 create mode 100644 wmake/rules/General/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
 create mode 100755 wmake/rules/linux64Gcc/dirToString
 create mode 120000 wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
 create mode 100755 wmake/rules/linux64Gcc/wmkdep
 create mode 100755 wmake/rules/linux64Gcc42/dirToString
 create mode 120000 wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI
 create mode 100755 wmake/rules/linux64Gcc42/wmkdep
 create mode 120000 wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
 create mode 100755 wmake/rules/linuxGcc/dirToString
 create mode 120000 wmake/rules/linuxGcc/mplibSYSTEMOPENMPI
 create mode 100755 wmake/rules/linuxGcc/wmkdep
 create mode 120000 wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI
 create mode 120000 wmake/rules/solarisGcc/mplibSYSTEMOPENMPI

diff --git a/wmake/rules/General/mplibSYSTEMOPENMPI b/wmake/rules/General/mplibSYSTEMOPENMPI
new file mode 100644
index 0000000000..98fa814ce3
--- /dev/null
+++ b/wmake/rules/General/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+PFLAGS     = -DOMPI_SKIP_MPICXX
diff --git a/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/dirToString b/wmake/rules/linux64Gcc/dirToString
new file mode 100755
index 0000000000000000000000000000000000000000..8a0125352dd2d2038723a69600ad144c85c8f24d
GIT binary patch
literal 9744
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

literal 0
HcmV?d00001

diff --git a/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/wmkdep b/wmake/rules/linux64Gcc/wmkdep
new file mode 100755
index 0000000000000000000000000000000000000000..949570b0bad43d2a7b7fc8e67cb6ed6ddffe468d
GIT binary patch
literal 32427
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

literal 0
HcmV?d00001

diff --git a/wmake/rules/linux64Gcc42/dirToString b/wmake/rules/linux64Gcc42/dirToString
new file mode 100755
index 0000000000000000000000000000000000000000..0560cadf77f4b2a75f422fe207df6bbbb4c814d3
GIT binary patch
literal 9657
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
NQi}3#KzQr2{{l~V2qORh

literal 0
HcmV?d00001

diff --git a/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc42/wmkdep b/wmake/rules/linux64Gcc42/wmkdep
new file mode 100755
index 0000000000000000000000000000000000000000..f37b2ea3d3deed1553f447a50fdcf557d383401f
GIT binary patch
literal 31867
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
W4{5>%@mcUkG0o}T{P<^l^#289R!@5X

literal 0
HcmV?d00001

diff --git a/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI b/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/dirToString b/wmake/rules/linuxGcc/dirToString
new file mode 100755
index 0000000000000000000000000000000000000000..f2244e3dca29490f592a9d1a9e8c9f96972426dc
GIT binary patch
literal 7218
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
VGhy3_=TmoEV+Vx%D<i!v{tE)QD!2du

literal 0
HcmV?d00001

diff --git a/wmake/rules/linuxGcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linuxGcc/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/wmkdep b/wmake/rules/linuxGcc/wmkdep
new file mode 100755
index 0000000000000000000000000000000000000000..ca4e0a882f7ad171c72583ccda19629d41b6a839
GIT binary patch
literal 26672
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

literal 0
HcmV?d00001

diff --git a/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI b/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI b/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/solarisGcc/mplibSYSTEMOPENMPI b/wmake/rules/solarisGcc/mplibSYSTEMOPENMPI
new file mode 120000
index 0000000000..cc63a574c3
--- /dev/null
+++ b/wmake/rules/solarisGcc/mplibSYSTEMOPENMPI
@@ -0,0 +1 @@
+../General/mplibSYSTEMOPENMPI
\ No newline at end of file

From 5ef1bac786712dacb1a52af20aaec3a2f7764b93 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 1 Mar 2010 15:23:00 +0000
Subject: [PATCH 13/25] ENH: Have new WM_MPLIB message passing library :
 SYSTEMOPENMPI

It uses mpicc to find out where the installed libraries are.
---
 etc/settings.csh | 24 ++++++++++++++++++++++++
 etc/settings.sh  | 22 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/etc/settings.csh b/etc/settings.csh
index d285e07ca2..78fd05490f 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -147,6 +147,30 @@ case OPENMPI:
     unset mpi_version
     breaksw
 
+case SYSTEMOPENMPI:
+
+    # This uses the installed openmpi. It needs mpicc installed!
+
+    set mpi_version=openmpi-system
+
+    # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
+    setenv PINC `mpicc --showme:compile` 
+    setenv PLIBS `mpicc --showme:link`
+    set libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
+
+    if ($?FOAM_VERBOSE && $?prompt) then
+        echo "Using system installed MPI:"
+        echo "    compile flags : $PINC"
+        echo "    link flags    : $PLIBS"
+        echo "    libmpi dir    : $libDir"
+    endif
+
+    _foamAddLib $libDir
+
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+    unset mpi_version libDir
+    breaksw
+
 case MPICH:
     set mpi_version=mpich2-1.1.1p1
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
diff --git a/etc/settings.sh b/etc/settings.sh
index bb0d48df0e..43fc884346 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -183,6 +183,28 @@ OPENMPI)
     unset mpi_version
     ;;
 
+SYSTEMOPENMPI)
+    mpi_version=openmpi-system
+
+    # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
+    export PINC=`mpicc --showme:compile` 
+    export PLIBS=`mpicc --showme:link`
+    libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
+
+    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    then
+        echo "Using system installed MPI:"
+        echo "    compile flags : $PINC"
+        echo "    link flags    : $PLIBS"
+        echo "    libmpi dir    : $libDir"
+    fi
+
+    _foamAddLib $libDir
+
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+    unset mpi_version libDir
+    ;;
+
 MPICH)
     mpi_version=mpich2-1.1.1p1
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version

From f88d85ba8adae9347bbee69592d1c1a34168dda0 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 1 Mar 2010 17:11:08 +0000
Subject: [PATCH 14/25] ENH: have dummy versions for thirdparty libraries

The dummyThirdParty tree builds libraries which are drop-in
(but non-functional) versions of some thirdparty libraries. This will
make it easier to ship binary versions without having to ship thirdparty packs.
---
 .../redistributeMeshPar/Make/options          |   3 +-
 src/Allwmake                                  |   2 +
 src/dummyThirdParty/Allwmake                  |  11 +
 src/dummyThirdParty/MGridGen/Make/files       |   3 +
 src/dummyThirdParty/MGridGen/Make/options     |   3 +
 src/dummyThirdParty/MGridGen/dummyMGridGen.C  |  59 ++++
 src/dummyThirdParty/MGridGen/mgridgen.h       |  64 ++++
 src/dummyThirdParty/metisDecomp/Make/files    |   3 +
 src/dummyThirdParty/metisDecomp/Make/options  |   5 +
 .../metisDecomp/dummyMetisDecomp.C            | 156 ++++++++++
 src/dummyThirdParty/parMetisDecomp/Make/files |   3 +
 .../parMetisDecomp/Make/options               |   5 +
 .../parMetisDecomp/dummyParMetisDecomp.C      | 185 ++++++++++++
 src/dummyThirdParty/scotchDecomp/Make/files   |   3 +
 src/dummyThirdParty/scotchDecomp/Make/options |   6 +
 .../scotchDecomp/dummyScotchDecomp.C          | 280 ++++++++++++++++++
 src/meshTools/Make/options                    |   1 -
 src/parallel/Allwmake                         |   7 +-
 src/parallel/AllwmakeLnInclude                |   8 +
 src/parallel/decompositionMethods/Make/files  |   2 -
 .../decompositionMethods/Make/options         |  12 +-
 src/parallel/metisDecomp/Make/files           |   2 +-
 src/parallel/metisDecomp/Make/options         |   3 +-
 src/parallel/parMetisDecomp/Make/files        |   2 +-
 src/parallel/parMetisDecomp/Make/options      |   3 +-
 src/parallel/scotchDecomp/Make/files          |   3 +
 src/parallel/scotchDecomp/Make/options        |   7 +
 .../scotchDecomp/scotchDecomp.C               |   0
 .../scotchDecomp/scotchDecomp.H               |   0
 29 files changed, 826 insertions(+), 15 deletions(-)
 create mode 100755 src/dummyThirdParty/Allwmake
 create mode 100644 src/dummyThirdParty/MGridGen/Make/files
 create mode 100644 src/dummyThirdParty/MGridGen/Make/options
 create mode 100644 src/dummyThirdParty/MGridGen/dummyMGridGen.C
 create mode 100644 src/dummyThirdParty/MGridGen/mgridgen.h
 create mode 100644 src/dummyThirdParty/metisDecomp/Make/files
 create mode 100644 src/dummyThirdParty/metisDecomp/Make/options
 create mode 100644 src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
 create mode 100644 src/dummyThirdParty/parMetisDecomp/Make/files
 create mode 100644 src/dummyThirdParty/parMetisDecomp/Make/options
 create mode 100644 src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C
 create mode 100644 src/dummyThirdParty/scotchDecomp/Make/files
 create mode 100644 src/dummyThirdParty/scotchDecomp/Make/options
 create mode 100644 src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
 create mode 100755 src/parallel/AllwmakeLnInclude
 create mode 100644 src/parallel/scotchDecomp/Make/files
 create mode 100644 src/parallel/scotchDecomp/Make/options
 rename src/parallel/{decompositionMethods => }/scotchDecomp/scotchDecomp.C (100%)
 rename src/parallel/{decompositionMethods => }/scotchDecomp/scotchDecomp.H (100%)

diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
index 45ab666e24..8f8010fff7 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
@@ -8,5 +8,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -ldecompositionMethods \
     -lmeshTools \
-    -ldynamicMesh \
-    -L$(FOAM_MPI_LIBBIN) -lparMetisDecompositionMethod
+    -ldynamicMesh
diff --git a/src/Allwmake b/src/Allwmake
index f24f2f370d..2f6d198d8e 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -28,6 +28,8 @@ wmake libso surfMesh
 wmake libso triSurface
 
 # Decomposition methods needed by meshTools
+parallel/AllwmakeLnInclude
+dummyThirdParty/Allwmake
 wmake libso parallel/decompositionMethods
 wmake libso parallel/metisDecomp
 
diff --git a/src/dummyThirdParty/Allwmake b/src/dummyThirdParty/Allwmake
new file mode 100755
index 0000000000..6629894909
--- /dev/null
+++ b/src/dummyThirdParty/Allwmake
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake libso scotchDecomp
+wmake libso metisDecomp
+wmake libso parMetisDecomp
+wmake libso MGridGen
+
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/dummyThirdParty/MGridGen/Make/files b/src/dummyThirdParty/MGridGen/Make/files
new file mode 100644
index 0000000000..684d67331a
--- /dev/null
+++ b/src/dummyThirdParty/MGridGen/Make/files
@@ -0,0 +1,3 @@
+dummyMGridGen.C
+
+LIB = $(FOAM_LIBBIN)/dummy/libMGridGen
diff --git a/src/dummyThirdParty/MGridGen/Make/options b/src/dummyThirdParty/MGridGen/Make/options
new file mode 100644
index 0000000000..4c3dd783cb
--- /dev/null
+++ b/src/dummyThirdParty/MGridGen/Make/options
@@ -0,0 +1,3 @@
+EXE_INC =
+
+EXE_LIBS =
diff --git a/src/dummyThirdParty/MGridGen/dummyMGridGen.C b/src/dummyThirdParty/MGridGen/dummyMGridGen.C
new file mode 100644
index 0000000000..3fbf08b460
--- /dev/null
+++ b/src/dummyThirdParty/MGridGen/dummyMGridGen.C
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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
+
+\*---------------------------------------------------------------------------*/
+
+//extern "C"
+//{
+#include "mgridgen.h"
+//}
+
+#include "error.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+static const char* notImplementedMessage =
+"You are trying to use MGridGen but do not have the MGridGen library loaded.\n"
+"This message is from the dummy MGridGen stub library instead.\n"
+"\n"
+"Normally the MGridGen library will be loaded through the LD_LIBRARY_PATH\n"
+"environment variable but you are picking up this dummy library from the\n"
+"$FOAM_LIBBIN/dummy directory. Please install MGridGen and make sure the\n"
+"libMGridGen.so is in your LD_LIBRARY_PATH.";
+
+#ifdef __cplusplus
+extern "C"
+#endif
+void MGridGen(int, idxtype *, realtype *, realtype *, idxtype *, realtype *,
+              int, int, int *, int *, int *, idxtype *)
+{
+    FatalErrorIn("MGridGen(..)")
+        << notImplementedMessage
+        << Foam::exit(Foam::FatalError);
+}
+
+
+// ************************************************************************* //
diff --git a/src/dummyThirdParty/MGridGen/mgridgen.h b/src/dummyThirdParty/MGridGen/mgridgen.h
new file mode 100644
index 0000000000..2a040431a6
--- /dev/null
+++ b/src/dummyThirdParty/MGridGen/mgridgen.h
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 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
+
+Namespace
+    C linkage
+
+Description
+    Dummy stub for mgridgen library functions.
+    Only implements the absolute minimum we are using.
+
+SourceFiles
+    dummyMGridGen.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef mgridgen_H
+#define mgridgen_H
+
+#include "scalar.H"
+
+#ifndef idxtype
+#define idxtype int
+#define realtype Foam::scalar
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+/*---------------------------------------------------------------------------*\
+                           Class metis Declaration
+\*---------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C"
+#endif
+void MGridGen(int, idxtype *, realtype *, realtype *, idxtype *, realtype *,
+              int, int, int *, int *, int *, idxtype *);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/dummyThirdParty/metisDecomp/Make/files b/src/dummyThirdParty/metisDecomp/Make/files
new file mode 100644
index 0000000000..cdc9482e7d
--- /dev/null
+++ b/src/dummyThirdParty/metisDecomp/Make/files
@@ -0,0 +1,3 @@
+dummyMetisDecomp.C
+
+LIB = $(FOAM_LIBBIN)/dummy/libmetisDecomp
diff --git a/src/dummyThirdParty/metisDecomp/Make/options b/src/dummyThirdParty/metisDecomp/Make/options
new file mode 100644
index 0000000000..05ee5feb98
--- /dev/null
+++ b/src/dummyThirdParty/metisDecomp/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(FOAM_SRC)/parallel/metisDecomp/lnInclude
+
+LIB_LIBS =
diff --git a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
new file mode 100644
index 0000000000..6167a7aa09
--- /dev/null
+++ b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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
+
+\*---------------------------------------------------------------------------*/
+
+#include "metisDecomp.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Time.H"
+
+static const char* notImplementedMessage =
+"You are trying to use metis but do not have the metisDecomp library loaded."
+"\nThis message is from the dummy metisDecomp stub library instead.\n"
+"\n"
+"Please install metis and make sure that libmetis.so is in your "
+"LD_LIBRARY_PATH.\n"
+"The metisDecomp library can then be built in $FOAM_SRC/decompositionMethods/"
+"metisDecomp\n";
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(metisDecomp, 0);
+
+    addToRunTimeSelectionTable
+    (
+        decompositionMethod,
+        metisDecomp,
+        dictionaryMesh
+    );
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::label Foam::metisDecomp::decompose
+(
+    const List<int>& adjncy,
+    const List<int>& xadj,
+    const scalarField& cellWeights,
+    List<int>& finalDecomp
+)
+{
+    FatalErrorIn
+    (
+        "labelList metisDecomp::decompose"
+        "("
+            "const List<int>&, "
+            "const List<int>&, "
+            "const scalarField&, "
+            "List<int>&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return -1;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::metisDecomp::metisDecomp
+(
+    const dictionary& decompositionDict,
+    const polyMesh& mesh
+)
+:
+    decompositionMethod(decompositionDict),
+    mesh_(mesh)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::labelList Foam::metisDecomp::decompose
+(
+    const pointField& points,
+    const scalarField& pointWeights
+)
+{
+    FatalErrorIn
+    (
+        "labelList metisDecomp::decompose"
+        "("
+            "const pointField&, "
+            "const scalarField&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return labelList();
+}
+
+
+Foam::labelList Foam::metisDecomp::decompose
+(
+    const labelList& agglom,
+    const pointField& agglomPoints,
+    const scalarField& agglomWeights
+)
+{
+    FatalErrorIn
+    (
+        "labelList metisDecomp::decompose"
+        "("
+            "const labelList&, "
+            "const pointField&, "
+            "const scalarField&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return labelList();
+}
+
+
+Foam::labelList Foam::metisDecomp::decompose
+(
+    const labelListList& globalCellCells,
+    const pointField& cellCentres,
+    const scalarField& cellWeights
+)
+{
+    FatalErrorIn
+    (
+        "labelList metisDecomp::decompose"
+        "("
+            "const labelListList&, "
+            "const pointField&, "
+            "const scalarField&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return labelList();
+}
+
+
+// ************************************************************************* //
diff --git a/src/dummyThirdParty/parMetisDecomp/Make/files b/src/dummyThirdParty/parMetisDecomp/Make/files
new file mode 100644
index 0000000000..beb734541c
--- /dev/null
+++ b/src/dummyThirdParty/parMetisDecomp/Make/files
@@ -0,0 +1,3 @@
+dummyParMetisDecomp.C
+
+LIB = $(FOAM_LIBBIN)/dummy/libparMetisDecomp
diff --git a/src/dummyThirdParty/parMetisDecomp/Make/options b/src/dummyThirdParty/parMetisDecomp/Make/options
new file mode 100644
index 0000000000..2267e7a542
--- /dev/null
+++ b/src/dummyThirdParty/parMetisDecomp/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(FOAM_SRC)/parallel/parMetisDecomp/lnInclude
+
+LIB_LIBS =
diff --git a/src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C b/src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C
new file mode 100644
index 0000000000..7cf3663e6c
--- /dev/null
+++ b/src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C
@@ -0,0 +1,185 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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
+
+\*---------------------------------------------------------------------------*/
+
+#include "parMetisDecomp.H"
+#include "addToRunTimeSelectionTable.H"
+#include "polyMesh.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(parMetisDecomp, 0);
+
+    addToRunTimeSelectionTable
+    (
+        decompositionMethod,
+        parMetisDecomp,
+        dictionaryMesh
+    );
+}
+
+static const char* notImplementedMessage =
+"You are trying to use parMetis but do not have the parMetisDecomp library "
+"loaded.\n"
+"This message is from the dummy parMetisDecomp stub library instead.\n"
+"\n"
+"Please install parMetis and make sure that libparMetis.so is in your "
+"LD_LIBRARY_PATH.\n"
+"The parMetisDecomp library can then be built in $FOAM_SRC/decompositionMethods/"
+"parMetisDecomp\n";
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+//- Does prevention of 0 cell domains and calls parmetis.
+Foam::label Foam::parMetisDecomp::decompose
+(
+    Field<int>& xadj,
+    Field<int>& adjncy,
+    const pointField& cellCentres,
+    Field<int>& cellWeights,
+    Field<int>& faceWeights,
+    const List<int>& options,
+
+    List<int>& finalDecomp
+)
+{
+    FatalErrorIn
+    (
+        "label parMetisDecomp::decompose"
+        "("
+            "Field<int>&, "
+            "Field<int>&, "
+            "const pointField&, "
+            "Field<int>&, "
+            "Field<int>&, "
+            "const List<int>&, "
+            "List<int>&"
+        ")"
+    )<< notImplementedMessage << exit(FatalError);
+
+    return -1;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::parMetisDecomp::parMetisDecomp
+(
+    const dictionary& decompositionDict,
+    const polyMesh& mesh
+)
+:
+    decompositionMethod(decompositionDict),
+    mesh_(mesh)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::labelList Foam::parMetisDecomp::decompose
+(
+    const pointField& cc,
+    const scalarField& cWeights
+)
+{
+    FatalErrorIn
+    (
+        "labelList parMetisDecomp::decompose"
+        "("
+            "const pointField&, "
+            "const scalarField&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return labelList();
+}
+
+
+Foam::labelList Foam::parMetisDecomp::decompose
+(
+    const labelList& cellToRegion,
+    const pointField& regionPoints,
+    const scalarField& regionWeights
+)
+{
+    FatalErrorIn
+    (
+        "labelList parMetisDecomp::decompose"
+        "("
+            "const labelList&, "
+            "const pointField&, "
+            "const scalarField&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return labelList();
+}
+
+
+Foam::labelList Foam::parMetisDecomp::decompose
+(
+    const labelListList& globalCellCells,
+    const pointField& cellCentres,
+    const scalarField& cWeights
+)
+{
+    FatalErrorIn
+    (
+        "labelList parMetisDecomp::decompose"
+        "("
+            "const labelListList&, "
+            "const pointField&, "
+            "const scalarField&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return labelList();
+}
+
+
+void Foam::parMetisDecomp::calcMetisDistributedCSR
+(
+    const polyMesh& mesh,
+    List<int>& adjncy,
+    List<int>& xadj
+)
+{
+    FatalErrorIn
+    (
+        "void parMetisDecomp::calcMetisDistributedCSR"
+        "("
+            "const polyMesh&, "
+            "List<int>&, "
+            "List<int>&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+}
+
+
+// ************************************************************************* //
diff --git a/src/dummyThirdParty/scotchDecomp/Make/files b/src/dummyThirdParty/scotchDecomp/Make/files
new file mode 100644
index 0000000000..f8f7b50143
--- /dev/null
+++ b/src/dummyThirdParty/scotchDecomp/Make/files
@@ -0,0 +1,3 @@
+dummyScotchDecomp.C
+
+LIB = $(FOAM_LIBBIN)/dummy/libscotchDecomp
diff --git a/src/dummyThirdParty/scotchDecomp/Make/options b/src/dummyThirdParty/scotchDecomp/Make/options
new file mode 100644
index 0000000000..e109fb6fce
--- /dev/null
+++ b/src/dummyThirdParty/scotchDecomp/Make/options
@@ -0,0 +1,6 @@
+EXE_INC = \ 
+    -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(FOAM_SRC)/parallel/scotchDecomp/lnInclude
+
+LIB_LIBS =
+ 
diff --git a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
new file mode 100644
index 0000000000..cefc26c582
--- /dev/null
+++ b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
@@ -0,0 +1,280 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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
+
+    From scotch forum:
+
+    By: Francois PELLEGRINI RE: Graph mapping 'strategy' string [ reply ]
+    2008-08-22 10:09 Strategy handling in Scotch is a bit tricky. In order
+    not to be confused, you must have a clear view of how they are built.
+    Here are some rules:
+
+    1- Strategies are made up of "methods" which are combined by means of
+    "operators".
+
+    2- A method is of the form "m{param=value,param=value,...}", where "m"
+    is a single character (this is your first error: "f" is a method name,
+    not a parameter name).
+
+    3- There exist different sort of strategies : bipartitioning strategies,
+    mapping strategies, ordering strategies, which cannot be mixed. For
+    instance, you cannot build a bipartitioning strategy and feed it to a
+    mapping method (this is your second error).
+
+    To use the "mapCompute" routine, you must create a mapping strategy, not
+    a bipartitioning one, and so use stratGraphMap() and not
+    stratGraphBipart(). Your mapping strategy should however be based on the
+    "recursive bipartitioning" method ("b"). For instance, a simple (and
+    hence not very efficient) mapping strategy can be :
+
+    "b{sep=f}"
+
+    which computes mappings with the recursive bipartitioning method "b",
+    this latter using the Fiduccia-Mattheyses method "f" to compute its
+    separators.
+
+    If you want an exact partition (see your previous post), try
+    "b{sep=fx}".
+
+    However, these strategies are not the most efficient, as they do not
+    make use of the multi-level framework.
+
+    To use the multi-level framework, try for instance:
+
+    "b{sep=m{vert=100,low=h,asc=f}x}"
+
+    The current default mapping strategy in Scotch can be seen by using the
+    "-vs" option of program gmap. It is, to date:
+
+    b
+    {
+        job=t,
+        map=t,
+        poli=S,
+        sep=
+        (
+            m
+            {
+                asc=b
+                {
+                    bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},
+                    org=f{move=80,pass=-1,bal=0.005},
+                    width=3
+                },
+                low=h{pass=10}f{move=80,pass=-1,bal=0.0005},
+                type=h,
+                vert=80,
+                rat=0.8
+            }
+          | m
+            {
+                asc=b
+                {
+                    bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},
+                    org=f{move=80,pass=-1,bal=0.005},
+                    width=3
+                },
+                low=h{pass=10}f{move=80,pass=-1,bal=0.0005},
+                type=h,
+                vert=80,
+                rat=0.8
+            }
+        )
+    }
+
+
+\*---------------------------------------------------------------------------*/
+
+#include "scotchDecomp.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Time.H"
+
+static const char* notImplementedMessage =
+"You are trying to use scotch but do not have the scotchDecomp library loaded."
+"\nThis message is from the dummy scotchDecomp stub library instead.\n"
+"\n"
+"Please install scotch and make sure that libscotch.so is in your "
+"LD_LIBRARY_PATH.\n"
+"The scotchDecomp library can then be built in $FOAM_SRC/decompositionMethods/"
+"scotchDecomp\n";
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(scotchDecomp, 0);
+
+    addToRunTimeSelectionTable
+    (
+        decompositionMethod,
+        scotchDecomp,
+        dictionaryMesh
+    );
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::scotchDecomp::check(const int retVal, const char* str)
+{}
+
+
+Foam::label Foam::scotchDecomp::decompose
+(
+    const List<int>& adjncy,
+    const List<int>& xadj,
+    const scalarField& cWeights,
+
+    List<int>& finalDecomp
+)
+{
+    FatalErrorIn
+    (
+        "label scotchDecomp::decompose"
+        "("
+            "const List<int>&, "
+            "const List<int>&, "
+            "const scalarField&, "
+            "List<int>&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return -1;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::scotchDecomp::scotchDecomp
+(
+    const dictionary& decompositionDict,
+    const polyMesh& mesh
+)
+:
+    decompositionMethod(decompositionDict),
+    mesh_(mesh)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::labelList Foam::scotchDecomp::decompose
+(
+    const pointField& points,
+    const scalarField& pointWeights
+)
+{
+    FatalErrorIn
+    (
+        "labelList scotchDecomp::decompose"
+        "("
+            "const pointField&, "
+            "const scalarField&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return labelList::null();
+}
+
+
+Foam::labelList Foam::scotchDecomp::decompose
+(
+    const labelList& agglom,
+    const pointField& agglomPoints,
+    const scalarField& pointWeights
+)
+{
+    FatalErrorIn
+    (
+        "labelList scotchDecomp::decompose"
+        "("
+            "const labelList&, "
+            "const pointField&, "
+            "const scalarField&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return labelList::null();
+}
+
+
+Foam::labelList Foam::scotchDecomp::decompose
+(
+    const labelListList& globalCellCells,
+    const pointField& cellCentres,
+    const scalarField& cWeights
+)
+{
+    FatalErrorIn
+    (
+        "labelList scotchDecomp::decompose"
+        "("
+            "const labelListList&, "
+            "const pointField&, "
+            "const scalarField&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+
+    return labelList::null();
+}
+
+
+void Foam::scotchDecomp::calcCSR
+(
+    const polyMesh& mesh,
+    List<int>& adjncy,
+    List<int>& xadj
+)
+{
+    FatalErrorIn
+    (
+        "labelList scotchDecomp::decompose"
+        "("
+            "const polyMesh&, "
+            "const List<int>&, "
+            "const List<int>&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+}
+
+
+void Foam::scotchDecomp::calcCSR
+(
+    const labelListList& cellCells,
+    List<int>& adjncy,
+    List<int>& xadj
+)
+{
+    FatalErrorIn
+    (
+        "labelList scotchDecomp::decompose"
+        "("
+            "const labelListList&, "
+            "const List<int>&, "
+            "const List<int>&"
+        ")"
+    )   << notImplementedMessage << exit(FatalError);
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options
index 6bf989d4f5..0ff2202926 100644
--- a/src/meshTools/Make/options
+++ b/src/meshTools/Make/options
@@ -6,5 +6,4 @@ EXE_INC = \
 LIB_LIBS = \
     -ltriSurface \
     -ldecompositionMethods \
-    -lmetisDecompositionMethod \
     -llagrangian
diff --git a/src/parallel/Allwmake b/src/parallel/Allwmake
index 48c7d41624..5309e3481e 100755
--- a/src/parallel/Allwmake
+++ b/src/parallel/Allwmake
@@ -2,7 +2,9 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso decompositionMethods
+wmakeLnInclude decompositionMethods
+
+wmake libso scotchDecomp
 wmake libso metisDecomp
 wmake libso reconstruct
 
@@ -11,4 +13,7 @@ then
     ( WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso parMetisDecomp )
 fi
 
+wmake libso decompositionMethods
+
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/parallel/AllwmakeLnInclude b/src/parallel/AllwmakeLnInclude
new file mode 100755
index 0000000000..0737a7ffd4
--- /dev/null
+++ b/src/parallel/AllwmakeLnInclude
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmakeLnInclude decompositionMethods
+wmakeLnInclude metisDecomp
+wmakeLnInclude parMetisDecomp
+wmakeLnInclude scotchDecomp
diff --git a/src/parallel/decompositionMethods/Make/files b/src/parallel/decompositionMethods/Make/files
index 751ebe90f2..43bb9a25c1 100644
--- a/src/parallel/decompositionMethods/Make/files
+++ b/src/parallel/decompositionMethods/Make/files
@@ -4,6 +4,4 @@ simpleGeomDecomp/simpleGeomDecomp.C
 hierarchGeomDecomp/hierarchGeomDecomp.C
 manualDecomp/manualDecomp.C
 
-scotchDecomp/scotchDecomp.C
-
 LIB = $(FOAM_LIBBIN)/libdecompositionMethods
diff --git a/src/parallel/decompositionMethods/Make/options b/src/parallel/decompositionMethods/Make/options
index 3949e7e1d9..fbe9e72228 100644
--- a/src/parallel/decompositionMethods/Make/options
+++ b/src/parallel/decompositionMethods/Make/options
@@ -1,7 +1,9 @@
-EXE_INC = \
-    -I$(WM_THIRD_PARTY_DIR)/scotch_5.1/include \
-    -I/usr/include/scotch \
-    -I../metisDecomp/lnInclude
+EXE_INC =
 
 LIB_LIBS = \
-    -lscotch -lscotcherrexit
+    -L$(FOAM_LIBBIN)/dummy \
+    -L$(FOAM_MPI_LIBBIN) \
+    -lscotchDecomp \
+    -lmetisDecomp \
+    -lparMetisDecomp
+
diff --git a/src/parallel/metisDecomp/Make/files b/src/parallel/metisDecomp/Make/files
index eb1e633e18..39ee731e4d 100644
--- a/src/parallel/metisDecomp/Make/files
+++ b/src/parallel/metisDecomp/Make/files
@@ -1,3 +1,3 @@
 metisDecomp.C
 
-LIB = $(FOAM_LIBBIN)/libmetisDecompositionMethod
+LIB = $(FOAM_LIBBIN)/libmetisDecomp
diff --git a/src/parallel/metisDecomp/Make/options b/src/parallel/metisDecomp/Make/options
index a7d5398f03..2115beb95a 100644
--- a/src/parallel/metisDecomp/Make/options
+++ b/src/parallel/metisDecomp/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I$(WM_THIRD_PARTY_DIR)/metis-5.0pre2/include \
-    -I../decompositionMethods/lnInclude
+    -I../decompositionMethods/lnInclude \
+    -I../scotchDecomp/lnInclude
 
 LIB_LIBS = \
     -lmetis \
diff --git a/src/parallel/parMetisDecomp/Make/files b/src/parallel/parMetisDecomp/Make/files
index 21d8080bc0..7b771b8161 100644
--- a/src/parallel/parMetisDecomp/Make/files
+++ b/src/parallel/parMetisDecomp/Make/files
@@ -1,3 +1,3 @@
 parMetisDecomp.C
 
-LIB = $(FOAM_MPI_LIBBIN)/libparMetisDecompositionMethod
+LIB = $(FOAM_MPI_LIBBIN)/libparMetisDecomp
diff --git a/src/parallel/parMetisDecomp/Make/options b/src/parallel/parMetisDecomp/Make/options
index 79beb369af..76a64be219 100644
--- a/src/parallel/parMetisDecomp/Make/options
+++ b/src/parallel/parMetisDecomp/Make/options
@@ -5,7 +5,8 @@ EXE_INC = \
     -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1/ParMETISLib \
     -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1 \
     -I../decompositionMethods/lnInclude \
-    -I../metisDecomp/lnInclude
+    -I../metisDecomp/lnInclude \
+    -I../scotchDecomp/lnInclude
 
 LIB_LIBS = \
     -L$(FOAM_MPI_LIBBIN) \
diff --git a/src/parallel/scotchDecomp/Make/files b/src/parallel/scotchDecomp/Make/files
new file mode 100644
index 0000000000..59717fa15c
--- /dev/null
+++ b/src/parallel/scotchDecomp/Make/files
@@ -0,0 +1,3 @@
+scotchDecomp.C
+
+LIB = $(FOAM_LIBBIN)/libscotchDecomp
diff --git a/src/parallel/scotchDecomp/Make/options b/src/parallel/scotchDecomp/Make/options
new file mode 100644
index 0000000000..96b64b8fdd
--- /dev/null
+++ b/src/parallel/scotchDecomp/Make/options
@@ -0,0 +1,7 @@
+EXE_INC = \
+    -I$(WM_THIRD_PARTY_DIR)/scotch_5.1/include \
+    -I/usr/include/scotch \
+    -I../decompositionMethods/lnInclude
+
+LIB_LIBS = \
+    -lscotch -lscotcherrexit
diff --git a/src/parallel/decompositionMethods/scotchDecomp/scotchDecomp.C b/src/parallel/scotchDecomp/scotchDecomp.C
similarity index 100%
rename from src/parallel/decompositionMethods/scotchDecomp/scotchDecomp.C
rename to src/parallel/scotchDecomp/scotchDecomp.C
diff --git a/src/parallel/decompositionMethods/scotchDecomp/scotchDecomp.H b/src/parallel/scotchDecomp/scotchDecomp.H
similarity index 100%
rename from src/parallel/decompositionMethods/scotchDecomp/scotchDecomp.H
rename to src/parallel/scotchDecomp/scotchDecomp.H

From 803556d7618c158d766af80a99af172f47f9e245 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 1 Mar 2010 17:14:33 +0000
Subject: [PATCH 15/25] ENH: initialised edge values to avoid compiler warning
 msg

---
 .../utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
index ba13659a18..ad4bffa3b7 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
@@ -884,7 +884,7 @@ void starMesh::createCoupleMatches()
                 << "newSlaveEdges: " << newSlaveEdges << endl;
 #           endif
 
-            edge startEdge;
+            edge startEdge(-1, -1);
 
             // Remember where the start edge was found:
             // 0 for not found

From 1c100735ccdc67cc61f3326435d7eb91c998a4f0 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 2 Mar 2010 09:50:34 +0000
Subject: [PATCH 16/25] BUG: overwrite option does not require an argument.

---
 src/OpenFOAM/include/addOverwriteOption.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/include/addOverwriteOption.H b/src/OpenFOAM/include/addOverwriteOption.H
index c61548f06b..0c05c01c93 100644
--- a/src/OpenFOAM/include/addOverwriteOption.H
+++ b/src/OpenFOAM/include/addOverwriteOption.H
@@ -2,7 +2,7 @@
 // addOverwriteOption.H
 // ~~~~~~~~~~~~~~~~~~~~
 
-    Foam::argList::addOption
+    Foam::argList::addBoolOption
     (
         "overwrite",
         "overwrite existing mesh/results files"

From de673c5ee5e2a5e840e1ac68981bc342d4ef377f Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 2 Mar 2010 09:51:00 +0000
Subject: [PATCH 17/25] ENH: Changed mixed coupled bc to use combination of
 zerogradient and fixedValue

Is more convergent&stable than switching.
---
 ...tureCoupledBaffleMixedFvPatchScalarField.C | 248 +++++-------------
 ...tureCoupledBaffleMixedFvPatchScalarField.H |  16 --
 2 files changed, 60 insertions(+), 204 deletions(-)

diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index 494a1e3257..6edbac5049 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -42,71 +42,6 @@ namespace compressible
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-bool turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::interfaceOwner
-(
-    const polyMesh& nbrRegion,
-    const polyPatch& nbrPatch
-) const
-{
-    const fvMesh& myRegion = patch().boundaryMesh().mesh();
-
-    if (nbrRegion.name() == myRegion.name())
-    {
-        return patch().index() < nbrPatch.index();
-    }
-    else
-    {
-        const regionProperties& props =
-            myRegion.objectRegistry::parent().lookupObject<regionProperties>
-            (
-                "regionProperties"
-            );
-
-        label myIndex = findIndex(props.fluidRegionNames(), myRegion.name());
-        if (myIndex == -1)
-        {
-            label i = findIndex(props.solidRegionNames(), myRegion.name());
-
-            if (i == -1)
-            {
-                FatalErrorIn
-                (
-                    "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField"
-                    "::interfaceOwner(const polyMesh&"
-                    ", const polyPatch&)const"
-                )   << "Cannot find region " << myRegion.name()
-                    << " neither in fluids " << props.fluidRegionNames()
-                    << " nor in solids " << props.solidRegionNames()
-                    << exit(FatalError);
-            }
-            myIndex = props.fluidRegionNames().size() + i;
-        }
-        label nbrIndex = findIndex
-        (
-            props.fluidRegionNames(),
-            nbrRegion.name()
-        );
-        if (nbrIndex == -1)
-        {
-            label i = findIndex(props.solidRegionNames(), nbrRegion.name());
-
-            if (i == -1)
-            {
-                FatalErrorIn
-                (
-                    "coupleManager::interfaceOwner"
-                    "(const polyMesh&, const polyPatch&) const"
-                )   << "Cannot find region " << nbrRegion.name()
-                    << " neither in fluids " << props.fluidRegionNames()
-                    << " nor in solids " << props.solidRegionNames()
-                    << exit(FatalError);
-            }
-            nbrIndex = props.fluidRegionNames().size() + i;
-        }
-        return myIndex < nbrIndex;
-    }
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -124,7 +59,6 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
     this->refValue() = 0.0;
     this->refGrad() = 0.0;
     this->valueFraction() = 1.0;
-    this->fixesValue_ = true;
 }
 
 
@@ -139,8 +73,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
 :
     mixedFvPatchScalarField(ptf, p, iF, mapper),
     neighbourFieldName_(ptf.neighbourFieldName_),
-    KName_(ptf.KName_),
-    fixesValue_(ptf.fixesValue_)
+    KName_(ptf.KName_)
 {}
 
 
@@ -183,7 +116,6 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
         refValue() = scalarField("refValue", dict, p.size());
         refGrad() = scalarField("refGradient", dict, p.size());
         valueFraction() = scalarField("valueFraction", dict, p.size());
-        fixesValue_ = readBool(dict.lookup("fixesValue"));
     }
     else
     {
@@ -191,7 +123,6 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
         refValue() = *this;
         refGrad() = 0.0;
         valueFraction() = 1.0;
-        fixesValue_ = true;
     }
 }
 
@@ -205,8 +136,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
 :
     mixedFvPatchScalarField(wtcsf, iF),
     neighbourFieldName_(wtcsf.neighbourFieldName_),
-    KName_(wtcsf.KName_),
-    fixesValue_(wtcsf.fixesValue_)
+    KName_(wtcsf.KName_)
 {}
 
 
@@ -281,95 +211,80 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
 
     // Force recalculation of mapping and schedule
     const mapDistribute& distMap = mpp.map();
-    (void)distMap.schedule();
 
     tmp<scalarField> intFld = patchInternalField();
 
-    if (interfaceOwner(nbrMesh, nbrPatch.patch()))
-    {
-        // Note: other side information could be cached - it only needs
-        // to be updated the first time round the iteration (i.e. when
-        // switching regions) but unfortunately we don't have this information.
 
+    // Calculate the temperature by harmonic averaging
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        // Calculate the temperature by harmonic averaging
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-        const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField&
-        nbrField =
-        refCast
-        <
-            const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
-        >
+    const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField& nbrField =
+    refCast
+    <
+        const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+    >
+    (
+        nbrPatch.lookupPatchField<volScalarField, scalar>
         (
-            nbrPatch.lookupPatchField<volScalarField, scalar>
-            (
-                neighbourFieldName_
-            )
-        );
+            neighbourFieldName_
+        )
+    );
 
-        // Swap to obtain full local values of neighbour internal field
-        scalarField nbrIntFld = nbrField.patchInternalField();
-        mapDistribute::distribute
-        (
-            Pstream::defaultCommsType,
-            distMap.schedule(),
-            distMap.constructSize(),
-            distMap.subMap(),           // what to send
-            distMap.constructMap(),     // what to receive
-            nbrIntFld
-        );
+    // Swap to obtain full local values of neighbour internal field
+    scalarField nbrIntFld = nbrField.patchInternalField();
+    mapDistribute::distribute
+    (
+        Pstream::defaultCommsType,
+        distMap.schedule(),
+        distMap.constructSize(),
+        distMap.subMap(),           // what to send
+        distMap.constructMap(),     // what to receive
+        nbrIntFld
+    );
 
-        // Swap to obtain full local values of neighbour K*delta
-        scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs();
-        mapDistribute::distribute
-        (
-            Pstream::defaultCommsType,
-            distMap.schedule(),
-            distMap.constructSize(),
-            distMap.subMap(),           // what to send
-            distMap.constructMap(),     // what to receive
-            nbrKDelta
-        );
+    // Swap to obtain full local values of neighbour K*delta
+    scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs();
+    mapDistribute::distribute
+    (
+        Pstream::defaultCommsType,
+        distMap.schedule(),
+        distMap.constructSize(),
+        distMap.subMap(),           // what to send
+        distMap.constructMap(),     // what to receive
+        nbrKDelta
+    );
 
-        tmp<scalarField> myKDelta = K()*patch().deltaCoeffs();
-
-        // Calculate common wall temperature. Reuse *this to store common value.
-        scalarField Twall
-        (
-            (myKDelta()*intFld() + nbrKDelta*nbrIntFld)
-          / (myKDelta() + nbrKDelta)
-        );
-        // Assign to me
-        fvPatchScalarField::operator=(Twall);
-        // Distribute back and assign to neighbour
-        mapDistribute::distribute
-        (
-            Pstream::defaultCommsType,
-            distMap.schedule(),
-            nbrField.size(),
-            distMap.constructMap(),     // reverse : what to send
-            distMap.subMap(),
-            Twall
-        );
-        const_cast<turbulentTemperatureCoupledBaffleMixedFvPatchScalarField&>
-        (
-            nbrField
-        ).fvPatchScalarField::operator=(Twall);
-    }
+    tmp<scalarField> myKDelta = K()*patch().deltaCoeffs();
 
 
-    // Switch between fixed value (of harmonic avg) or gradient
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Both sides agree on
+    // - temperature : (myKDelta*fld + nbrKDelta*nbrFld)/(myKDelta+nbrKDelta)
+    // - gradient    : (temperature-fld)*delta
+    // We've got a degree of freedom in how to implement this in a mixed bc.
+    // (what gradient, what fixedValue and mixing coefficient)
+    // Two reasonable choices:
+    // 1. specify above temperature on one side (preferentially the high side)
+    //    and above gradient on the other. So this will switch between pure
+    //    fixedvalue and pure fixedgradient
+    // 2. specify gradient and temperature such that the equations are the
+    //    same on both sides. This leads to the choice of
+    //    - refGradient = zero gradient
+    //    - refValue = neighbour value
+    //    - mixFraction = nbrKDelta / (nbrKDelta + myKDelta())
 
-    label nFixed = 0;
 
-    // Like snGrad but bypass switching on refValue/refGrad.
-    tmp<scalarField> normalGradient = (*this-intFld())*patch().deltaCoeffs();
+    this->refValue() = nbrIntFld;
+
+    this->refGrad() = 0.0;
+
+    this->valueFraction() = nbrKDelta / (nbrKDelta + myKDelta());
+
+    mixedFvPatchScalarField::updateCoeffs();
+
 
     if (debug)
     {
-        scalar Q = gSum(K()*patch().magSf()*normalGradient());
+        scalar Q = gSum(K()*patch().magSf()*snGrad());
 
         Info<< patch().boundaryMesh().mesh().name() << ':'
             << patch().name() << ':'
@@ -384,48 +299,6 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
             << " avg:" << gAverage(*this)
             << endl;
     }
-
-    forAll(*this, i)
-    {
-        // if outgoing flux use fixed value.
-        if (normalGradient()[i] < 0.0)
-        {
-            this->refValue()[i] = operator[](i);
-            this->refGrad()[i] = 0.0;   // not used by me
-            this->valueFraction()[i] = 1.0;
-            nFixed++;
-        }
-        else
-        {
-            // Fixed gradient. Make sure to have valid refValue (even though
-            // I am not using it - other boundary conditions might)
-            this->refValue()[i] = operator[](i);
-            this->refGrad()[i] = normalGradient()[i];
-            this->valueFraction()[i] = 0.0;
-        }
-    }
-
-    reduce(nFixed, sumOp<label>());
-
-    fixesValue_ = (nFixed > 0);
-
-    if (debug)
-    {
-        label nTotSize = returnReduce(this->size(), sumOp<label>());
-
-        Info<< patch().boundaryMesh().mesh().name() << ':'
-            << patch().name() << ':'
-            << this->dimensionedInternalField().name() << " -> "
-            << nbrMesh.name() << ':'
-            << nbrPatch.name() << ':'
-            << this->dimensionedInternalField().name() << " :"
-            << " patch:" << patch().name()
-            << " out of:" << nTotSize
-            << " fixedBC:" << nFixed
-            << " gradient:" << nTotSize-nFixed << endl;
-    }
-
-    mixedFvPatchScalarField::updateCoeffs();
 }
 
 
@@ -438,7 +311,6 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write
     os.writeKeyword("neighbourFieldName")<< neighbourFieldName_
         << token::END_STATEMENT << nl;
     os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("fixesValue") << fixesValue_ << token::END_STATEMENT << nl;
 }
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
index c4a6a7a763..ee5c993e37 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -92,14 +92,6 @@ class turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
         //- Name of thermal conductivity field
         const word KName_;
 
-        bool fixesValue_;
-
-
-    // Private Member Functions
-
-        //- Am I or neighbour owner of interface
-        bool interfaceOwner(const polyMesh&, const polyPatch&) const;
-
 
 public:
 
@@ -176,14 +168,6 @@ public:
         //- Get corresponding K field
         tmp<scalarField> K() const;
 
-        //- Return true if this patch field fixes a value.
-        //  Needed to check if a level has to be specified while solving
-        //  Poissons equations.
-        virtual bool fixesValue() const
-        {
-            return fixesValue_;
-        }
-
         //- Update the coefficients associated with the patch field
         virtual void updateCoeffs();
 

From fd6003d9a3bde7f9d647edae9fbb97836fc2ee98 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 2 Mar 2010 12:15:34 +0000
Subject: [PATCH 18/25] BUG: findBox needed treeBoundBox, not boundBox

---
 src/meshTools/indexedOctree/indexedOctree.C | 2 +-
 src/meshTools/indexedOctree/indexedOctree.H | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/meshTools/indexedOctree/indexedOctree.C b/src/meshTools/indexedOctree/indexedOctree.C
index 1d444eff3d..cb3b2ba780 100644
--- a/src/meshTools/indexedOctree/indexedOctree.C
+++ b/src/meshTools/indexedOctree/indexedOctree.C
@@ -2433,7 +2433,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLineAny
 template <class Type>
 Foam::labelList Foam::indexedOctree<Type>::findBox
 (
-    const boundBox& searchBox
+    const treeBoundBox& searchBox
 ) const
 {
     // Storage for labels of shapes inside bb. Size estimate.
diff --git a/src/meshTools/indexedOctree/indexedOctree.H b/src/meshTools/indexedOctree/indexedOctree.H
index b653dc3e79..6ad59847bb 100644
--- a/src/meshTools/indexedOctree/indexedOctree.H
+++ b/src/meshTools/indexedOctree/indexedOctree.H
@@ -546,7 +546,7 @@ public:
 
             //- Find (in no particular order) indices of all shapes inside or
             //  overlapping bounding box (i.e. all shapes not outside box)
-            labelList findBox(const boundBox& bb) const;
+            labelList findBox(const treeBoundBox& bb) const;
 
             //- Find deepest node (as parent+octant) containing point. Starts
             //  off from starting index in nodes_ (use 0 to start from top)

From 67f6d9828896478b5a7d39c43873b483ca5ac3ed Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 2 Mar 2010 12:16:01 +0000
Subject: [PATCH 19/25] BUG: build order not correct for reconstruct library to
 be built.

---
 src/Allwmake | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Allwmake b/src/Allwmake
index 2f6d198d8e..6822aac23b 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -27,16 +27,18 @@ wmake libso edgeMesh
 wmake libso surfMesh
 wmake libso triSurface
 
-# Decomposition methods needed by meshTools
+# Decomposition methods needed by dummyThirdParty
 parallel/AllwmakeLnInclude
+# dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
 dummyThirdParty/Allwmake
-wmake libso parallel/decompositionMethods
-wmake libso parallel/metisDecomp
 
 wmake libso meshTools
 wmake libso finiteVolume
 wmake libso genericPatchFields
 
+# Build the proper scotchDecomp, metisDecomp etc.
+parallel/Allwmake
+
 wmake libso sampling
 
 wmake libso dynamicMesh

From 62c2f4d1bb9742c9045f2f1f341a08c47c1eaa2e Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 3 Mar 2010 09:30:11 +0000
Subject: [PATCH 20/25] Corrected header formatting.

---
 bin/foamUpdateCaseFileHeader | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/foamUpdateCaseFileHeader b/bin/foamUpdateCaseFileHeader
index f72035b134..4fbfa20dbb 100755
--- a/bin/foamUpdateCaseFileHeader
+++ b/bin/foamUpdateCaseFileHeader
@@ -59,8 +59,8 @@ printHeader() {
 | =========                 |                                                 |
 | \\\\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\\\    /   O peration     | Version:  ${foamVersion}  |
-|   \\\\  /    A nd           |                                                 |
-|    \\\\/     M anipulation  |                                www.OpenFOAM.org |
+|   \\\\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\\\/     M anipulation  |                                                 |
 \\*---------------------------------------------------------------------------*/
 FoamFile
 {

From 60a18983994ebe925ebb86a8516ad7f926192959 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 3 Mar 2010 14:59:02 +0000
Subject: [PATCH 21/25] STYLE: Fixed creation date

---
 .../sampledTriSurfaceMesh/sampledTriSurfaceMesh.C             | 4 ++--
 .../sampledTriSurfaceMesh/sampledTriSurfaceMesh.H             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index 58b200832b..7e9274616e 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,7 +146,7 @@ bool Foam::sampledTriSurfaceMesh::update()
 
     // Find the cells the triangles of the surface are in.
     // Does approximation by looking at the face centres only
-    const pointField fc = surface_.faceCentres();
+    const pointField& fc = surface_.faceCentres();
 
     cellLabels_.setSize(fc.size());
 
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
index 1c1aabebcf..eef8a16224 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From af32ffeaad6455525484c1f1b60cdcee50bb9cd0 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 3 Mar 2010 14:59:39 +0000
Subject: [PATCH 22/25] ENH: Implement gradient coupled temperature bc as
 fixedGradient instead of fixedValue.

---
 ...allHeatFluxTemperatureFvPatchScalarField.C | 29 ++++++++++---------
 ...allHeatFluxTemperatureFvPatchScalarField.H |  4 +--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C
index b1f8c3bed2..5013a4e6a2 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C
@@ -38,7 +38,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF),
+    fixedGradientFvPatchScalarField(p, iF),
     q_(p.size(), 0.0),
     KName_("undefined-K")
 {}
@@ -53,7 +53,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    fixedGradientFvPatchScalarField(ptf, p, iF, mapper),
     q_(ptf.q_, mapper),
     KName_(ptf.KName_)
 {}
@@ -67,7 +67,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict),
+    fixedGradientFvPatchScalarField(p, iF, dict),
     q_("q", dict, p.size()),
     KName_(dict.lookup("K"))
 {}
@@ -79,7 +79,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField
     const solidWallHeatFluxTemperatureFvPatchScalarField& tppsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf),
+    fixedGradientFvPatchScalarField(tppsf),
     q_(tppsf.q_),
     KName_(tppsf.KName_)
 {}
@@ -92,7 +92,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF),
+    fixedGradientFvPatchScalarField(tppsf, iF),
     q_(tppsf.q_),
     KName_(tppsf.KName_)
 {}
@@ -105,7 +105,7 @@ void Foam::solidWallHeatFluxTemperatureFvPatchScalarField::autoMap
     const fvPatchFieldMapper& m
 )
 {
-    fixedValueFvPatchScalarField::autoMap(m);
+    fixedGradientFvPatchScalarField::autoMap(m);
     q_.autoMap(m);
 }
 
@@ -116,7 +116,7 @@ void Foam::solidWallHeatFluxTemperatureFvPatchScalarField::rmap
     const labelList& addr
 )
 {
-    fixedValueFvPatchScalarField::rmap(ptf, addr);
+    fixedGradientFvPatchScalarField::rmap(ptf, addr);
 
     const solidWallHeatFluxTemperatureFvPatchScalarField& hfptf =
         refCast<const solidWallHeatFluxTemperatureFvPatchScalarField>(ptf);
@@ -132,14 +132,14 @@ void Foam::solidWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const scalarField& Kw =
-        patch().lookupPatchField<volScalarField, scalar>(KName_);
+    const scalarField& Kw = patch().lookupPatchField<volScalarField, scalar>
+    (
+        KName_
+    );
 
-    const fvPatchScalarField& Tw = *this;
+    gradient() = q_/Kw;
 
-    operator==(q_/(patch().deltaCoeffs()*Kw) + Tw.patchInternalField());
-
-    fixedValueFvPatchScalarField::updateCoeffs();
+    fixedGradientFvPatchScalarField::updateCoeffs();
 }
 
 
@@ -148,9 +148,10 @@ void Foam::solidWallHeatFluxTemperatureFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fixedValueFvPatchScalarField::write(os);
+    fixedGradientFvPatchScalarField::write(os);
     q_.writeEntry("q", os);
     os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl;
+    this->writeEntry("value", os);
 }
 
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H
index 85a1ef1cf1..d621e4d15a 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H
@@ -46,7 +46,7 @@ SourceFiles
 #ifndef solidWallHeatFluxTemperatureFvPatchScalarField_H
 #define solidWallHeatFluxTemperatureFvPatchScalarField_H
 
-#include "fixedValueFvPatchFields.H"
+#include "fixedGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -59,7 +59,7 @@ namespace Foam
 
 class solidWallHeatFluxTemperatureFvPatchScalarField
 :
-    public fixedValueFvPatchScalarField
+    public fixedGradientFvPatchScalarField
 {
     // Private data
 

From 1a87cd16fbdd2f12b68130e357dd309f101449ce Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 4 Mar 2010 13:45:44 +0000
Subject: [PATCH 23/25] ENH: Add averaging to all iso-surface based
 sampledSurfaces.

The optional 'average' switch causes use of the average-of-pointvalues
instead of the original volField.
---
 .../distanceSurface/distanceSurface.C         |   1 +
 .../distanceSurface/distanceSurface.H         |   3 +
 .../distanceSurfaceTemplates.C                |  10 +-
 .../isoSurface/sampledIsoSurface.C            | 100 +-----------------
 .../isoSurface/sampledIsoSurface.H            |  12 ---
 .../isoSurface/sampledIsoSurfaceTemplates.C   |  20 +++-
 .../sampledCuttingPlane/sampledCuttingPlane.C |   1 +
 .../sampledCuttingPlane/sampledCuttingPlane.H |   3 +
 .../sampledCuttingPlaneTemplates.C            |  20 +++-
 .../sampledSurface/sampledSurface.H           |   7 ++
 .../sampledSurface/sampledSurfaceTemplates.C  |  55 ++++++++++
 11 files changed, 120 insertions(+), 112 deletions(-)

diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.C b/src/sampling/sampledSurface/distanceSurface/distanceSurface.C
index 888b51b9c6..92e8694874 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.C
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.C
@@ -284,6 +284,7 @@ Foam::distanceSurface::distanceSurface
     distance_(readScalar(dict.lookup("distance"))),
     signed_(readBool(dict.lookup("signed"))),
     regularise_(dict.lookupOrDefault("regularise", true)),
+    average_(dict.lookupOrDefault("average", false)),
     zoneName_(word::null),
     needsUpdate_(true),
     isoSurfPtr_(NULL),
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
index b46546abbf..9fd2ffd9f0 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
@@ -68,6 +68,9 @@ class distanceSurface
         //- Whether to coarsen
         const Switch regularise_;
 
+        //- Whether to recalculate cell values as average of point values
+        const Switch average_;
+
         //- zone name (if restricted to zones)
         word zoneName_;
 
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C b/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C
index 1a66028f95..ea54214fb6 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C
@@ -62,7 +62,15 @@ Foam::distanceSurface::interpolateField
     );
 
     // Sample.
-    return surface().interpolate(volFld, pointFld());
+    return surface().interpolate
+    (
+        (
+            average_
+          ? pointAverage(pointFld())()
+          : volFld
+        ),
+        pointFld()
+    );
 }
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 235af8607a..11a0d74cae 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -164,7 +164,10 @@ void Foam::sampledIsoSurface::getIsoFields() const
         // point field.
         if (average_)
         {
-            storedVolFieldPtr_.reset(average(fvm, *pointFieldPtr_).ptr());
+            storedVolFieldPtr_.reset
+            (
+                pointAverage(*pointFieldPtr_).ptr()
+            );
             volFieldPtr_ = storedVolFieldPtr_.operator->();
         }
 
@@ -265,7 +268,7 @@ void Foam::sampledIsoSurface::getIsoFields() const
         {
             storedVolSubFieldPtr_.reset
             (
-                average(subFvm, *pointSubFieldPtr_).ptr()
+                pointAverage(*pointSubFieldPtr_).ptr()
             );
             volSubFieldPtr_ = storedVolSubFieldPtr_.operator->();
         }
@@ -286,99 +289,6 @@ void Foam::sampledIsoSurface::getIsoFields() const
 }
 
 
-Foam::tmp<Foam::volScalarField> Foam::sampledIsoSurface::average
-(
-    const fvMesh& mesh,
-    const pointScalarField& pfld
-) const
-{
-    tmp<volScalarField> tcellAvg
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "cellAvg",
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE,
-                false
-            ),
-            mesh,
-            dimensionedScalar("zero", dimless, scalar(0.0))
-        )
-    );
-    volScalarField& cellAvg = tcellAvg();
-
-    labelField nPointCells(mesh.nCells(), 0);
-    {
-        for (label pointI = 0; pointI < mesh.nPoints(); pointI++)
-        {
-            const labelList& pCells = mesh.pointCells(pointI);
-
-            forAll(pCells, i)
-            {
-                label cellI = pCells[i];
-
-                cellAvg[cellI] += pfld[pointI];
-                nPointCells[cellI]++;
-            }
-        }
-    }
-    forAll(cellAvg, cellI)
-    {
-        cellAvg[cellI] /= nPointCells[cellI];
-    }
-    // Give value to calculatedFvPatchFields
-    cellAvg.correctBoundaryConditions();
-
-    return tcellAvg;
-}
-
-
-Foam::tmp<Foam::pointScalarField> Foam::sampledIsoSurface::average
-(
-    const pointMesh& pMesh,
-    const volScalarField& fld
-) const
-{
-    tmp<pointScalarField> tpointAvg
-    (
-        new pointScalarField
-        (
-            IOobject
-            (
-                "pointAvg",
-                fld.time().timeName(),
-                fld.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE,
-                false
-            ),
-            pMesh,
-            dimensionedScalar("zero", dimless, scalar(0.0))
-        )
-    );
-    pointScalarField& pointAvg = tpointAvg();
-
-    for (label pointI = 0; pointI < fld.mesh().nPoints(); pointI++)
-    {
-        const labelList& pCells = fld.mesh().pointCells(pointI);
-
-        forAll(pCells, i)
-        {
-            pointAvg[pointI] += fld[pCells[i]];
-        }
-        pointAvg[pointI] /= pCells.size();
-    }
-    // Give value to calculatedFvPatchFields
-    pointAvg.correctBoundaryConditions();
-
-    return tpointAvg;
-}
-
-
 bool Foam::sampledIsoSurface::updateGeometry() const
 {
     const fvMesh& fvm = static_cast<const fvMesh&>(mesh());
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
index ccaa4d8750..990ee4c476 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
@@ -118,18 +118,6 @@ class sampledIsoSurface
         //- Get fields needed to recreate iso surface.
         void getIsoFields() const;
 
-        tmp<volScalarField> average
-        (
-            const fvMesh&,
-            const pointScalarField&
-        ) const;
-
-        tmp<pointScalarField> average
-        (
-            const pointMesh&,
-            const volScalarField& fld
-        ) const;
-
         //- Create iso surface (if time has changed)
         //  Do nothing (and return false) if no update was needed
         bool updateGeometry() const;
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
index a8dfa78506..40f05bd206 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
@@ -71,7 +71,15 @@ Foam::sampledIsoSurface::interpolateField
             volPointInterpolation::New(volSubFld.mesh()).interpolate(volSubFld);
 
         // Sample.
-        return surface().interpolate(volSubFld, tpointSubFld());
+        return surface().interpolate
+        (
+            (
+                average_
+              ? pointAverage(tpointSubFld())()
+              : volSubFld
+            ),
+            tpointSubFld()
+        );
     }
     else
     {
@@ -79,7 +87,15 @@ Foam::sampledIsoSurface::interpolateField
             volPointInterpolation::New(volFld.mesh()).interpolate(volFld);
 
         // Sample.
-        return surface().interpolate(volFld, tpointFld());
+        return surface().interpolate
+        (
+            (
+                average_
+              ? pointAverage(tpointFld())()
+              : volFld
+            ),
+            tpointFld()
+        );
     }
 }
 
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
index 2bcf3784b6..5e369ed533 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
@@ -254,6 +254,7 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
     plane_(dict),
     mergeTol_(dict.lookupOrDefault("mergeTol", 1E-6)),
     regularise_(dict.lookupOrDefault("regularise", true)),
+    average_(dict.lookupOrDefault("average", false)),
     zoneID_(dict.lookupOrDefault("zone", word::null), mesh.cellZones()),
     exposedPatchName_(word::null),
     needsUpdate_(true),
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
index fcf14db8bd..54e0f6627c 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
@@ -66,6 +66,9 @@ class sampledCuttingPlane
         //- Whether to coarsen
         const Switch regularise_;
 
+        //- Whether to recalculate cell values as average of point values
+        const Switch average_;
+
         //- zone name/index (if restricted to zones)
         mutable cellZoneID zoneID_;
 
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
index ad1d97ffe9..ea0ed6bf47 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
@@ -67,7 +67,15 @@ Foam::sampledCuttingPlane::interpolateField
             volPointInterpolation::New(volSubFld.mesh()).interpolate(volSubFld);
 
         // Sample.
-        return surface().interpolate(volSubFld, tpointSubFld());
+        return surface().interpolate
+        (
+            (
+                average_
+              ? pointAverage(tpointSubFld())()
+              : volSubFld
+            ),
+            tpointSubFld()
+        );
     }
     else
     {
@@ -77,7 +85,15 @@ Foam::sampledCuttingPlane::interpolateField
         );
 
         // Sample.
-        return surface().interpolate(volFld, tpointFld());
+        return surface().interpolate
+        (
+            (
+                average_
+              ? pointAverage(tpointFld())()
+              : volFld
+            ),
+            tpointFld()
+        );
     }
 }
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
index 265b5c3db7..837e8aa159 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
@@ -312,6 +312,13 @@ public:
         //- Project field onto surface
         tmp<Field<vector> > project(const Field<tensor>&) const;
 
+        //- Interpolate from points to cell centre
+        template<class Type>
+        tmp<GeometricField<Type, fvPatchField, volMesh> > pointAverage
+        (
+            const GeometricField<Type, pointPatchField, pointMesh>& pfld
+        ) const;
+
         //- Sample field on surface
         virtual tmp<scalarField> sample
         (
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
index 3aff356cef..d943792bd2 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
@@ -155,4 +155,59 @@ Foam::sampledSurface::project
 }
 
 
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::sampledSurface::pointAverage
+(
+    const GeometricField<Type, pointPatchField, pointMesh>& pfld
+) const
+{
+    const fvMesh& mesh = dynamic_cast<const fvMesh&>(pfld.mesh()());
+
+    tmp<GeometricField<Type, fvPatchField, volMesh> > tcellAvg
+    (
+        new GeometricField<Type, fvPatchField, volMesh>
+        (
+            IOobject
+            (
+                "cellAvg",
+                mesh.time().timeName(),
+                pfld.db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            mesh,
+            dimensioned<Type>("zero", dimless, pTraits<Type>::zero)
+        )
+    );
+    GeometricField<Type, fvPatchField, volMesh>& cellAvg = tcellAvg();
+
+    labelField nPointCells(mesh.nCells(), 0);
+    {
+        for (label pointI = 0; pointI < mesh.nPoints(); pointI++)
+        {
+            const labelList& pCells = mesh.pointCells(pointI);
+
+            forAll(pCells, i)
+            {
+                label cellI = pCells[i];
+
+                cellAvg[cellI] += pfld[pointI];
+                nPointCells[cellI]++;
+            }
+        }
+    }
+    forAll(cellAvg, cellI)
+    {
+        cellAvg[cellI] /= nPointCells[cellI];
+    }
+    // Give value to calculatedFvPatchFields
+    cellAvg.correctBoundaryConditions();
+
+    return tcellAvg;
+}
+
+
+
 // ************************************************************************* //

From edeb20c856d963bb0873c9558760a3f9f03f7277 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 4 Mar 2010 13:47:09 +0000
Subject: [PATCH 24/25] ENH: Added faceZones support. Reverted back to using
 scheduled comms (less memory)

---
 .../foamToEnsight/ensightField.C              |  388 +++--
 .../foamToEnsight/ensightMesh.C               | 1332 ++++++++++-------
 .../foamToEnsight/ensightMesh.H               |   77 +-
 .../foamToEnsight/foamToEnsight.C             |    9 +
 4 files changed, 1157 insertions(+), 649 deletions(-)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index 1204ac5976..e446dcac89 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -110,40 +110,30 @@ void writeAllData
 {
     if (nPrims)
     {
-        PstreamBuffers pBufs(Pstream::nonBlocking);
-
-        if (!Pstream::master())
-        {
-            UOPstream toMaster(Pstream::masterNo(), pBufs);
-            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
-            {
-                toMaster<< map(vf, prims, cmpt);
-            }
-        }
-
-        pBufs.finishedSends();
-
         if (Pstream::master())
         {
             ensightFile << key << nl;
 
-            PtrList<UIPstream> fromSlaves(Pstream::nProcs());
-            for (int slave=1; slave<Pstream::nProcs(); slave++)
-            {
-                fromSlaves.set(slave, new UIPstream(slave, pBufs));
-            }
-
             for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
             {
                 writeData(map(vf, prims, cmpt), ensightFile);
 
                 for (int slave=1; slave<Pstream::nProcs(); slave++)
                 {
-                    scalarField data(fromSlaves[slave]);
+                    IPstream fromSlave(Pstream::scheduled, slave);
+                    scalarField data(fromSlave);
                     writeData(data, ensightFile);
                 }
             }
         }
+        else
+        {
+            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+            {
+                OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+                toMaster<< map(vf, prims, cmpt);
+            }
+        }
     }
 }
 
@@ -160,40 +150,30 @@ void writeAllDataBinary
 {
     if (nPrims)
     {
-        PstreamBuffers pBufs(Pstream::nonBlocking);
-
-        if (!Pstream::master())
-        {
-            UOPstream toMaster(Pstream::masterNo(), pBufs);
-            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
-            {
-                toMaster<< map(vf, prims, cmpt);
-            }
-        }
-
-        pBufs.finishedSends();
-
         if (Pstream::master())
         {
             writeEnsDataBinary(key,ensightFile);
 
-            PtrList<UIPstream> fromSlaves(Pstream::nProcs());
-            for (int slave=1; slave<Pstream::nProcs(); slave++)
-            {
-                fromSlaves.set(slave, new UIPstream(slave, pBufs));
-            }
-
             for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
             {
                 writeEnsDataBinary(map(vf, prims, cmpt), ensightFile);
 
                 for (int slave=1; slave<Pstream::nProcs(); slave++)
                 {
-                    scalarField data(fromSlaves[slave]);
+                    IPstream fromSlave(Pstream::scheduled, slave);
+                    scalarField data(fromSlave);
                     writeEnsDataBinary(data, ensightFile);
                 }
             }
         }
+        else
+        {
+            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+            {
+                OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+                toMaster<< map(vf, prims, cmpt);
+            }
+        }
     }
 }
 
@@ -210,40 +190,31 @@ void writeAllFaceData
 {
     if (nPrims)
     {
-        PstreamBuffers pBufs(Pstream::nonBlocking);
-
-        if (!Pstream::master())
-        {
-            UOPstream toMaster(Pstream::masterNo(), pBufs);
-            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
-            {
-                toMaster<< map(pf, prims, cmpt);
-            }
-        }
-
-        pBufs.finishedSends();
-
         if (Pstream::master())
         {
             ensightFile << key << nl;
 
-            PtrList<UIPstream> fromSlaves(Pstream::nProcs());
-            for (int slave=1; slave<Pstream::nProcs(); slave++)
-            {
-                fromSlaves.set(slave, new UIPstream(slave, pBufs));
-            }
-
             for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
             {
                 writeData(map(pf, prims, cmpt), ensightFile);
 
                 for (int slave=1; slave<Pstream::nProcs(); slave++)
                 {
-                    scalarField pf(fromSlaves[slave]);
+                    IPstream fromSlave(Pstream::scheduled, slave);
+                    scalarField pf(fromSlave);
+
                     writeData(pf, ensightFile);
                 }
             }
         }
+        else
+        {
+            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+            {
+                OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+                toMaster<< map(pf, prims, cmpt);
+            }
+        }
     }
 }
 
@@ -260,40 +231,31 @@ void writeAllFaceDataBinary
 {
     if (nPrims)
     {
-        PstreamBuffers pBufs(Pstream::nonBlocking);
-
-        if (!Pstream::master())
-        {
-            UOPstream toMaster(Pstream::masterNo(), pBufs);
-            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
-            {
-                toMaster<< map(pf, prims, cmpt);
-            }
-        }
-
-        pBufs.finishedSends();
-
         if (Pstream::master())
         {
             writeEnsDataBinary(key,ensightFile);
 
-            PtrList<UIPstream> fromSlaves(Pstream::nProcs());
-            for (int slave=1; slave<Pstream::nProcs(); slave++)
-            {
-                fromSlaves.set(slave, new UIPstream(slave, pBufs));
-            }
-
             for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
             {
                 writeEnsDataBinary(map(pf, prims, cmpt), ensightFile);
 
                 for (int slave=1; slave<Pstream::nProcs(); slave++)
                 {
-                    scalarField pf(fromSlaves[slave]);
+                    IPstream fromSlave(Pstream::scheduled, slave);
+                    scalarField pf(fromSlave);
+
                     writeEnsDataBinary(pf, ensightFile);
                 }
             }
         }
+        else
+        {
+            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+            {
+                OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+                toMaster<< map(pf, prims, cmpt);
+            }
+        }
     }
 }
 
@@ -539,6 +501,10 @@ void ensightFieldAscii
     const wordHashSet& patchNames = eMesh.patchNames();
     const HashTable<ensightMesh::nFacePrimitives>&
         nPatchPrims = eMesh.nPatchPrims();
+    const List<faceSets>& faceZoneFaceSets = eMesh.faceZoneFaceSets();
+    const wordHashSet& faceZoneNames = eMesh.faceZoneNames();
+    const HashTable<ensightMesh::nFacePrimitives>&
+        nFaceZonePrims = eMesh.nFaceZonePrims();
 
     const labelList& tets = meshCellSets.tets;
     const labelList& pyrs = meshCellSets.pyrs;
@@ -557,7 +523,7 @@ void ensightFieldAscii
             postProcPath/ensightFileName,
             runTime.writeFormat(),
             runTime.writeVersion(),
-            runTime.writeCompression()
+            IOstream::UNCOMPRESSED
         );
     }
 
@@ -567,6 +533,8 @@ void ensightFieldAscii
 
     if (patchNames.empty())
     {
+        eMesh.barrier();
+
         if (Pstream::master())
         {
             if (timeIndex == 0)
@@ -592,29 +560,10 @@ void ensightFieldAscii
 
         if (meshCellSets.nHexesWedges)
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
-
-            if (!Pstream::master())
-            {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
-                {
-                    toMaster<< map(vf, hexes, wedges, cmpt);
-                }
-            }
-
-            pBufs.finishedSends();
-
             if (Pstream::master())
             {
                 ensightFile << "hexa8" << nl;
 
-                PtrList<UIPstream> fromSlaves(Pstream::nProcs());
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    fromSlaves.set(slave, new UIPstream(slave, pBufs));
-                }
-
                 for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
                 {
                     writeData
@@ -625,17 +574,57 @@ void ensightFieldAscii
 
                     for (int slave=1; slave<Pstream::nProcs(); slave++)
                     {
-                        scalarField data(fromSlaves[slave]);
+                        IPstream fromSlave(Pstream::scheduled, slave);
+                        scalarField data(fromSlave);
                         writeData(data, ensightFile);
                     }
                 }
             }
+            else
+            {
+                for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+                {
+                    OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+                    toMaster<< map(vf, hexes, wedges, cmpt);
+                }
+            }
         }
 
-        writeAllData("penta6", vf, prisms, meshCellSets.nPrisms, ensightFile);
-        writeAllData("pyramid5", vf, pyrs, meshCellSets.nPyrs, ensightFile);
-        writeAllData("tetra4", vf, tets, meshCellSets.nTets, ensightFile);
-        writeAllData("nfaced", vf, polys, meshCellSets.nPolys, ensightFile);
+        writeAllData
+        (
+            "penta6",
+            vf,
+            prisms,
+            meshCellSets.nPrisms,
+            ensightFile
+        );
+
+        writeAllData
+        (
+            "pyramid5",
+            vf,
+            pyrs,
+            meshCellSets.nPyrs,
+            ensightFile
+        );
+
+        writeAllData
+        (
+            "tetra4",
+            vf,
+            tets,
+            meshCellSets.nTets,
+            ensightFile
+        );
+
+        writeAllData
+        (
+            "nfaced",
+            vf,
+            polys,
+            meshCellSets.nPolys,
+            ensightFile
+        );
     }
 
     label ensightPatchI = eMesh.patchPartOffset();
@@ -644,6 +633,8 @@ void ensightFieldAscii
     {
         const word& patchName = allPatchNames[patchi];
 
+        eMesh.barrier();
+
         if (patchNames.empty() || patchNames.found(patchName))
         {
             if
@@ -664,6 +655,80 @@ void ensightFieldAscii
         }
     }
 
+    // write faceZones, if requested
+    if (faceZoneNames.size())
+    {
+        // Interpolates cell values to faces - needed only when exporting
+        // faceZones...
+        GeometricField<Type, fvsPatchField, surfaceMesh> sf
+        (
+            linearInterpolate(vf)
+        );
+
+        forAllConstIter(wordHashSet, faceZoneNames, iter)
+        {
+            const word& faceZoneName = iter.key();
+
+            eMesh.barrier();
+
+            label zoneID = mesh.faceZones().findZoneID(faceZoneName);
+
+            const faceZone& fz = mesh.faceZones()[zoneID];
+
+            // Prepare data to write
+            label nIncluded = 0;
+            forAll(fz, i)
+            {
+                if (eMesh.faceToBeIncluded(fz[i]))
+                {
+                    ++nIncluded;
+                }
+            }
+
+            Field<Type> values(nIncluded);
+
+            // Loop on the faceZone and store the needed field values
+            label j = 0;
+            forAll(fz, i)
+            {
+                label faceI = fz[i];
+                if (mesh.isInternalFace(faceI))
+                {
+                    values[j] = sf[faceI];
+                    ++j;
+                }
+                else
+                {
+                    if (eMesh.faceToBeIncluded(faceI))
+                    {
+                        label patchI = mesh.boundaryMesh().whichPatch(faceI);
+                        const polyPatch& pp = mesh.boundaryMesh()[patchI];
+                        label patchFaceI = pp.whichFace(faceI);
+                        Type value = sf.boundaryField()[patchI][patchFaceI];
+                        values[j] = value;
+                        ++j;
+                    }
+                }
+            }
+
+            if
+            (
+                writePatchField
+                (
+                    values,
+                    zoneID,
+                    ensightPatchI,
+                    faceZoneFaceSets[zoneID],
+                    nFaceZonePrims.find(faceZoneName)(),
+                    ensightFile
+                )
+            )
+            {
+                ensightPatchI++;
+            }
+        }
+    }
+
     if (Pstream::master())
     {
         delete ensightFilePtr;
@@ -695,6 +760,10 @@ void ensightFieldBinary
     const wordHashSet& patchNames = eMesh.patchNames();
     const HashTable<ensightMesh::nFacePrimitives>&
         nPatchPrims = eMesh.nPatchPrims();
+    const List<faceSets>& faceZoneFaceSets = eMesh.faceZoneFaceSets();
+    const wordHashSet& faceZoneNames = eMesh.faceZoneNames();
+    const HashTable<ensightMesh::nFacePrimitives>&
+        nFaceZonePrims = eMesh.nFaceZonePrims();
 
     const labelList& tets = meshCellSets.tets;
     const labelList& pyrs = meshCellSets.pyrs;
@@ -722,6 +791,8 @@ void ensightFieldBinary
 
     if (patchNames.empty())
     {
+        eMesh.barrier();
+
         if (Pstream::master())
         {
             if (timeIndex == 0)
@@ -743,29 +814,10 @@ void ensightFieldBinary
 
         if (meshCellSets.nHexesWedges)
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
-
-            if (!Pstream::master())
-            {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
-                {
-                    toMaster<< map(vf, hexes, wedges, cmpt);
-                }
-            }
-
-            pBufs.finishedSends();
-
             if (Pstream::master())
             {
                 writeEnsDataBinary("hexa8",ensightFile);
 
-                PtrList<UIPstream> fromSlaves(Pstream::nProcs());
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    fromSlaves.set(slave, new UIPstream(slave, pBufs));
-                }
-
                 for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
                 {
                     writeEnsDataBinary
@@ -776,11 +828,20 @@ void ensightFieldBinary
 
                     for (int slave=1; slave<Pstream::nProcs(); slave++)
                     {
-                        scalarField data(fromSlaves[slave]);
+                        IPstream fromSlave(Pstream::scheduled, slave);
+                        scalarField data(fromSlave);
                         writeEnsDataBinary(data, ensightFile);
                     }
                 }
             }
+            else
+            {
+                for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+                {
+                    OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+                    toMaster<< map(vf, hexes, wedges, cmpt);
+                }
+            }
         }
 
         writeAllDataBinary
@@ -826,6 +887,8 @@ void ensightFieldBinary
     {
         const word& patchName = allPatchNames[patchi];
 
+        eMesh.barrier();
+
         if (patchNames.empty() || patchNames.found(patchName))
         {
             if
@@ -844,6 +907,81 @@ void ensightFieldBinary
                 ensightPatchI++;
             }
         }
+
+    }
+
+    // write faceZones, if requested
+    if (faceZoneNames.size())
+    {
+        // Interpolates cell values to faces - needed only when exporting
+        // faceZones...
+        GeometricField<Type, fvsPatchField, surfaceMesh> sf
+        (
+            linearInterpolate(vf)
+        );
+
+        forAllConstIter(wordHashSet, faceZoneNames, iter)
+        {
+            const word& faceZoneName = iter.key();
+
+            eMesh.barrier();
+
+            label zoneID = mesh.faceZones().findZoneID(faceZoneName);
+
+            const faceZone& fz = mesh.faceZones()[zoneID];
+
+            // Prepare data to write
+            label nIncluded = 0;
+            forAll(fz, i)
+            {
+                if (eMesh.faceToBeIncluded(fz[i]))
+                {
+                    ++nIncluded;
+                }
+            }
+
+            Field<Type> values(nIncluded);
+
+            // Loop on the faceZone and store the needed field values
+            label j = 0;
+            forAll(fz, i)
+            {
+                label faceI = fz[i];
+                if (mesh.isInternalFace(faceI))
+                {
+                    values[j] = sf[faceI];
+                    ++j;
+                }
+                else
+                {
+                    if (eMesh.faceToBeIncluded(faceI))
+                    {
+                        label patchI = mesh.boundaryMesh().whichPatch(faceI);
+                        const polyPatch& pp = mesh.boundaryMesh()[patchI];
+                        label patchFaceI = pp.whichFace(faceI);
+                        Type value = sf.boundaryField()[patchI][patchFaceI];
+                        values[j] = value;
+                        ++j;
+                    }
+                }
+            }
+
+            if
+            (
+                writePatchFieldBinary
+                (
+                    values,
+                    zoneID,
+                    ensightPatchI,
+                    faceZoneFaceSets[zoneID],
+                    nFaceZonePrims.find(faceZoneName)(),
+                    ensightFile
+                )
+            )
+            {
+                ensightPatchI++;
+            }
+        }
     }
 
     if (Pstream::master())
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index 5f848736be..daece0473b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -30,11 +30,14 @@ License
 #include "fvMesh.H"
 #include "globalMeshData.H"
 #include "PstreamCombineReduceOps.H"
+#include "processorPolyPatch.H"
 #include "cellModeller.H"
 #include "IOmanip.H"
 #include "itoa.H"
 #include "ensightWriteBinary.H"
+#include "globalIndex.H"
 #include "mapDistribute.H"
+#include "stringListOps.H"
 
 #include <fstream>
 
@@ -56,7 +59,11 @@ Foam::ensightMesh::ensightMesh
     boundaryFaceSets_(mesh_.boundary().size()),
     allPatchNames_(0),
     patchNames_(0),
-    nPatchPrims_(0)
+    nPatchPrims_(0),
+    faceZoneFaceSets_(mesh_.faceZones().size()),
+    faceZoneNames_(0),
+    nFaceZonePrims_(0),
+    boundaryFaceToBeIncluded_(0)
 {
     const cellShapeList& cellShapes = mesh.cellShapes();
 
@@ -80,10 +87,7 @@ Foam::ensightMesh::ensightMesh
 
         if (args.optionFound("patches"))
         {
-            wordList patchNameList
-            (
-                args.optionLookup("patches")()
-            );
+            wordList patchNameList(args.optionLookup("patches")());
 
             if (patchNameList.empty())
             {
@@ -218,7 +222,6 @@ Foam::ensightMesh::ensightMesh
         }
     }
 
-
     forAll(allPatchNames_, patchi)
     {
         const word& patchName = allPatchNames_[patchi];
@@ -240,6 +243,133 @@ Foam::ensightMesh::ensightMesh
 
         nPatchPrims_.insert(patchName, nfp);
     }
+
+    // faceZones
+    if (args.optionFound("faceZones"))
+    {
+        wordList patchNameList(args.optionLookup("faceZones")());
+
+        const wordList faceZoneNamesAll = mesh_.faceZones().names();
+
+        // Find out faceZone names that match with what requested at command
+        // line
+        forAll(patchNameList, i)
+        {
+            labelList matches = findStrings(patchNameList[i], faceZoneNamesAll);
+
+            forAll(matches, matchI)
+            {
+                faceZoneNames_.insert(faceZoneNamesAll[matches[matchI]]);
+            }
+        }
+
+        // Build list of boundary faces to be exported
+        boundaryFaceToBeIncluded_.setSize
+        (
+            mesh_.nFaces()
+          - mesh_.nInternalFaces(),
+            1
+        );
+
+        forAll(mesh_.boundaryMesh(), patchI)
+        {
+            const polyPatch& pp = mesh_.boundaryMesh()[patchI];
+            if
+            (
+                isA<processorPolyPatch>(pp)
+             && !refCast<const processorPolyPatch>(pp).owner()
+            )
+            {
+                label bFaceI = pp.start()-mesh_.nInternalFaces();
+                forAll(pp, i)
+                {
+                    boundaryFaceToBeIncluded_[bFaceI++] = 0;
+                }
+            }
+        }
+
+        // Count face types in each faceZone
+        forAll(faceZoneNamesAll, zoneI)
+        {
+            //const word& zoneName = faceZoneNamesAll[zoneI];
+
+            const faceZone& fz = mesh.faceZones()[zoneI];
+
+            if (fz.size())
+            {
+                labelList& tris = faceZoneFaceSets_[zoneI].tris;
+                labelList& quads = faceZoneFaceSets_[zoneI].quads;
+                labelList& polys = faceZoneFaceSets_[zoneI].polys;
+
+                tris.setSize(fz.size());
+                quads.setSize(fz.size());
+                polys.setSize(fz.size());
+
+                label nTris = 0;
+                label nQuads = 0;
+                label nPolys = 0;
+
+                label faceCounter = 0;
+
+                forAll(fz, i)
+                {
+                    label faceI = fz[i];
+
+                    // Avoid counting faces on processor boundaries twice
+                    if (faceToBeIncluded(faceI))
+                    {
+                        const face& f = mesh_.faces()[faceI];
+
+                        if (f.size() == 3)
+                        {
+                            tris[nTris++] = faceCounter;
+                        }
+                        else if (f.size() == 4)
+                        {
+                            quads[nQuads++] = faceCounter;
+                        }
+                        else
+                        {
+                            polys[nPolys++] = faceCounter;
+                        }
+
+                        ++faceCounter;
+                    }
+                }
+
+                tris.setSize(nTris);
+                quads.setSize(nQuads);
+                polys.setSize(nPolys);
+            }
+        }
+
+        forAll(faceZoneNamesAll, zoneI)
+        {
+            const word& zoneName = faceZoneNamesAll[zoneI];
+            nFacePrimitives nfp;
+
+            if (faceZoneNames_.found(zoneName))
+            {
+                if
+                (
+                    faceZoneFaceSets_[zoneI].tris.size()
+                 || faceZoneFaceSets_[zoneI].quads.size() ||
+                    faceZoneFaceSets_[zoneI].polys.size()
+                )
+                {
+                    nfp.nTris   = faceZoneFaceSets_[zoneI].tris.size();
+                    nfp.nQuads  = faceZoneFaceSets_[zoneI].quads.size();
+                    nfp.nPolys  = faceZoneFaceSets_[zoneI].polys.size();
+                }
+            }
+
+            reduce(nfp.nTris, sumOp<label>());
+            reduce(nfp.nQuads, sumOp<label>());
+            reduce(nfp.nPolys, sumOp<label>());
+
+            nFaceZonePrims_.insert(zoneName, nfp);
+        }
+    }
 }
 
 
@@ -251,6 +381,30 @@ Foam::ensightMesh::~ensightMesh()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+bool Foam::ensightMesh::faceToBeIncluded(const label faceI) const
+{
+    bool res = false;
+
+    if (mesh_.isInternalFace(faceI))
+    {
+        res = true;
+    }
+    else
+    {
+        res = boundaryFaceToBeIncluded_[faceI-mesh_.nInternalFaces()];
+    }
+
+    return res;
+}
+
+
+void Foam::ensightMesh::barrier()
+{
+    label appI = 0;
+    reduce(appI,maxOp<label>());
+}
+
+
 void Foam::ensightMesh::writePoints
 (
     const scalarField& pointsComponent,
@@ -470,125 +624,106 @@ void Foam::ensightMesh::writeAllPolys
         }
 
         // Number of faces for each poly cell
+
+        if (Pstream::master())
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
-
-            if (!Pstream::master())
+            // Master
+            writePolysNFaces
+            (
+                meshCellSets_.polys,
+                cellFaces,
+                ensightGeometryFile
+            );
+            // Slaves
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                toMaster<< meshCellSets_.polys << cellFaces;
-            }
+                IPstream fromSlave(Pstream::scheduled, slave);
+                labelList polys(fromSlave);
+                cellList cellFaces(fromSlave);
 
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
-                // Master
                 writePolysNFaces
                 (
-                    meshCellSets_.polys,
+                    polys,
                     cellFaces,
                     ensightGeometryFile
                 );
-                // Slaves
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    UIPstream fromSlave(slave, pBufs);
-                    labelList polys(fromSlave);
-                    cellList cellFaces(fromSlave);
-
-                    writePolysNFaces
-                    (
-                        polys,
-                        cellFaces,
-                        ensightGeometryFile
-                    );
-                }
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< meshCellSets_.polys << cellFaces;
+        }
 
 
         // Number of points for each face of the above list
+        if (Pstream::master())
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
-
-            if (!Pstream::master())
+            // Master
+            writePolysNPointsPerFace
+            (
+                meshCellSets_.polys,
+                cellFaces,
+                faces,
+                ensightGeometryFile
+            );
+            // Slaves
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                toMaster<< meshCellSets_.polys << cellFaces << faces;
-            }
-            pBufs.finishedSends();
+                IPstream fromSlave(Pstream::scheduled, slave);
+                labelList polys(fromSlave);
+                cellList cellFaces(fromSlave);
+                faceList faces(fromSlave);
 
-            if (Pstream::master())
-            {
-                // Master
                 writePolysNPointsPerFace
                 (
-                    meshCellSets_.polys,
+                    polys,
                     cellFaces,
                     faces,
                     ensightGeometryFile
                 );
-                // Slaves
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    UIPstream fromSlave(slave, pBufs);
-                    labelList polys(fromSlave);
-                    cellList cellFaces(fromSlave);
-                    faceList faces(fromSlave);
-
-                    writePolysNPointsPerFace
-                    (
-                        polys,
-                        cellFaces,
-                        faces,
-                        ensightGeometryFile
-                    );
-                }
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< meshCellSets_.polys << cellFaces << faces;
+        }
 
 
         // List of points id for each face of the above list
+        if (Pstream::master())
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
-
-            if (!Pstream::master())
+            // Master
+            writePolysPoints
+            (
+                meshCellSets_.polys,
+                cellFaces,
+                faces,
+                ensightGeometryFile
+            );
+            // Slaves
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                toMaster<< meshCellSets_.polys << cellFaces << faces;
-            }
+                IPstream fromSlave(Pstream::scheduled, slave);
+                labelList polys(fromSlave);
+                cellList cellFaces(fromSlave);
+                faceList faces(fromSlave);
 
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
-                // Master
                 writePolysPoints
                 (
-                    meshCellSets_.polys,
+                    polys,
                     cellFaces,
                     faces,
                     ensightGeometryFile
                 );
-                // Slaves
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    UIPstream fromSlave(slave, pBufs);
-                    labelList polys(fromSlave);
-                    cellList cellFaces(fromSlave);
-                    faceList faces(fromSlave);
-
-                    writePolysPoints
-                    (
-                        polys,
-                        cellFaces,
-                        faces,
-                        ensightGeometryFile
-                    );
-                }
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< meshCellSets_.polys << cellFaces << faces;
+        }
     }
 }
 
@@ -683,124 +818,103 @@ void Foam::ensightMesh::writeAllPolysBinary
         }
 
         // Number of faces for each poly cell
+        if (Pstream::master())
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
-
-            if (!Pstream::master())
+            // Master
+            writePolysNFacesBinary
+            (
+                meshCellSets_.polys,
+                cellFaces,
+                ensightGeometryFile
+            );
+            // Slaves
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                toMaster<< meshCellSets_.polys << cellFaces;
-            }
+                IPstream fromSlave(Pstream::scheduled, slave);
+                labelList polys(fromSlave);
+                cellList cellFaces(fromSlave);
 
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
-                // Master
                 writePolysNFacesBinary
                 (
-                    meshCellSets_.polys,
+                    polys,
                     cellFaces,
                     ensightGeometryFile
                 );
-                // Slaves
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    UIPstream fromSlave(slave, pBufs);
-                    labelList polys(fromSlave);
-                    cellList cellFaces(fromSlave);
-
-                    writePolysNFacesBinary
-                    (
-                        polys,
-                        cellFaces,
-                        ensightGeometryFile
-                    );
-                }
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< meshCellSets_.polys << cellFaces;
+        }
 
         // Number of points for each face of the above list
+        if (Pstream::master())
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
-
-            if (!Pstream::master())
+            // Master
+            writePolysNPointsPerFaceBinary
+            (
+                meshCellSets_.polys,
+                cellFaces,
+                faces,
+                ensightGeometryFile
+            );
+            // Slaves
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                toMaster<< meshCellSets_.polys << cellFaces << faces;
-            }
+                IPstream fromSlave(Pstream::scheduled, slave);
+                labelList polys(fromSlave);
+                cellList cellFaces(fromSlave);
+                faceList faces(fromSlave);
 
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
-                // Master
                 writePolysNPointsPerFaceBinary
                 (
-                    meshCellSets_.polys,
+                    polys,
                     cellFaces,
                     faces,
                     ensightGeometryFile
                 );
-                // Slaves
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    UIPstream fromSlave(slave, pBufs);
-                    labelList polys(fromSlave);
-                    cellList cellFaces(fromSlave);
-                    faceList faces(fromSlave);
-
-                    writePolysNPointsPerFaceBinary
-                    (
-                        polys,
-                        cellFaces,
-                        faces,
-                        ensightGeometryFile
-                    );
-                }
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< meshCellSets_.polys << cellFaces << faces;
+        }
 
         // List of points id for each face of the above list
+        if (Pstream::master())
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
-
-            if (!Pstream::master())
+            // Master
+            writePolysPointsBinary
+            (
+                meshCellSets_.polys,
+                cellFaces,
+                faces,
+                ensightGeometryFile
+            );
+            // Slaves
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                toMaster<< meshCellSets_.polys << cellFaces << faces;
-            }
+                IPstream fromSlave(Pstream::scheduled, slave);
+                labelList polys(fromSlave);
+                cellList cellFaces(fromSlave);
+                faceList faces(fromSlave);
 
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
-                // Master
                 writePolysPointsBinary
                 (
-                    meshCellSets_.polys,
+                    polys,
                     cellFaces,
                     faces,
                     ensightGeometryFile
                 );
-                // Slaves
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    UIPstream fromSlave(slave, pBufs);
-                    labelList polys(fromSlave);
-                    cellList cellFaces(fromSlave);
-                    faceList faces(fromSlave);
-
-                    writePolysPointsBinary
-                    (
-                        polys,
-                        cellFaces,
-                        faces,
-                        ensightGeometryFile
-                    );
-                }
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< meshCellSets_.polys << cellFaces << faces;
+        }
     }
 }
 
@@ -815,16 +929,6 @@ void Foam::ensightMesh::writeAllPrims
 {
     if (nPrims)
     {
-        PstreamBuffers pBufs(Pstream::nonBlocking);
-
-        if (!Pstream::master())
-        {
-            UOPstream toMaster(Pstream::masterNo(), pBufs);
-            toMaster<< cellShapes;
-        }
-
-        pBufs.finishedSends();
-
         if (Pstream::master())
         {
             ensightGeometryFile << key << nl << setw(10) << nPrims << nl;
@@ -833,12 +937,17 @@ void Foam::ensightMesh::writeAllPrims
 
             for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UIPstream fromSlave(slave, pBufs);
+                IPstream fromSlave(Pstream::scheduled, slave);
                 cellShapeList cellShapes(fromSlave);
 
                 writePrims(cellShapes, ensightGeometryFile);
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< cellShapes;
+        }
     }
 }
 
@@ -853,16 +962,6 @@ void Foam::ensightMesh::writeAllPrimsBinary
 {
     if (nPrims)
     {
-        PstreamBuffers pBufs(Pstream::nonBlocking);
-
-        if (!Pstream::master())
-        {
-            UOPstream toMaster(Pstream::masterNo(), pBufs);
-            toMaster<< cellShapes;
-        }
-
-        pBufs.finishedSends();
-
         if (Pstream::master())
         {
             writeEnsDataBinary(key,ensightGeometryFile);
@@ -872,12 +971,17 @@ void Foam::ensightMesh::writeAllPrimsBinary
 
             for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UIPstream fromSlave(slave, pBufs);
+                IPstream fromSlave(Pstream::scheduled, slave);
                 cellShapeList cellShapes(fromSlave);
 
                 writePrimsBinary(cellShapes, ensightGeometryFile);
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< cellShapes;
+        }
     }
 }
 
@@ -930,16 +1034,6 @@ void Foam::ensightMesh::writeAllFacePrims
 {
     if (nPrims)
     {
-        PstreamBuffers pBufs(Pstream::nonBlocking);
-
-        if (!Pstream::master())
-        {
-            UOPstream toMaster(Pstream::masterNo(), pBufs);
-            toMaster<< UIndirectList<face>(patchFaces, prims);
-        }
-
-        pBufs.finishedSends();
-
         if (Pstream::master())
         {
             ensightGeometryFile << key << nl << setw(10) << nPrims << nl;
@@ -952,12 +1046,17 @@ void Foam::ensightMesh::writeAllFacePrims
 
             for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UIPstream fromSlave(slave, pBufs);
+                IPstream fromSlave(Pstream::scheduled, slave);
                 faceList patchFaces(fromSlave);
 
                 writeFacePrims(patchFaces, ensightGeometryFile);
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< UIndirectList<face>(patchFaces, prims);
+        }
     }
 }
 
@@ -1002,68 +1101,54 @@ void Foam::ensightMesh::writeAllNSided
         }
 
         // Number of points for each face
+        if (Pstream::master())
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
+            writeNSidedNPointsPerFace
+            (
+                UIndirectList<face>(patchFaces, prims)(),
+                ensightGeometryFile
+            );
 
-            if (!Pstream::master())
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                toMaster<< UIndirectList<face>(patchFaces, prims);
-            }
+                IPstream fromSlave(Pstream::scheduled, slave);
+                faceList patchFaces(fromSlave);
 
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
                 writeNSidedNPointsPerFace
                 (
-                    UIndirectList<face>(patchFaces, prims)(),
+                    patchFaces,
                     ensightGeometryFile
                 );
-
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    UIPstream fromSlave(slave, pBufs);
-                    faceList patchFaces(fromSlave);
-
-                    writeNSidedNPointsPerFace
-                    (
-                        patchFaces,
-                        ensightGeometryFile
-                    );
-                }
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< UIndirectList<face>(patchFaces, prims);
+        }
 
         // List of points id for each face
+        if (Pstream::master())
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
+            writeNSidedPoints
+            (
+                UIndirectList<face>(patchFaces, prims)(),
+                ensightGeometryFile
+            );
 
-            if (!Pstream::master())
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                toMaster<< UIndirectList<face>(patchFaces, prims);
-            }
-
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
-                writeNSidedPoints
-                (
-                    UIndirectList<face>(patchFaces, prims)(),
-                    ensightGeometryFile
-                );
-
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    UIPstream fromSlave(slave, pBufs);
-                    faceList patchFaces(fromSlave);
-
-                    writeNSidedPoints(patchFaces, ensightGeometryFile);
-                }
+                IPstream fromSlave(Pstream::scheduled, slave);
+                faceList patchFaces(fromSlave);
+
+                writeNSidedPoints(patchFaces, ensightGeometryFile);
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< UIndirectList<face>(patchFaces, prims);
+        }
     }
 }
 
@@ -1108,72 +1193,54 @@ void Foam::ensightMesh::writeAllNSidedBinary
         }
 
         // Number of points for each face
+        if (Pstream::master())
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
+            writeNSidedNPointsPerFaceBinary
+            (
+                UIndirectList<face>(patchFaces, prims)(),
+                ensightGeometryFile
+            );
 
-            if (!Pstream::master())
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                toMaster<< UIndirectList<face>(patchFaces, prims);
-            }
+                IPstream fromSlave(Pstream::scheduled, slave);
+                faceList patchFaces(fromSlave);
 
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
                 writeNSidedNPointsPerFaceBinary
                 (
-                    UIndirectList<face>(patchFaces, prims)(),
+                    patchFaces,
                     ensightGeometryFile
                 );
-
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    UIPstream fromSlave(slave, pBufs);
-                    faceList patchFaces(fromSlave);
-
-                    writeNSidedNPointsPerFaceBinary
-                    (
-                        patchFaces,
-                        ensightGeometryFile
-                    );
-                }
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< UIndirectList<face>(patchFaces, prims);
+        }
 
         // List of points id for each face
+        if (Pstream::master())
         {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
+            writeNSidedPointsBinary
+            (
+                UIndirectList<face>(patchFaces, prims)(),
+                ensightGeometryFile
+            );
 
-            if (!Pstream::master())
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                toMaster<< UIndirectList<face>(patchFaces, prims);
-            }
-
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
-                writeNSidedPointsBinary
-                (
-                    UIndirectList<face>(patchFaces, prims)(),
-                    ensightGeometryFile
-                );
-
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    UIPstream fromSlave(slave, pBufs);
-                    faceList patchFaces(fromSlave);
-
-                    writeNSidedPointsBinary
-                    (
-                        patchFaces,
-                        ensightGeometryFile
-                    );
-                }
+                IPstream fromSlave(Pstream::scheduled, slave);
+                faceList patchFaces(fromSlave);
+
+                writeNSidedPointsBinary(patchFaces, ensightGeometryFile);
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< UIndirectList<face>(patchFaces, prims);
+        }
     }
 }
 
@@ -1189,16 +1256,6 @@ void Foam::ensightMesh::writeAllFacePrimsBinary
 {
     if (nPrims)
     {
-        PstreamBuffers pBufs(Pstream::nonBlocking);
-
-        if (!Pstream::master())
-        {
-            UOPstream toMaster(Pstream::masterNo(), pBufs);
-            toMaster<< UIndirectList<face>(patchFaces, prims);
-        }
-
-        pBufs.finishedSends();
-
         if (Pstream::master())
         {
             writeEnsDataBinary(key,ensightGeometryFile);
@@ -1212,12 +1269,17 @@ void Foam::ensightMesh::writeAllFacePrimsBinary
 
             for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
-                UIPstream fromSlave(slave, pBufs);
+                IPstream fromSlave(Pstream::scheduled, slave);
                 faceList patchFaces(fromSlave);
 
                 writeFacePrimsBinary(patchFaces, ensightGeometryFile);
             }
         }
+        else
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< UIndirectList<face>(patchFaces, prims);
+        }
     }
 }
 
@@ -1269,6 +1331,206 @@ void Foam::ensightMesh::write
     }
 }
 
+void Foam::ensightMesh::writeAllInternalPoints
+(
+    const pointField& uniquePoints,
+    const label nPoints,
+    OFstream& ensightGeometryFile
+) const
+{
+    barrier();
+
+    if (Pstream::master())
+    {
+        ensightGeometryFile
+            << "part" << nl
+            << setw(10) << 1 << nl
+            << "internalMesh" << nl
+            << "coordinates" << nl
+            << setw(10) << nPoints
+            << endl;
+
+        for (direction d=0; d<vector::nComponents; d++)
+        {
+            writePoints(uniquePoints.component(d), ensightGeometryFile);
+
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
+            {
+                IPstream fromSlave(Pstream::scheduled, slave);
+                scalarField pointsComponent(fromSlave);
+                writePoints(pointsComponent, ensightGeometryFile);
+            }
+        }
+    }
+    else
+    {
+        for (direction d=0; d<vector::nComponents; d++)
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< uniquePoints.component(d);
+        }
+    }
+}
+
+void Foam::ensightMesh::writeAllInternalPointsBinary
+(
+    const pointField& uniquePoints,
+    const label nPoints,
+    std::ofstream& ensightGeometryFile
+) const
+{
+    barrier();
+
+    if (Pstream::master())
+    {
+        writeEnsDataBinary("part",ensightGeometryFile);
+        writeEnsDataBinary(1,ensightGeometryFile);
+        writeEnsDataBinary("internalMesh",ensightGeometryFile);
+        writeEnsDataBinary("coordinates",ensightGeometryFile);
+        writeEnsDataBinary(nPoints,ensightGeometryFile);
+
+        for (direction d=0; d<vector::nComponents; d++)
+        {
+            writeEnsDataBinary
+            (
+                uniquePoints.component(d),
+                ensightGeometryFile
+            );
+
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
+            {
+                IPstream fromSlave(Pstream::scheduled, slave);
+                scalarField pointsComponent(fromSlave);
+                writeEnsDataBinary(pointsComponent, ensightGeometryFile);
+            }
+        }
+    }
+    else
+    {
+        for (direction d=0; d<vector::nComponents; d++)
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+            toMaster<< uniquePoints.component(d);
+        }
+    }
+}
+
+void Foam::ensightMesh::writeAllPatchPoints
+(
+    const label ensightPatchI,
+    const word& patchName,
+    const pointField& uniquePoints,
+    const label nPoints,
+    OFstream& ensightGeometryFile
+) const
+{
+    barrier();
+
+    if (Pstream::master())
+    {
+        ensightGeometryFile
+            << "part" << nl
+            << setw(10) << ensightPatchI << nl
+            << patchName << nl
+            << "coordinates" << nl
+            << setw(10) << nPoints // globalPointsPtr().size()
+            << endl;
+
+        for (direction d=0; d<vector::nComponents; d++)
+        {
+            writePoints
+            (
+                uniquePoints.component(d),
+                ensightGeometryFile
+            );
+
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
+            {
+                IPstream fromSlave(Pstream::scheduled, slave);
+                scalarField patchPointsComponent(fromSlave);
+
+                writePoints
+                (
+                    patchPointsComponent,
+                    ensightGeometryFile
+                );
+            }
+        }
+    }
+    else
+    {
+        for (direction d=0; d<vector::nComponents; d++)
+        {
+            OPstream toMaster
+            (
+                Pstream::scheduled,
+                Pstream::masterNo()
+            );
+            toMaster<< uniquePoints.component(d);
+        }
+    }
+}
+
+void Foam::ensightMesh::writeAllPatchPointsBinary
+(
+    const label ensightPatchI,
+    const word& patchName,
+    const pointField& uniquePoints,
+    const label nPoints,
+    std::ofstream& ensightGeometryFile
+) const
+{
+    barrier();
+
+    if (Pstream::master())
+    {
+        writeEnsDataBinary("part",ensightGeometryFile);
+        writeEnsDataBinary(ensightPatchI,ensightGeometryFile);
+        //writeEnsDataBinary(patchName.c_str(),ensightGeometryFile);
+        writeEnsDataBinary(patchName.c_str(),ensightGeometryFile);
+        writeEnsDataBinary("coordinates",ensightGeometryFile);
+        writeEnsDataBinary
+        (
+            nPoints, //globalPointsPtr().size(),
+            ensightGeometryFile
+        );
+
+        for (direction d=0; d<vector::nComponents; d++)
+        {
+            //writePointsBinary
+            writeEnsDataBinary
+            (
+                uniquePoints.component(d),
+                ensightGeometryFile
+            );
+
+            for (int slave=1; slave<Pstream::nProcs(); slave++)
+            {
+                IPstream fromSlave(Pstream::scheduled, slave);
+                scalarField patchPointsComponent(fromSlave);
+
+                //writePointsBinary
+                writeEnsDataBinary
+                (
+                    patchPointsComponent,
+                    ensightGeometryFile
+                );
+            }
+        }
+    }
+    else
+    {
+        for (direction d=0; d<vector::nComponents; d++)
+        {
+            OPstream toMaster
+            (
+                Pstream::scheduled,
+                Pstream::masterNo()
+            );
+            toMaster<< uniquePoints.component(d);
+        }
+    }
+}
 
 void Foam::ensightMesh::writeAscii
 (
@@ -1286,7 +1548,6 @@ void Foam::ensightMesh::writeAscii
     const cellShapeList& cellShapes = mesh_.cellShapes();
 
 
-
     word timeFile = prepend;
 
     if (timeIndex == 0)
@@ -1327,7 +1588,7 @@ void Foam::ensightMesh::writeAscii
 
         ensightGeometryFile
             << "EnSight Geometry File" << nl
-            << "written from OpenFOAM-" << Foam::FOAMversion << nl
+            << "written by OpenFOAM-" << Foam::FOAMversion << nl
             << "node id assign" << nl
             << "element id assign" << nl;
     }
@@ -1336,50 +1597,12 @@ void Foam::ensightMesh::writeAscii
     {
         label nPoints = globalPoints.size();
 
-        {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
-
-            if (!Pstream::master())
-            {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                for (direction d=0; d<vector::nComponents; d++)
-                {
-                    toMaster<< uniquePoints.component(d);
-                }
-            }
-
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
-                ensightGeometryFile
-                    << "part" << nl
-                    << setw(10) << 1 << nl
-                    << "internalMesh" << nl
-                    << "coordinates" << nl
-                    << setw(10) << nPoints
-                    << endl;
-
-
-                PtrList<UIPstream> fromSlaves(Pstream::nProcs());
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    fromSlaves.set(slave, new UIPstream(slave, pBufs));
-                }
-
-                for (direction d=0; d<vector::nComponents; d++)
-                {
-                    writePoints(uniquePoints.component(d), ensightGeometryFile);
-
-                    for (int slave=1; slave<Pstream::nProcs(); slave++)
-                    {
-                        scalarField pointsComponent(fromSlaves[slave]);
-                        writePoints(pointsComponent, ensightGeometryFile);
-                    }
-                }
-            }
-        }
-
+        writeAllInternalPoints
+        (
+            uniquePoints,
+            nPoints,
+            ensightGeometryFile
+        );
 
         writeAllPrims
         (
@@ -1464,61 +1687,14 @@ void Foam::ensightMesh::writeAscii
                     inplaceRenumber(pointToGlobal, patchFaces[i]);
                 }
 
-
-                {
-                    PstreamBuffers pBufs(Pstream::nonBlocking);
-
-                    if (!Pstream::master())
-                    {
-                        UOPstream toMaster(Pstream::masterNo(), pBufs);
-                        for (direction d=0; d<vector::nComponents; d++)
-                        {
-                            toMaster<< uniquePoints.component(d);
-                        }
-                    }
-
-                    pBufs.finishedSends();
-
-                    if (Pstream::master())
-                    {
-                        ensightGeometryFile
-                            << "part" << nl
-                            << setw(10) << ensightPatchI++ << nl
-                            << patchName << nl
-                            << "coordinates" << nl
-                            << setw(10) << globalPointsPtr().size()
-                            << endl;
-
-                        PtrList<UIPstream> fromSlaves(Pstream::nProcs());
-                        for (int slave=1; slave<Pstream::nProcs(); slave++)
-                        {
-                            fromSlaves.set(slave, new UIPstream(slave, pBufs));
-                        }
-
-                        for (direction d=0; d<vector::nComponents; d++)
-                        {
-                            writePoints
-                            (
-                                uniquePoints.component(d),
-                                ensightGeometryFile
-                            );
-
-                            for (int slave=1; slave<Pstream::nProcs(); slave++)
-                            {
-                                scalarField patchPointsComponent
-                                (
-                                    fromSlaves[slave]
-                                );
-
-                                writePoints
-                                (
-                                    patchPointsComponent,
-                                    ensightGeometryFile
-                                );
-                            }
-                        }
-                    }
-                }
+                writeAllPatchPoints
+                (
+                    ensightPatchI++,
+                    patchName,
+                    uniquePoints,
+                    globalPointsPtr().size(),
+                    ensightGeometryFile
+                );
 
                 writeAllFacePrims
                 (
@@ -1549,6 +1725,111 @@ void Foam::ensightMesh::writeAscii
         }
     }
 
+    // write faceZones, if requested
+    forAllConstIter(wordHashSet, faceZoneNames_, iter)
+    {
+        const word& faceZoneName = iter.key();
+
+        label faceID = mesh_.faceZones().findZoneID(faceZoneName);
+
+        const faceZone& fz = mesh_.faceZones()[faceID];
+
+        const nFacePrimitives& nfp = nFaceZonePrims_[faceZoneName];
+
+        if (nfp.nTris || nfp.nQuads || nfp.nPolys)
+        {
+            const labelList& tris = faceZoneFaceSets_[faceID].tris;
+            const labelList& quads = faceZoneFaceSets_[faceID].quads;
+            const labelList& polys = faceZoneFaceSets_[faceID].polys;
+
+            // Renumber the faceZone points/faces into unique points
+            labelList pointToGlobal;
+            labelList uniqueMeshPointLabels;
+            autoPtr<globalIndex> globalPointsPtr =
+            mesh_.globalData().mergePoints
+            (
+                fz().meshPoints(),
+                fz().meshPointMap(),
+                pointToGlobal,
+                uniqueMeshPointLabels
+            );
+
+            pointField uniquePoints(mesh_.points(), uniqueMeshPointLabels);
+
+            // Find the list of master faces belonging to the faceZone,
+            // in loacal numbering
+            faceList faceZoneFaces(fz().localFaces());
+
+            // Count how many master faces belong to the faceZone. Is there
+            // a better way of doing this?
+            label nMasterFaces = 0;
+
+            forAll(fz, faceI)
+            {
+                if (faceToBeIncluded(fz[faceI]))
+                {
+                    ++nMasterFaces;
+                }
+            }
+
+            // Create the faceList for the master faces only and fill it.
+            faceList faceZoneMasterFaces(nMasterFaces);
+
+            label currentFace = 0;
+
+            forAll(fz, faceI)
+            {
+                if (faceToBeIncluded(fz[faceI]))
+                {
+                    faceZoneMasterFaces[currentFace] = faceZoneFaces[faceI];
+                    ++currentFace;
+                }
+            }
+
+            // Renumber the faceZone master faces
+            forAll(faceZoneMasterFaces, i)
+            {
+                inplaceRenumber(pointToGlobal, faceZoneMasterFaces[i]);
+            }
+
+            writeAllPatchPoints
+            (
+                ensightPatchI++,
+                faceZoneName,
+                uniquePoints,
+                globalPointsPtr().size(),
+                ensightGeometryFile
+            );
+
+            writeAllFacePrims
+            (
+                "tria3",
+                tris,
+                nfp.nTris,
+                faceZoneMasterFaces,
+                ensightGeometryFile
+            );
+
+            writeAllFacePrims
+            (
+                "quad4",
+                quads,
+                nfp.nQuads,
+                faceZoneMasterFaces,
+                ensightGeometryFile
+            );
+
+            writeAllNSided
+            (
+                polys,
+                nfp.nPolys,
+                faceZoneMasterFaces,
+                ensightGeometryFile
+            );
+        }
+    }
+
+
     if (Pstream::master())
     {
         delete ensightGeometryFilePtr;
@@ -1599,9 +1880,10 @@ void Foam::ensightMesh::writeBinary
 
     if (Pstream::master())
     {
+        string description = string("written by OpenFOAM-") + Foam::FOAMversion;
         writeEnsDataBinary("C binary", ensightGeometryFile);
         writeEnsDataBinary("EnSight Geometry File", ensightGeometryFile);
-        writeEnsDataBinary("written from OpenFOAM", ensightGeometryFile);
+        writeEnsDataBinary(description.c_str(), ensightGeometryFile);
         writeEnsDataBinary("node id assign", ensightGeometryFile);
         writeEnsDataBinary("element id assign", ensightGeometryFile);
     }
@@ -1611,54 +1893,12 @@ void Foam::ensightMesh::writeBinary
     {
         label nPoints = globalPoints.size();
 
-        {
-            PstreamBuffers pBufs(Pstream::nonBlocking);
-
-            if (!Pstream::master())
-            {
-                UOPstream toMaster(Pstream::masterNo(), pBufs);
-                for (direction d=0; d<vector::nComponents; d++)
-                {
-                    toMaster<< uniquePoints.component(d);
-                }
-            }
-
-            pBufs.finishedSends();
-
-            if (Pstream::master())
-            {
-                writeEnsDataBinary("part",ensightGeometryFile);
-                writeEnsDataBinary(1,ensightGeometryFile);
-                writeEnsDataBinary("internalMesh",ensightGeometryFile);
-                writeEnsDataBinary("coordinates",ensightGeometryFile);
-                writeEnsDataBinary(nPoints,ensightGeometryFile);
-
-                PtrList<UIPstream> fromSlaves(Pstream::nProcs());
-                for (int slave=1; slave<Pstream::nProcs(); slave++)
-                {
-                    fromSlaves.set(slave, new UIPstream(slave, pBufs));
-                }
-
-                for (direction d=0; d<vector::nComponents; d++)
-                {
-                    writeEnsDataBinary
-                    (
-                        uniquePoints.component(d),
-                        ensightGeometryFile
-                    );
-
-                    for (int slave=1; slave<Pstream::nProcs(); slave++)
-                    {
-                        scalarField pointsComponent(fromSlaves[slave]);
-                        writeEnsDataBinary
-                        (
-                            pointsComponent,
-                            ensightGeometryFile
-                        );
-                    }
-                }
-            }
-        }
+        writeAllInternalPointsBinary
+        (
+            uniquePoints,
+            nPoints,
+            ensightGeometryFile
+        );
 
         writeAllPrimsBinary
         (
@@ -1743,71 +1983,14 @@ void Foam::ensightMesh::writeBinary
                     inplaceRenumber(pointToGlobal, patchFaces[i]);
                 }
 
-
-                {
-                    PstreamBuffers pBufs(Pstream::nonBlocking);
-
-                    if (!Pstream::master())
-                    {
-                        UOPstream toMaster(Pstream::masterNo(), pBufs);
-                        for (direction d=0; d<vector::nComponents; d++)
-                        {
-                            toMaster<< uniquePoints.component(d);
-                        }
-                    }
-
-                    pBufs.finishedSends();
-
-                    if (Pstream::master())
-                    {
-                        writeEnsDataBinary("part",ensightGeometryFile);
-                        writeEnsDataBinary(ensightPatchI++,ensightGeometryFile);
-                        //writeEnsDataBinary
-                        //(patchName.c_str(),ensightGeometryFile);
-                        writeEnsDataBinary
-                        (   
-                            patchName.c_str(),
-                            ensightGeometryFile
-                        );
-                        writeEnsDataBinary("coordinates",ensightGeometryFile);
-                        writeEnsDataBinary
-                        (
-                            globalPointsPtr().size(),
-                            ensightGeometryFile
-                        );
-
-                        PtrList<UIPstream> fromSlaves(Pstream::nProcs());
-                        for (int slave=1; slave<Pstream::nProcs(); slave++)
-                        {
-                            fromSlaves.set(slave, new UIPstream(slave, pBufs));
-                        }
-
-                        for (direction d=0; d<vector::nComponents; d++)
-                        {
-                            //writePointsBinary
-                            writeEnsDataBinary
-                            (
-                                uniquePoints.component(d),
-                                ensightGeometryFile
-                            );
-
-                            for (int slave=1; slave<Pstream::nProcs(); slave++)
-                            {
-                                scalarField patchPointsComponent
-                                (
-                                    fromSlaves[slave]
-                                );
-
-                                //writePointsBinary
-                                writeEnsDataBinary
-                                (
-                                    patchPointsComponent,
-                                    ensightGeometryFile
-                                );
-                            }
-                        }
-                    }
-                }
+                writeAllPatchPointsBinary
+                (
+                    ensightPatchI++,
+                    patchName,
+                    uniquePoints,
+                    globalPointsPtr().size(),
+                    ensightGeometryFile
+                );
 
                 writeAllFacePrimsBinary
                 (
@@ -1838,6 +2021,111 @@ void Foam::ensightMesh::writeBinary
         }
     }
 
+    // write faceZones, if requested
+    forAllConstIter(wordHashSet, faceZoneNames_, iter)
+    {
+        const word& faceZoneName = iter.key();
+
+        label faceID = mesh_.faceZones().findZoneID(faceZoneName);
+
+        const faceZone& fz = mesh_.faceZones()[faceID];
+
+        const nFacePrimitives& nfp = nFaceZonePrims_[faceZoneName];
+
+        if (nfp.nTris || nfp.nQuads || nfp.nPolys)
+        {
+            const labelList& tris = faceZoneFaceSets_[faceID].tris;
+            const labelList& quads = faceZoneFaceSets_[faceID].quads;
+            const labelList& polys = faceZoneFaceSets_[faceID].polys;
+
+            // Renumber the faceZone points/faces into unique points
+            labelList pointToGlobal;
+            labelList uniqueMeshPointLabels;
+            autoPtr<globalIndex> globalPointsPtr =
+            mesh_.globalData().mergePoints
+            (
+                fz().meshPoints(),
+                fz().meshPointMap(),
+                pointToGlobal,
+                uniqueMeshPointLabels
+            );
+
+            pointField uniquePoints(mesh_.points(), uniqueMeshPointLabels);
+
+            // Find the list of master faces belonging to the faceZone,
+            // in loacal numbering
+            faceList faceZoneFaces(fz().localFaces());
+
+            // Count how many master faces belong to the faceZone. Is there
+            // a better way of doing this?
+            label nMasterFaces = 0;
+
+            forAll(fz, faceI)
+            {
+                if (faceToBeIncluded(fz[faceI]))
+                {
+                    ++nMasterFaces;
+                }
+            }
+
+            // Create the faceList for the master faces only and fill it.
+            faceList faceZoneMasterFaces(nMasterFaces);
+
+            label currentFace = 0;
+
+            forAll(fz, faceI)
+            {
+                if (faceToBeIncluded(fz[faceI]))
+                {
+                    faceZoneMasterFaces[currentFace] = faceZoneFaces[faceI];
+                    ++currentFace;
+                }
+            }
+
+            // Renumber the faceZone master faces
+
+            forAll(faceZoneMasterFaces, i)
+            {
+                inplaceRenumber(pointToGlobal, faceZoneMasterFaces[i]);
+            }
+
+            writeAllPatchPointsBinary
+            (
+                ensightPatchI++,
+                faceZoneName,
+                uniquePoints,
+                globalPointsPtr().size(),
+                ensightGeometryFile
+            );
+
+            writeAllFacePrimsBinary
+            (
+                "tria3",
+                tris,
+                nfp.nTris,
+                faceZoneMasterFaces,
+                ensightGeometryFile
+            );
+
+            writeAllFacePrimsBinary
+            (
+                "quad4",
+                quads,
+                nfp.nQuads,
+                faceZoneMasterFaces,
+                ensightGeometryFile
+            );
+
+            writeAllNSidedBinary
+            (
+                polys,
+                nfp.nPolys,
+                faceZoneMasterFaces,
+                ensightGeometryFile
+            );
+        }
+    }
+
 
     if (Pstream::master())
     {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
index d82e8d33b5..9762015eb0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
@@ -42,7 +42,7 @@ SourceFiles
 #include "fvMesh.H"
 #include "OFstream.H"
 #include <fstream>
-#include "globalIndex.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,6 +51,7 @@ namespace Foam
 
 class fvMesh;
 class argList;
+class globalIndex;
 
 /*---------------------------------------------------------------------------*\
                            Class ensightMesh Declaration
@@ -98,6 +99,16 @@ private:
 
         HashTable<nFacePrimitives> nPatchPrims_;
 
+        // faceZone - related variables
+        List<faceSets> faceZoneFaceSets_;
+
+        wordHashSet faceZoneNames_;
+
+        HashTable<nFacePrimitives> nFaceZonePrims_;
+
+        //- Per boundary face whether to include or not
+        PackedBoolList boundaryFaceToBeIncluded_;
+
 
     // Private Member Functions
 
@@ -206,6 +217,38 @@ private:
             OFstream& ensightGeometryFile
         ) const;
 
+        void writeAllInternalPoints
+        (
+            const pointField& uniquePoints,
+            const label nPoints,
+            OFstream& ensightGeometryFile
+        ) const;
+
+        void writeAllPatchPoints
+        (
+            label ensightPatchI,
+            const word& patchName,
+            const pointField& uniquePoints,
+            const label nPoints,
+            OFstream& ensightGeometryFile
+        ) const;
+
+        void writeAllInternalPointsBinary
+        (
+            const pointField& uniquePoints,
+            const label nPoints,
+            std::ofstream& ensightGeometryFile
+        ) const;
+
+        void writeAllPatchPointsBinary
+        (
+            label ensightPatchI,
+            const word& patchName,
+            const pointField& uniquePoints,
+            const label nPoints,
+            std::ofstream& ensightGeometryFile
+        ) const;
+
         void writeAscii
         (
             const fileName& postProcPath,
@@ -311,7 +354,12 @@ public:
     // Constructors
 
         //- Construct from fvMesh
-        ensightMesh(const fvMesh&, const argList& args, const bool binary);
+        ensightMesh
+        (
+            const fvMesh&,
+            const argList& args,
+            const bool binary
+        );
 
 
     //- Destructor
@@ -352,12 +400,36 @@ public:
                 return nPatchPrims_;
             }
 
+            const List<faceSets>& faceZoneFaceSets() const
+            {
+                return faceZoneFaceSets_;
+            }
+
+            const wordHashSet& faceZoneNames() const
+            {
+                return faceZoneNames_;
+            }
+
+            const HashTable<nFacePrimitives>& nFaceZonePrims() const
+            {
+                return nFaceZonePrims_;
+            }
+
             //- The ensight part id for the first patch
             label patchPartOffset() const
             {
                 return patchPartOffset_;
             }
 
+    // Other
+
+        //- When exporting faceZones, check if a given face has to be included
+        //  or not (i.e. faces on processor boundaries)
+        bool faceToBeIncluded(const label faceI) const;
+
+        //- Helper to cause barrier. Necessary on Quadrics.
+        static void barrier();
+
 
     // I-O
 
@@ -368,6 +440,7 @@ public:
             const label timeIndex,
             Ostream& ensightCaseFile
         ) const;
+
 };
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 7378bdc7a4..6d2f56f3b8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -41,6 +41,9 @@ Usage
     @param -noPatches \n
     Suppress writing any patches.
 
+    @param -faceZones zoneList \n
+    Specify faceZones to write, with wildcards
+
 Note
     Parallel support for cloud data is not supported
     - writes to @a EnSight directory to avoid collisions with foamToEnsightParts
@@ -113,6 +116,12 @@ int main(int argc, char *argv[])
         "specify particular patches to write - eg '(inlet outlet)'. "
         "An empty list suppresses writing the internalMesh."
     );
+    argList::addOption
+    (
+        "faceZones",
+        "wordList",
+        "specify faceZones to write, with wildcards - eg '(mfp-.*)'. "
+    );
 
 #   include "setRootCase.H"
 

From 18eb2d7099482eda5b77bc2262ca540bfa0f1a35 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 4 Mar 2010 13:47:51 +0000
Subject: [PATCH 25/25] STYLE: Typo in warning message

---
 .../utilities/mesh/manipulation/checkMesh/checkTopology.C       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 364c59075f..f0aa4a0aaa 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -71,7 +71,7 @@ Foam::label Foam::checkTopology
             {
                 Info<< " ***FaceZone " << mesh.faceZones()[zoneI].name()
                     << " is not correctly synchronised"
-                    << " acrosss coupled boundaries."
+                    << " across coupled boundaries."
                     << " (coupled faces both"
                     << " present in set but with opposite flipmap)" << endl;
                 noFailedChecks++;