From 6d693b5b34f79a30d611555fddc98084902c40b0 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Wed, 7 Feb 2018 14:44:18 +0000
Subject: [PATCH 01/45] Refactor decomposition/reconstruction tools

---
 .../decomposePar/Make/files                   |   9 -
 .../decomposePar/Make/options                 |   2 +
 .../decomposePar/decomposePar.C               |  37 +-
 .../decomposePar/domainDecomposition.C        | 694 ------------------
 .../decomposePar/readFields.C                 |   4 +-
 .../reconstructPar/Make/files                 |   6 -
 .../reconstructPar/Make/options               |   7 +-
 .../fvFieldReconstructorReconstructFields.C   | 526 -------------
 .../reconstructParMesh/Make/files             |  11 -
 .../reconstructParMesh/Make/options           |   4 +
 .../reconstructParMesh/faFieldReconstructor.C |  47 --
 .../reconstructParMesh/faFieldReconstructor.H | 197 -----
 .../faFieldReconstructorReconstructFields.C   | 640 ----------------
 .../reconstructParMesh/fvFieldReconstructor.C |  47 --
 .../reconstructParMesh/fvFieldReconstructor.H | 196 -----
 .../pointFieldReconstructor.C                 | 104 ---
 .../pointFieldReconstructor.H                 | 173 -----
 ...pointFieldReconstructorReconstructFields.C | 178 -----
 .../reconstructParMesh/processorFaMeshes.C    | 258 -------
 .../reconstructParMesh/processorFaMeshes.H    | 140 ----
 .../reconstructLagrangian.H                   |  94 ---
 .../reconstructLagrangianFields.C             | 125 ----
 .../reconstructLagrangianPositions.C          |  75 --
 .../tetPointFieldReconstructor.C              | 163 ----
 .../tetPointFieldReconstructor.H              | 217 ------
 ...PointFieldReconstructorReconstructFields.C | 372 ----------
 .../decomposeReconstruct/Make/files           |  20 +
 .../decomposeReconstruct/Make/options         |  15 +
 .../finiteArea}/faFieldDecomposer.C           |   0
 .../finiteArea}/faFieldDecomposer.H           |   0
 .../faFieldDecomposerDecomposeFields.C        |   0
 .../finiteArea}/faMeshDecomposition.C         |   0
 .../finiteArea}/faMeshDecomposition.H         |   0
 .../finiteVolume}/decomposeMesh.C             |  23 +-
 .../finiteVolume}/distributeCells.C           |  19 +-
 .../finiteVolume/domainDecomposition.C        | 687 +++++++++++++++++
 .../finiteVolume}/domainDecomposition.H       |  93 ++-
 .../finiteVolume}/fvFieldDecomposer.C         |   0
 .../finiteVolume}/fvFieldDecomposer.H         |   1 +
 .../fvFieldDecomposerDecomposeFields.C        |   0
 .../lagrangian}/lagrangianFieldDecomposer.C   |   0
 .../lagrangian}/lagrangianFieldDecomposer.H   |   0
 ...lagrangianFieldDecomposerDecomposeFields.C |   0
 .../point}/pointFieldDecomposer.C             |   0
 .../point}/pointFieldDecomposer.H             |   0
 .../pointFieldDecomposerDecomposeFields.C     |   0
 .../tetPointFieldDecomposer.C                 |   0
 .../tetPointFieldDecomposer.H                 |   0
 .../tetPointFieldDecomposerDecomposeFields.C  |   0
 .../finiteArea}/faFieldReconstructor.C        |   0
 .../finiteArea}/faFieldReconstructor.H        |   0
 .../faFieldReconstructorReconstructFields.C   |   0
 .../finiteArea}/processorFaMeshes.C           |   0
 .../finiteArea}/processorFaMeshes.H           |   0
 .../finiteVolume}/fvFieldReconstructor.C      |   0
 .../finiteVolume}/fvFieldReconstructor.H      |  12 +-
 .../fvFieldReconstructorReconstructFields.C   | 333 +++++----
 .../finiteVolume}/processorMeshesRebuild.C    |   0
 .../processorMeshesReconstructor.C            |   0
 .../processorMeshesReconstructor.H            |   3 +-
 .../lagrangian}/reconstructLagrangian.H       |   0
 .../lagrangian}/reconstructLagrangianFields.C |   0
 .../reconstructLagrangianPositions.C          |   0
 .../point}/pointFieldReconstructor.C          |   0
 .../point}/pointFieldReconstructor.H          |   0
 ...pointFieldReconstructorReconstructFields.C |   0
 .../tetPointFieldReconstructor.C              |   0
 .../tetPointFieldReconstructor.H              |   0
 ...PointFieldReconstructorReconstructFields.C |   0
 69 files changed, 1058 insertions(+), 4474 deletions(-)
 delete mode 100644 applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructor.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructor.H
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructorReconstructFields.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructor.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructor.H
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructor.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructor.H
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructorReconstructFields.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/processorFaMeshes.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/processorFaMeshes.H
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangian.H
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangianFields.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangianPositions.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructor.C
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructor.H
 delete mode 100644 applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructorReconstructFields.C
 create mode 100644 src/decompositionMethods/decomposeReconstruct/Make/files
 create mode 100644 src/decompositionMethods/decomposeReconstruct/Make/options
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea}/faFieldDecomposer.C (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea}/faFieldDecomposer.H (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea}/faFieldDecomposerDecomposeFields.C (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea}/faMeshDecomposition.C (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea}/faMeshDecomposition.H (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume}/decomposeMesh.C (98%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume}/distributeCells.C (91%)
 create mode 100644 src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume}/domainDecomposition.H (71%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume}/fvFieldDecomposer.C (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume}/fvFieldDecomposer.H (99%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume}/fvFieldDecomposerDecomposeFields.C (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/lagrangian}/lagrangianFieldDecomposer.C (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/lagrangian}/lagrangianFieldDecomposer.H (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/lagrangian}/lagrangianFieldDecomposerDecomposeFields.C (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/point}/pointFieldDecomposer.C (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/point}/pointFieldDecomposer.H (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/point}/pointFieldDecomposerDecomposeFields.C (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/tetFiniteElement}/tetPointFieldDecomposer.C (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/tetFiniteElement}/tetPointFieldDecomposer.H (100%)
 rename {applications/utilities/parallelProcessing/decomposePar => src/decompositionMethods/decomposeReconstruct/decomposeTools/tetFiniteElement}/tetPointFieldDecomposerDecomposeFields.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea}/faFieldReconstructor.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea}/faFieldReconstructor.H (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea}/faFieldReconstructorReconstructFields.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea}/processorFaMeshes.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea}/processorFaMeshes.H (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume}/fvFieldReconstructor.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume}/fvFieldReconstructor.H (92%)
 rename {applications/utilities/parallelProcessing/reconstructParMesh => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume}/fvFieldReconstructorReconstructFields.C (91%)
 rename {applications/utilities/parallelProcessing/reconstructParMesh => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume}/processorMeshesRebuild.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructParMesh => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume}/processorMeshesReconstructor.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructParMesh => src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume}/processorMeshesReconstructor.H (97%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian}/reconstructLagrangian.H (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian}/reconstructLagrangianFields.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian}/reconstructLagrangianPositions.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/point}/pointFieldReconstructor.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/point}/pointFieldReconstructor.H (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/point}/pointFieldReconstructorReconstructFields.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement}/tetPointFieldReconstructor.C (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement}/tetPointFieldReconstructor.H (100%)
 rename {applications/utilities/parallelProcessing/reconstructPar => src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement}/tetPointFieldReconstructorReconstructFields.C (100%)

diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/files b/applications/utilities/parallelProcessing/decomposePar/Make/files
index a86648f25..8e29865cd 100644
--- a/applications/utilities/parallelProcessing/decomposePar/Make/files
+++ b/applications/utilities/parallelProcessing/decomposePar/Make/files
@@ -1,12 +1,3 @@
-decomposeMesh.C
 decomposePar.C
-domainDecomposition.C
-distributeCells.C
-faMeshDecomposition.C
-fvFieldDecomposer.C
-faFieldDecomposer.C
-pointFieldDecomposer.C
-tetPointFieldDecomposer.C
-lagrangianFieldDecomposer.C
 
 EXE = $(FOAM_APPBIN)/decomposePar
diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options
index 682187cd5..eb2754920 100644
--- a/applications/utilities/parallelProcessing/decomposePar/Make/options
+++ b/applications/utilities/parallelProcessing/decomposePar/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/decompositionMethods/decomposeReconstruct/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
@@ -8,6 +9,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -ldecompositionMethods \
+    -ldecomposeReconstruct \
     -lmeshTools \
     -lfiniteVolume \
     -lfiniteArea \
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 06ba968ae..6d7430682 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -235,26 +235,45 @@ int main(int argc, char *argv[])
     }
 
     Info<< "Create mesh for region " << regionName << endl;
-    domainDecomposition mesh
+    fvMesh mesh
     (
         IOobject
         (
             regionName,
             runTime.timeName(),
-            runTime
+            runTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
         )
     );
 
+    domainDecomposition meshDecomp
+    (
+        mesh,
+        IOdictionary
+        (
+            IOobject
+            (
+                "decomposeParDict",
+                runTime.system(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        )
+    );
+
+
     // Decompose the mesh
     if (!decomposeFieldsOnly)
     {
-        mesh.decomposeMesh(filterPatches);
+        meshDecomp.decomposeMesh(filterPatches);
 
-        mesh.writeDecomposition();
+        meshDecomp.writeDecomposition();
 
         if (writeCellDist)
         {
-            const labelList& procIds = mesh.cellToProc();
+            const labelList& procIds = meshDecomp.cellToProc();
 
             // Write the decomposition as labelList for use with 'manual'
             // decomposition method.
@@ -345,7 +364,7 @@ int main(int argc, char *argv[])
 
     // Construct the point fields
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    pointMesh pMesh(mesh);
+    const pointMesh& pMesh = pointMesh::New(mesh);
 
     PtrList<pointScalarField> pointScalarFields;
     readFields(pMesh, objects, pointScalarFields);
@@ -595,7 +614,7 @@ int main(int argc, char *argv[])
     Info<< endl;
 
     // Split the fields over processors
-    for (label procI = 0; procI < mesh.nProcs(); procI++)
+    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
     {
         Info<< "Processor " << procI << ": field transfer" << endl;
 
@@ -872,7 +891,7 @@ int main(int argc, char *argv[])
         {
             const fileName timePath = processorDb.timePath();
 
-            if (copyUniform || mesh.distributed())
+            if (copyUniform || meshDecomp.distributed())
             {
                 cp
                 (
@@ -962,7 +981,7 @@ int main(int argc, char *argv[])
         Info << endl;
 
         // Split the fields over processors
-        for (label procI = 0; procI < mesh.nProcs(); procI++)
+        for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
         {
             Info<< "Processor " << procI
                 << ": finite area field transfer" << endl;
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
deleted file mode 100644
index 015761d1b..000000000
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ /dev/null
@@ -1,694 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "domainDecomposition.H"
-#include "foamTime.H"
-#include "dictionary.H"
-#include "labelIOList.H"
-#include "processorPolyPatch.H"
-#include "fvMesh.H"
-#include "OSspecific.H"
-#include "Map.H"
-#include "globalMeshData.H"
-#include "DynamicList.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-domainDecomposition::domainDecomposition(const IOobject& io)
-:
-    fvMesh(io),
-    decompositionDict_
-    (
-        IOobject
-        (
-            "decomposeParDict",
-            time().system(),
-            *this,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        )
-    ),
-    nProcs_(readInt(decompositionDict_.lookup("numberOfSubdomains"))),
-    distributed_(false),
-    cellToProc_(nCells()),
-    procPointAddressing_(nProcs_),
-    procFaceAddressing_(nProcs_),
-    nInternalProcFaces_(nProcs_),
-    nLiveProcFaces_(nProcs_),
-    procCellAddressing_(nProcs_),
-    procBoundaryAddressing_(nProcs_),
-    procPatchSize_(nProcs_),
-    procPatchStartIndex_(nProcs_),
-    procNeighbourProcessors_(nProcs_),
-    procProcessorPatchSize_(nProcs_),
-    procProcessorPatchStartIndex_(nProcs_),
-    globallySharedPoints_(0),
-    cyclicParallel_(false)
-{
-    if (decompositionDict_.found("distributed"))
-    {
-        distributed_ = Switch(decompositionDict_.lookup("distributed"));
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-domainDecomposition::~domainDecomposition()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-bool domainDecomposition::writeDecomposition()
-{
-    Info<< "\nConstructing processor meshes" << endl;
-
-    // Make a lookup map for globally shared points
-    Map<label> sharedPointLookup(2*globallySharedPoints_.size());
-
-    forAll (globallySharedPoints_, pointi)
-    {
-        sharedPointLookup.insert(globallySharedPoints_[pointi], pointi);
-    }
-
-
-    // Mark point/faces/cells that are in zones.  Bad coding - removed
-    // HJ, 31/Mar/2009
-
-    label totProcFaces = 0;
-    label maxProcPatches = 0;
-    label maxProcFaces = 0;
-
-
-    // Note: get cellLevel and pointLevel. Avoid checking whether they exist or
-    // not by hand. If they don't exist, simpy assume that the level is 0
-    const labelIOList globalCellLevel
-    (
-        IOobject
-        (
-            "cellLevel",
-            this->facesInstance(),
-            polyMesh::meshSubDir,
-            *this,
-            IOobject::READ_IF_PRESENT,
-            IOobject::NO_WRITE
-        ),
-        labelList(nCells(), 0)
-    );
-
-    const labelIOList globalPointLevel
-    (
-        IOobject
-        (
-            "pointLevel",
-            this->facesInstance(),
-            polyMesh::meshSubDir,
-            *this,
-            IOobject::READ_IF_PRESENT,
-            IOobject::NO_WRITE
-        ),
-        labelList(nPoints(), 0)
-    );
-
-
-    // Write out the meshes
-    for (label procI = 0; procI < nProcs_; procI++)
-    {
-        // Create processor points
-        const labelList& curPointLabels = procPointAddressing_[procI];
-
-        // Access list of all points in the mesh.  HJ, 27/Mar/2009
-        const pointField& meshPoints = allPoints();
-
-        labelList pointLookup(meshPoints.size(), -1);
-
-        pointField procPoints(curPointLabels.size());
-
-        forAll (curPointLabels, pointi)
-        {
-            procPoints[pointi] = meshPoints[curPointLabels[pointi]];
-
-            pointLookup[curPointLabels[pointi]] = pointi;
-        }
-
-        // Create processor faces
-        const labelList& curFaceLabels = procFaceAddressing_[procI];
-
-        // Access list of all faces in the mesh.  HJ, 27/Mar/2009
-        const faceList& meshFaces = allFaces();
-
-        labelList faceLookup(meshFaces.size(), -1);
-
-        faceList procFaces(curFaceLabels.size());
-
-        forAll (curFaceLabels, facei)
-        {
-            // Mark the original face as used
-            // Remember to decrement the index by one (turning index)
-            // HJ, 5/Dec/2001
-            label curF = mag(curFaceLabels[facei]) - 1;
-
-            faceLookup[curF] = facei;
-
-            // get the original face
-            labelList origFaceLabels;
-
-            if (curFaceLabels[facei] >= 0)
-            {
-                // face not turned
-                origFaceLabels = meshFaces[curF];
-            }
-            else
-            {
-                origFaceLabels = meshFaces[curF].reverseFace();
-            }
-
-            // translate face labels into local point list
-            face& procFaceLabels = procFaces[facei];
-
-            procFaceLabels.setSize(origFaceLabels.size());
-
-            forAll (origFaceLabels, pointi)
-            {
-                procFaceLabels[pointi] = pointLookup[origFaceLabels[pointi]];
-            }
-        }
-
-        // Create cell lookup
-        labelList cellLookup(nCells(), -1);
-        const labelList& curCellLabels = procCellAddressing_[procI];
-
-        forAll (curCellLabels, cellI)
-        {
-            cellLookup[curCellLabels[cellI]] = cellI;
-        }
-
-        // Get complete owner-neighour addressing in the mesh
-        const labelList& own = faceOwner();
-        const labelList& nei = faceNeighbour();
-
-        // Calculate owner and neighbour list
-        // Owner list is sized to number of live faces
-        // Neighbour list is sized to number of internal faces
-
-        labelList procOwner(nLiveProcFaces_[procI]);
-
-        // Note: loop over owner, not all faces: sizes are different
-        forAll (procOwner, faceI)
-        {
-            // Remember to decrement the index by one (turning index)
-            // HJ, 28/Mar/2009
-            label curF = mag(curFaceLabels[faceI]) - 1;
-
-            if (curFaceLabels[faceI] >= 0)
-            {
-                procOwner[faceI] = cellLookup[own[curF]];
-            }
-            else
-            {
-                procOwner[faceI] = cellLookup[nei[curF]];
-            }
-        }
-
-        labelList procNeighbour(nInternalProcFaces_[procI]);
-
-        // Note: loop over neighbour, not all faces: sizes are different
-        forAll (procNeighbour, faceI)
-        {
-            // Remember to decrement the index by one (turning index)
-            // HJ, 28/Mar/2009
-            label curF = mag(curFaceLabels[faceI]) - 1;
-
-            if (curFaceLabels[faceI] >= 0)
-            {
-                procNeighbour[faceI] = cellLookup[nei[curF]];
-            }
-            else
-            {
-                procNeighbour[faceI] = cellLookup[own[curF]];
-            }
-        }
-
-        // Create processor cells.  No longer needed: using owner and neighbour
-        // HJ, 28/Mar/2009
-//         const cellList& meshCells = cells();
-
-//         cellList procCells(curCellLabels.size());
-
-//         forAll (curCellLabels, cellI)
-//         {
-//             const labelList& origCellLabels = meshCells[curCellLabels[cellI]];
-
-//             cell& curCell = procCells[cellI];
-
-//             curCell.setSize(origCellLabels.size());
-
-//             forAll (origCellLabels, cellFaceI)
-//             {
-//                 curCell[cellFaceI] = faceLookup[origCellLabels[cellFaceI]];
-//             }
-//         }
-
-        // Create processor mesh without a boundary
-
-        fileName processorCasePath
-        (
-            time().caseName()/fileName(word("processor") + Foam::name(procI))
-        );
-
-        // make the processor directory
-        mkDir(time().rootPath()/processorCasePath);
-
-        // create a database
-        Time processorDb
-        (
-            Time::controlDictName,
-            time().rootPath(),
-            processorCasePath,
-            "system",
-            "constant",
-            true
-        );
-
-        // Create the mesh
-        polyMesh procMesh
-        (
-            IOobject
-            (
-                this->polyMesh::name(),  // region name of undecomposed mesh
-                pointsInstance(),
-                processorDb
-            ),
-            xferMove(procPoints),
-            xferMove(procFaces),
-            xferMove(procOwner),
-            xferMove(procNeighbour),
-            false          // Do not sync par
-//   xferMove(procCells)   // Old-fashioned mesh creation using cells.
-                           // Deprecated: using face owner/neighbour
-                           // HJ, 30/Mar/2009
-        );
-
-        // Create processor boundary patches
-        const labelList& curBoundaryAddressing = procBoundaryAddressing_[procI];
-
-        const labelList& curPatchSizes = procPatchSize_[procI];
-
-        const labelList& curPatchStarts = procPatchStartIndex_[procI];
-
-        const labelList& curNeighbourProcessors =
-            procNeighbourProcessors_[procI];
-
-        const labelList& curProcessorPatchSizes =
-            procProcessorPatchSize_[procI];
-
-        const labelList& curProcessorPatchStarts =
-            procProcessorPatchStartIndex_[procI];
-
-        const polyPatchList& meshPatches = boundaryMesh();
-
-        List<polyPatch*> procPatches
-        (
-            curPatchSizes.size()
-          + curProcessorPatchSizes.size(),
-            reinterpret_cast<polyPatch*>(0)
-        );
-
-        label nPatches = 0;
-
-        forAll (curPatchSizes, patchi)
-        {
-            procPatches[nPatches] =
-                meshPatches[curBoundaryAddressing[patchi]].clone
-                (
-                    procMesh.boundaryMesh(),
-                    nPatches,
-                    curPatchSizes[patchi],
-                    curPatchStarts[patchi]
-                ).ptr();
-
-            nPatches++;
-        }
-
-        forAll (curProcessorPatchSizes, procPatchI)
-        {
-            procPatches[nPatches] =
-                new processorPolyPatch
-                (
-                    word("procBoundary") + Foam::name(procI)
-                  + word("to")
-                  + Foam::name(curNeighbourProcessors[procPatchI]),
-                    curProcessorPatchSizes[procPatchI],
-                    curProcessorPatchStarts[procPatchI],
-                    nPatches,
-                    procMesh.boundaryMesh(),
-                    procI,
-                    curNeighbourProcessors[procPatchI]
-            );
-
-            nPatches++;
-        }
-
-        // Add boundary patches
-        procMesh.addPatches(procPatches);
-
-        // Create and add zones
-
-        // Note:
-        // This coding was all wrong, as each point/face/cell may only
-        //  belong to a single zone.
-        // Additionally, ordering of points/faces/cells in the processor mesh
-        // needs to match the ordering in global mesh zones.  Full rewrite.
-        // HJ, 30/Mar/2009
-
-        // Create zones if needed
-        if
-        (
-            pointZones().size() > 0
-         || faceZones().size() > 0
-         || cellZones().size() > 0
-        )
-        {
-            // Point zones
-            List<pointZone*> procPz(pointZones().size());
-
-            {
-                const pointZoneMesh& pz = pointZones();
-
-                // Go through all the zoned points and find out if they
-                // belong to a processor.  If so, add it to the zone as
-                // necessary
-                forAll (pz, zoneI)
-                {
-                    const labelList& zonePoints = pz[zoneI];
-
-                    labelList procZonePoints(zonePoints.size());
-                    label nZonePoints = 0;
-
-                    forAll (zonePoints, pointI)
-                    {
-                        const label localIndex =
-                            pointLookup[zonePoints[pointI]];
-
-                        if (localIndex >= 0)
-                        {
-                            // Point live on processor: add to zone
-                            procZonePoints[nZonePoints] = localIndex;
-                            nZonePoints++;
-                        }
-                    }
-
-                    // Add the zone
-                    procZonePoints.setSize(nZonePoints);
-
-                    procPz[zoneI] = new pointZone
-                    (
-                        pz[zoneI].name(),
-                        procZonePoints,
-                        zoneI,
-                        procMesh.pointZones()
-                    );
-                }
-            }
-
-
-            // Face zones
-            List<faceZone*> procFz(faceZones().size());
-
-            {
-                const faceZoneMesh& fz = faceZones();
-
-                forAll (fz, zoneI)
-                {
-                    const labelList& zoneFaces = fz[zoneI];
-                    const boolList& flipMap = fz[zoneI].flipMap();
-
-                    // Go through all the zoned faces and find out if they
-                    // belong to a processor.  If so, add it to the zone as
-                    // necessary
-
-                    labelList procZoneFaces(zoneFaces.size());
-                    boolList procZoneFaceFlips(zoneFaces.size());
-                    label nZoneFaces = 0;
-
-                    forAll (zoneFaces, faceI)
-                    {
-                        const label localIndex = faceLookup[zoneFaces[faceI]];
-
-                        if (localIndex >= 0)
-                        {
-                            // Face is present on the processor
-
-                            // Add the face to the zone
-                            procZoneFaces[nZoneFaces] = localIndex;
-
-                            // Grab the flip
-                            bool flip = flipMap[faceI];
-
-                            if (curFaceLabels[localIndex] < 0)
-                            {
-                                flip = !flip;
-                            }
-
-                            procZoneFaceFlips[nZoneFaces] = flip;
-                            nZoneFaces++;
-                        }
-                    }
-
-                    // Add the zone
-                    procZoneFaces.setSize(nZoneFaces);
-                    procZoneFaceFlips.setSize(nZoneFaces);
-
-                    procFz[zoneI] = new faceZone
-                    (
-                        fz[zoneI].name(),
-                        procZoneFaces,
-                        procZoneFaceFlips,
-                        zoneI,
-                        procMesh.faceZones()
-                    );
-                }
-            }
-
-            // Cell zones
-            List<cellZone*> procCz(cellZones().size());
-
-            {
-                const cellZoneMesh& cz = cellZones();
-
-                // Go through all the zoned cells and find out if they
-                // belong to a processor.  If so, add it to the zone as
-                // necessary
-
-                forAll (cz, zoneI)
-                {
-                    const labelList& zoneCells = cz[zoneI];
-
-                    labelList procZoneCells(zoneCells.size());
-                    label nZoneCells = 0;
-
-                    forAll (zoneCells, cellI)
-                    {
-                        const label localIndex = cellLookup[zoneCells[cellI]];
-
-                        if (localIndex >= 0)
-                        {
-                            procZoneCells[nZoneCells] = localIndex;
-                            nZoneCells++;
-                        }
-                    }
-
-                    // Add the zone
-                    procZoneCells.setSize(nZoneCells);
-
-                    procCz[zoneI] = new cellZone
-                    (
-                        cz[zoneI].name(),
-                        procZoneCells,
-                        zoneI,
-                        procMesh.cellZones()
-                    );
-                }
-            }
-
-            // Add zones
-            procMesh.addZones(procPz, procFz, procCz);
-        }
-
-        // Set the precision of the points data to 10
-        IOstream::defaultPrecision(10);
-
-        procMesh.write();
-
-        Info<< endl
-            << "Processor " << procI << nl
-            << "    Number of cells = " << procMesh.nCells()
-            << endl;
-
-        label nBoundaryFaces = 0;
-        label nProcPatches = 0;
-        label nProcFaces = 0;
-
-        forAll (procMesh.boundaryMesh(), patchi)
-        {
-            if
-            (
-                procMesh.boundaryMesh()[patchi].type()
-             == processorPolyPatch::typeName
-            )
-            {
-                const processorPolyPatch& ppp =
-                refCast<const processorPolyPatch>
-                (
-                    procMesh.boundaryMesh()[patchi]
-                );
-
-                Info<< "    Number of faces shared with processor "
-                    << ppp.neighbProcNo() << " = " << ppp.size() << endl;
-
-                nProcPatches++;
-                nProcFaces += ppp.size();
-            }
-            else
-            {
-                nBoundaryFaces += procMesh.boundaryMesh()[patchi].size();
-            }
-        }
-
-        Info<< "    Number of processor patches = " << nProcPatches << nl
-            << "    Number of processor faces = " << nProcFaces << nl
-            << "    Number of boundary faces = " << nBoundaryFaces << endl;
-
-        totProcFaces += nProcFaces;
-        maxProcPatches = max(maxProcPatches, nProcPatches);
-        maxProcFaces = max(maxProcFaces, nProcFaces);
-
-        // create and write the addressing information
-        labelIOList pointProcAddressing
-        (
-            IOobject
-            (
-                "pointProcAddressing",
-                procMesh.facesInstance(),
-                procMesh.meshSubDir,
-                procMesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            procPointAddressing_[procI]
-        );
-        pointProcAddressing.write();
-
-        labelIOList faceProcAddressing
-        (
-            IOobject
-            (
-                "faceProcAddressing",
-                procMesh.facesInstance(),
-                procMesh.meshSubDir,
-                procMesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            procFaceAddressing_[procI]
-        );
-        faceProcAddressing.write();
-
-        labelIOList cellProcAddressing
-        (
-            IOobject
-            (
-                "cellProcAddressing",
-                procMesh.facesInstance(),
-                procMesh.meshSubDir,
-                procMesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            procCellAddressing_[procI]
-        );
-        cellProcAddressing.write();
-
-        labelIOList boundaryProcAddressing
-        (
-            IOobject
-            (
-                "boundaryProcAddressing",
-                procMesh.facesInstance(),
-                procMesh.meshSubDir,
-                procMesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            procBoundaryAddressing_[procI]
-        );
-        boundaryProcAddressing.write();
-
-        // Create and write cellLevel and pointLevel information
-        const unallocLabelList& cellMap = cellProcAddressing;
-        labelIOList procCellLevel
-        (
-            IOobject
-            (
-                "cellLevel",
-                procMesh.facesInstance(),
-                procMesh.meshSubDir,
-                procMesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            labelList(globalCellLevel, cellMap)
-        );
-        procCellLevel.write();
-
-        const unallocLabelList& pointMap = pointProcAddressing;
-        labelIOList procPointLevel
-        (
-            IOobject
-            (
-                "pointLevel",
-                procMesh.facesInstance(),
-                procMesh.meshSubDir,
-                procMesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            labelList(globalPointLevel, pointMap)
-        );
-        procPointLevel.write();
-    }
-
-    Info<< nl
-        << "Number of processor faces = " << totProcFaces/2 << nl
-        << "Max number of processor patches = " << maxProcPatches << nl
-        << "Max number of faces between processors = " << maxProcFaces
-        << endl;
-
-    return true;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/decomposePar/readFields.C b/applications/utilities/parallelProcessing/decomposePar/readFields.C
index 7f6ee2486..b9165bdf9 100644
--- a/applications/utilities/parallelProcessing/decomposePar/readFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/readFields.C
@@ -48,7 +48,7 @@ void Foam::readFields
     // Construct the vol scalar fields
     fields.setSize(fieldObjects.size());
 
-    label fieldi=0;
+    label fieldI = 0;
     for
     (
         IOobjectList::iterator iter = fieldObjects.begin();
@@ -58,7 +58,7 @@ void Foam::readFields
     {
         fields.set
         (
-            fieldi++,
+            fieldI++,
             new GeoField
             (
                 *iter(),
diff --git a/applications/utilities/parallelProcessing/reconstructPar/Make/files b/applications/utilities/parallelProcessing/reconstructPar/Make/files
index 65fe2bdef..1902912ef 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/Make/files
+++ b/applications/utilities/parallelProcessing/reconstructPar/Make/files
@@ -1,10 +1,4 @@
 processorMeshes.C
-processorFaMeshes.C
-fvFieldReconstructor.C
-faFieldReconstructor.C
-pointFieldReconstructor.C
-tetPointFieldReconstructor.C
-reconstructLagrangianPositions.C
 reconstructPar.C
 
 EXE = $(FOAM_APPBIN)/reconstructPar
diff --git a/applications/utilities/parallelProcessing/reconstructPar/Make/options b/applications/utilities/parallelProcessing/reconstructPar/Make/options
index 5ed1bebe5..eb2754920 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/Make/options
+++ b/applications/utilities/parallelProcessing/reconstructPar/Make/options
@@ -1,12 +1,17 @@
 EXE_INC = \
+    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/decompositionMethods/decomposeReconstruct/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/tetFiniteElement/lnInclude
 
 EXE_LIBS = \
+    -ldecompositionMethods \
+    -ldecomposeReconstruct \
+    -lmeshTools \
     -lfiniteVolume \
     -lfiniteArea \
     -llagrangian \
-    -lmeshTools \
     -ltetFiniteElement
diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
deleted file mode 100644
index 236faa138..000000000
--- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
+++ /dev/null
@@ -1,526 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvFieldReconstructor.H"
-#include "foamTime.H"
-#include "PtrList.H"
-#include "fvPatchFields.H"
-#include "emptyFvPatch.H"
-#include "emptyFvPatchField.H"
-#include "emptyFvsPatchField.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
-Foam::fvFieldReconstructor::reconstructFvVolumeField
-(
-    const IOobject& fieldIoObject
-)
-{
-    // Read the field for all the processors
-    PtrList<GeometricField<Type, fvPatchField, volMesh> > procFields
-    (
-        procMeshes_.size()
-    );
-
-    forAll (procMeshes_, procI)
-    {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, fvPatchField, volMesh>
-            (
-                IOobject
-                (
-                    fieldIoObject.name(),
-                    procMeshes_[procI].time().timeName(),
-                    procMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
-    }
-
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nCells());
-
-    // Create the patch fields
-    PtrList<fvPatchField<Type> > patchFields(mesh_.boundary().size());
-
-
-    forAll (procMeshes_, procI)
-    {
-        const GeometricField<Type, fvPatchField, volMesh>& procField =
-            procFields[procI];
-
-        // Set the cell values in the reconstructed field
-        internalField.rmap
-        (
-            procField.internalField(),
-            cellProcAddressing_[procI]
-        );
-
-        // Set the boundary patch values in the reconstructed field
-        forAll (boundaryProcAddressing_[procI], patchI)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // Get addressing slice for this patch
-            const labelList::subList cp =
-                procMeshes_[procI].boundary()[patchI].patchSlice
-                (
-                    faceProcAddressing_[procI]
-                );
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
-            {
-                // Regular patch. Fast looping
-
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        fvPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, volMesh>::null(),
-                            fvPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
-
-                const label curPatchStart =
-                    mesh_.boundaryMesh()[curBPatch].start();
-
-                labelList reverseAddressing(cp.size());
-
-                forAll (cp, faceI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-                    reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
-                }
-
-                patchFields[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchI],
-                    reverseAddressing
-                );
-            }
-            else
-            {
-                const Field<Type>& curProcPatch =
-                    procField.boundaryField()[patchI];
-
-                // In processor patches, there's a mix of internal faces (some
-                // of them turned) and possible cyclics. Slow loop
-                forAll (cp, faceI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-                    label curF = cp[faceI] - 1;
-
-                    // Is the face on the boundary?
-                    if (curF >= mesh_.nInternalFaces())
-                    {
-                        label curBPatch =
-                            mesh_.boundaryMesh().whichPatch(curF);
-
-                        if (!patchFields(curBPatch))
-                        {
-                            patchFields.set
-                            (
-                                curBPatch,
-                                fvPatchField<Type>::New
-                                (
-                                    mesh_.boundary()[curBPatch].type(),
-                                    mesh_.boundary()[curBPatch],
-                                    DimensionedField<Type, volMesh>::null()
-                                )
-                            );
-                        }
-
-                        // add the face
-                        label curPatchFace =
-                            mesh_.boundaryMesh()
-                                [curBPatch].whichFace(curF);
-
-                        patchFields[curBPatch][curPatchFace] =
-                            curProcPatch[faceI];
-                    }
-                }
-            }
-        }
-    }
-
-    forAll (mesh_.boundary(), patchI)
-    {
-        // add empty patches
-        if
-        (
-            isType<emptyFvPatch>(mesh_.boundary()[patchI])
-         && !patchFields(patchI)
-        )
-        {
-            patchFields.set
-            (
-                patchI,
-                fvPatchField<Type>::New
-                (
-                    emptyFvPatchField<Type>::typeName,
-                    mesh_.boundary()[patchI],
-                    DimensionedField<Type, volMesh>::null()
-                )
-            );
-        }
-    }
-
-
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
-    (
-        new GeometricField<Type, fvPatchField, volMesh>
-        (
-            IOobject
-            (
-                fieldIoObject.name(),
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            procFields[0].dimensions(),
-            internalField,
-            patchFields
-        )
-    );
-}
-
-
-template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
-Foam::fvFieldReconstructor::reconstructFvSurfaceField
-(
-    const IOobject& fieldIoObject
-)
-{
-    // Read the field for all the processors
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> > procFields
-    (
-        procMeshes_.size()
-    );
-
-    forAll (procMeshes_, procI)
-    {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, fvsPatchField, surfaceMesh>
-            (
-                IOobject
-                (
-                    fieldIoObject.name(),
-                    procMeshes_[procI].time().timeName(),
-                    procMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
-    }
-
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nInternalFaces());
-
-    // Create the patch fields
-    PtrList<fvsPatchField<Type> > patchFields(mesh_.boundary().size());
-
-    forAll (procMeshes_, procI)
-    {
-        const GeometricField<Type, fvsPatchField, surfaceMesh>& procField =
-            procFields[procI];
-
-        // Set the face values in the reconstructed field
-
-        // It is necessary to create a copy of the addressing array to
-        // take care of the face direction offset trick.
-        //
-        {
-            labelList curAddr(faceProcAddressing_[procI]);
-
-            forAll (curAddr, addrI)
-            {
-                curAddr[addrI] -= 1;
-            }
-
-            internalField.rmap
-            (
-                procField.internalField(),
-                curAddr
-            );
-        }
-
-        // Set the boundary patch values in the reconstructed field
-        forAll (boundaryProcAddressing_[procI], patchI)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // Get addressing slice for this patch
-            const labelList::subList cp =
-                procMeshes_[procI].boundary()[patchI].patchSlice
-                (
-                    faceProcAddressing_[procI]
-                );
-
-            // Check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
-            {
-                // Regular patch. Fast looping
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        fvsPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, surfaceMesh>::null(),
-                            fvPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
-
-                const label curPatchStart =
-                    mesh_.boundaryMesh()[curBPatch].start();
-
-                labelList reverseAddressing(cp.size());
-
-                forAll (cp, faceI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-                    reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
-                }
-
-                patchFields[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchI],
-                    reverseAddressing
-                );
-            }
-            else
-            {
-                const Field<Type>& curProcPatch =
-                    procField.boundaryField()[patchI];
-
-                // In processor patches, there's a mix of internal faces (some
-                // of them turned) and possible cyclics. Slow loop
-                forAll (cp, faceI)
-                {
-                    label curF = cp[faceI] - 1;
-
-                    // Is the face turned the right side round
-                    if (curF >= 0)
-                    {
-                        // Is the face on the boundary?
-                        if (curF >= mesh_.nInternalFaces())
-                        {
-                            label curBPatch =
-                                mesh_.boundaryMesh().whichPatch(curF);
-
-                            if (!patchFields(curBPatch))
-                            {
-                                patchFields.set
-                                (
-                                    curBPatch,
-                                    fvsPatchField<Type>::New
-                                    (
-                                        mesh_.boundary()[curBPatch].type(),
-                                        mesh_.boundary()[curBPatch],
-                                        DimensionedField<Type, surfaceMesh>
-                                           ::null()
-                                    )
-                                );
-                            }
-
-                            // add the face
-                            label curPatchFace =
-                                mesh_.boundaryMesh()
-                                [curBPatch].whichFace(curF);
-
-                            patchFields[curBPatch][curPatchFace] =
-                                curProcPatch[faceI];
-                        }
-                        else
-                        {
-                            // Internal face
-                            internalField[curF] = curProcPatch[faceI];
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    forAll (mesh_.boundary(), patchI)
-    {
-        // add empty patches
-        if
-        (
-            isType<emptyFvPatch>(mesh_.boundary()[patchI])
-         && !patchFields(patchI)
-        )
-        {
-            patchFields.set
-            (
-                patchI,
-                fvsPatchField<Type>::New
-                (
-                    emptyFvsPatchField<Type>::typeName,
-                    mesh_.boundary()[patchI],
-                    DimensionedField<Type, surfaceMesh>::null()
-                )
-            );
-        }
-    }
-
-
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-    (
-        new GeometricField<Type, fvsPatchField, surfaceMesh>
-        (
-            IOobject
-            (
-                fieldIoObject.name(),
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            procFields[0].dimensions(),
-            internalField,
-            patchFields
-        )
-    );
-}
-
-
-// Reconstruct and write all/selected volume fields
-template<class Type>
-void Foam::fvFieldReconstructor::reconstructFvVolumeFields
-(
-    const IOobjectList& objects,
-    const HashSet<word>& selectedFields
-)
-{
-    const word& fieldClassName =
-        GeometricField<Type, fvPatchField, volMesh>::typeName;
-
-    IOobjectList fields = objects.lookupClass(fieldClassName);
-
-    if (fields.size())
-    {
-        Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
-
-        forAllConstIter(IOobjectList, fields, fieldIter)
-        {
-            if
-            (
-                !selectedFields.size()
-             || selectedFields.found(fieldIter()->name())
-            )
-            {
-                Info<< "        " << fieldIter()->name() << endl;
-
-                reconstructFvVolumeField<Type>(*fieldIter())().write();
-            }
-        }
-        Info<< endl;
-    }
-}
-
-
-// Reconstruct and write all/selected surface fields
-template<class Type>
-void Foam::fvFieldReconstructor::reconstructFvSurfaceFields
-(
-    const IOobjectList& objects,
-    const HashSet<word>& selectedFields
-)
-{
-    const word& fieldClassName =
-        GeometricField<Type, fvsPatchField, surfaceMesh>::typeName;
-
-    IOobjectList fields = objects.lookupClass(fieldClassName);
-
-    if (fields.size())
-    {
-        Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
-
-        forAllConstIter(IOobjectList, fields, fieldIter)
-        {
-            if
-            (
-                !selectedFields.size()
-             || selectedFields.found(fieldIter()->name())
-            )
-            {
-                Info<< "        " << fieldIter()->name() << endl;
-
-                reconstructFvSurfaceField<Type>(*fieldIter())().write();
-            }
-        }
-
-        Info<< endl;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/Make/files b/applications/utilities/parallelProcessing/reconstructParMesh/Make/files
index f8d6eb89c..e2fa53b3b 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/Make/files
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/Make/files
@@ -1,14 +1,3 @@
-processorMeshesReconstructor.C
-processorMeshesRebuild.C
-
-processorFaMeshes.C
-
-fvFieldReconstructor.C
-faFieldReconstructor.C
-pointFieldReconstructor.C
-tetPointFieldReconstructor.C
-reconstructLagrangianPositions.C
-
 reconstructParMesh.C
 
 EXE = $(FOAM_APPBIN)/reconstructParMesh
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/Make/options b/applications/utilities/parallelProcessing/reconstructParMesh/Make/options
index 5ed1bebe5..bcaf0aaba 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/Make/options
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/Make/options
@@ -1,10 +1,14 @@
 EXE_INC = \
+    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/decompositionMethods/decomposeReconstruct/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/tetFiniteElement/lnInclude
 
 EXE_LIBS = \
+    -ldecompositionMethods \
+    -ldecomposeReconstruct \
     -lfiniteVolume \
     -lfiniteArea \
     -llagrangian \
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructor.C b/applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructor.C
deleted file mode 100644
index 24a296d01..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructor.C
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "faFieldReconstructor.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::faFieldReconstructor::faFieldReconstructor
-(
-    faMesh& mesh,
-    const PtrList<faMesh>& procMeshes,
-    const PtrList<labelIOList>& edgeProcAddressing,
-    const PtrList<labelIOList>& faceProcAddressing,
-    const PtrList<labelIOList>& boundaryProcAddressing
-)
-:
-    mesh_(mesh),
-    procMeshes_(procMeshes),
-    edgeProcAddressing_(edgeProcAddressing),
-    faceProcAddressing_(faceProcAddressing),
-    boundaryProcAddressing_(boundaryProcAddressing)
-{}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructor.H
deleted file mode 100644
index b592d001e..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructor.H
+++ /dev/null
@@ -1,197 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    faFieldReconstructor
-
-Description
-    FA area and edge field reconstructor.
-
-Author
-    Zeljko Tukovic, FSB Zagreb.  All rights reserved
-
-SourceFiles
-    faFieldReconstructor.C
-    faFieldReconstructorReconstructFields.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef faFieldReconstructor_H
-#define faFieldReconstructor_H
-
-#include "PtrList.H"
-#include "faMesh.H"
-#include "IOobjectList.H"
-#include "faPatchFieldMapper.H"
-#include "labelIOList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-
-/*---------------------------------------------------------------------------*\
-                     Class faFieldReconstructor Declaration
-\*---------------------------------------------------------------------------*/
-
-class faFieldReconstructor
-{
-    // Private data
-
-        //- Reconstructed mesh reference
-        faMesh& mesh_;
-
-        //- List of processor meshes
-        const PtrList<faMesh>& procMeshes_;
-
-        //- List of processor edge addressing lists
-        const PtrList<labelIOList>& edgeProcAddressing_;
-
-        //- List of processor face addressing lists
-        const PtrList<labelIOList>& faceProcAddressing_;
-
-        //- List of processor boundary addressing lists
-        const PtrList<labelIOList>& boundaryProcAddressing_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        faFieldReconstructor(const faFieldReconstructor&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const faFieldReconstructor&);
-
-
-public:
-
-        class faPatchFieldReconstructor
-        :
-            public faPatchFieldMapper
-        {
-            label size_;
-            label sizeBeforeMapping_;
-
-        public:
-
-            // Constructors
-
-                //- Construct given size
-                faPatchFieldReconstructor
-                (
-                    const label size,
-                    const label sizeBeforeMapping
-                )
-                :
-                    size_(size),
-                    sizeBeforeMapping_(sizeBeforeMapping)
-                {}
-
-
-            // Member functions
-
-                virtual label size() const
-                {
-                    return size_;
-                }
-
-                virtual label sizeBeforeMapping() const
-                {
-                    return sizeBeforeMapping_;
-                }
-
-                virtual bool direct() const
-                {
-                    return true;
-                }
-
-                virtual const unallocLabelList& directAddressing() const
-                {
-                    return unallocLabelList::null();
-                }
-        };
-
-
-    // Constructors
-
-        //- Construct from components
-        faFieldReconstructor
-        (
-            faMesh& mesh,
-            const PtrList<faMesh>& procMeshes,
-            const PtrList<labelIOList>& edgeProcAddressing,
-            const PtrList<labelIOList>& faceProcAddressing,
-            const PtrList<labelIOList>& boundaryProcAddressing
-        );
-
-
-    // Member Functions
-
-        //- Reconstruct area field
-        template<class Type>
-        tmp<GeometricField<Type, faPatchField, areaMesh> >
-        reconstructFaAreaField
-        (
-            const IOobject& fieldIoObject
-        );
-
-        //- Reconstruct edge field
-        template<class Type>
-        tmp<GeometricField<Type, faePatchField, edgeMesh> >
-        reconstructFaEdgeField
-        (
-            const IOobject& fieldIoObject
-        );
-
-        //- Reconstruct and write all area fields
-        template<class Type>
-        void reconstructFaAreaFields
-        (
-            const IOobjectList& objects
-        );
-
-        //- Reconstruct and write all area fields
-        template<class Type>
-        void reconstructFaEdgeFields
-        (
-            const IOobjectList& objects
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "faFieldReconstructorReconstructFields.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructorReconstructFields.C
deleted file mode 100644
index 75167729e..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/faFieldReconstructorReconstructFields.C
+++ /dev/null
@@ -1,640 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "faFieldReconstructor.H"
-#include "foamTime.H"
-#include "PtrList.H"
-#include "faPatchFields.H"
-#include "emptyFaPatch.H"
-#include "emptyFaPatchField.H"
-#include "emptyFaePatchField.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh> >
-Foam::faFieldReconstructor::reconstructFaAreaField
-(
-    const IOobject& fieldIoObject
-)
-{
-    // Read the field for all the processors
-    PtrList<GeometricField<Type, faPatchField, areaMesh> > procFields
-    (
-        procMeshes_.size()
-    );
-
-    forAll (procMeshes_, procI)
-    {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, faPatchField, areaMesh>
-            (
-                IOobject
-                (
-                    fieldIoObject.name(),
-                    procMeshes_[procI].time().timeName(),
-                    procMeshes_[procI](),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
-    }
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nFaces());
-
-    // Create the patch fields
-    PtrList<faPatchField<Type> > patchFields(mesh_.boundary().size());
-
-
-    // Create global mesh patchs starts
-
-    labelList gStarts(mesh_.boundary().size(), -1);
-
-    if (mesh_.boundary().size() > 0)
-    {
-        gStarts[0] = mesh_.nInternalEdges();
-    }
-
-    for(label i=1; i<mesh_.boundary().size(); i++)
-    {
-        gStarts[i] = gStarts[i-1] + mesh_.boundary()[i-1].labelList::size();
-    }
-
-    forAll (procMeshes_, procI)
-    {
-        const GeometricField<Type, faPatchField, areaMesh>& procField =
-            procFields[procI];
-
-        // Set the face values in the reconstructed field
-        internalField.rmap
-        (
-            procField.internalField(),
-            faceProcAddressing_[procI]
-        );
-
-
-
-        // Set the boundary patch values in the reconstructed field
-
-        labelList starts(procMeshes_[procI].boundary().size(), -1);
-
-        if(procMeshes_[procI].boundary().size() > 0)
-        {
-            starts[0] = procMeshes_[procI].nInternalEdges();
-        }
-
-        for(label i=1; i<procMeshes_[procI].boundary().size(); i++)
-        {
-            starts[i] =
-                starts[i-1]
-              + procMeshes_[procI].boundary()[i-1].labelList::size();
-        }
-
-        forAll(boundaryProcAddressing_[procI], patchI)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // Get addressing slice for this patch
-
-//             const labelList::subList cp =
-//                 procMeshes_[procI].boundary()[patchI].patchSlice
-//                 (
-//                     edgeProcAddressing_[procI]
-//                 );
-
-            const labelList::subList cp =
-                labelList::subList
-                (
-                    edgeProcAddressing_[procI],
-                    procMeshes_[procI].boundary()[patchI].size(),
-                    starts[patchI]
-                );
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
-            {
-                // Regular patch. Fast looping
-
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        faPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, areaMesh>::null(),
-                            faPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
-
-                const label curPatchStart = gStarts[curBPatch];
-//                     mesh_.boundary()[curBPatch].start();
-
-                labelList reverseAddressing(cp.size());
-
-                forAll(cp, edgeI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-//                     reverseAddressing[edgeI] = cp[edgeI] - 1 - curPatchStart;
-                    reverseAddressing[edgeI] = cp[edgeI] - curPatchStart;
-                }
-
-                patchFields[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchI],
-                    reverseAddressing
-                );
-            }
-            else
-            {
-                const Field<Type>& curProcPatch =
-                    procField.boundaryField()[patchI];
-
-                // In processor patches, there's a mix of internal faces (some
-                // of them turned) and possible cyclics. Slow loop
-                forAll(cp, edgeI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-//                     label curE = cp[edgeI] - 1;
-                    label curE = cp[edgeI];
-
-                    // Is the face on the boundary?
-                    if (curE >= mesh_.nInternalEdges())
-                    {
-//                         label curBPatch = mesh_.boundary().whichPatch(curE);
-                        label curBPatch = -1;
-
-                        forAll (mesh_.boundary(), pI)
-                        {
-                            if
-                            (
-                                curE >= gStarts[pI]
-                             && curE <
-                                (
-                                    gStarts[pI]
-                                  + mesh_.boundary()[pI].labelList::size()
-                                )
-                            )
-                            {
-                                curBPatch = pI;
-                            }
-                        }
-
-                        if (!patchFields(curBPatch))
-                        {
-                            patchFields.set
-                            (
-                                curBPatch,
-                                faPatchField<Type>::New
-                                (
-                                    mesh_.boundary()[curBPatch].type(),
-                                    mesh_.boundary()[curBPatch],
-                                    DimensionedField<Type, areaMesh>::null()
-                                )
-                            );
-                        }
-
-                        // add the edge
-//                         label curPatchEdge =
-//                             mesh_.boundary()
-//                                 [curBPatch].whichEdge(curE);
-
-                        label curPatchEdge = curE - gStarts[curBPatch];
-
-                        patchFields[curBPatch][curPatchEdge] =
-                            curProcPatch[edgeI];
-                    }
-                }
-            }
-        }
-    }
-
-    forAll(mesh_.boundary(), patchI)
-    {
-        // add empty patches
-        if
-        (
-            typeid(mesh_.boundary()[patchI]) == typeid(emptyFaPatch)
-         && !patchFields(patchI)
-        )
-        {
-            patchFields.set
-            (
-                patchI,
-                faPatchField<Type>::New
-                (
-                    emptyFaPatchField<Type>::typeName,
-                    mesh_.boundary()[patchI],
-                    DimensionedField<Type, areaMesh>::null()
-                )
-            );
-        }
-    }
-
-
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, faPatchField, areaMesh> >
-    (
-        new GeometricField<Type, faPatchField, areaMesh>
-        (
-            IOobject
-            (
-                fieldIoObject.name(),
-                mesh_.time().timeName(),
-                mesh_(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            procFields[0].dimensions(),
-            internalField,
-            patchFields
-        )
-    );
-}
-
-
-template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::faePatchField, Foam::edgeMesh> >
-Foam::faFieldReconstructor::reconstructFaEdgeField
-(
-    const IOobject& fieldIoObject
-)
-{
-    // Read the field for all the processors
-    PtrList<GeometricField<Type, faePatchField, edgeMesh> > procFields
-    (
-        procMeshes_.size()
-    );
-
-    forAll (procMeshes_, procI)
-    {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, faePatchField, edgeMesh>
-            (
-                IOobject
-                (
-                    fieldIoObject.name(),
-                    procMeshes_[procI].time().timeName(),
-                    procMeshes_[procI](),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
-    }
-
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nInternalEdges());
-
-    // Create the patch fields
-    PtrList<faePatchField<Type> > patchFields(mesh_.boundary().size());
-
-
-    labelList gStarts(mesh_.boundary().size(), -1);
-
-    if(mesh_.boundary().size() > 0)
-    {
-        gStarts[0] = mesh_.nInternalEdges();
-    }
-
-    for(label i=1; i<mesh_.boundary().size(); i++)
-    {
-        gStarts[i] = gStarts[i-1] + mesh_.boundary()[i-1].labelList::size();
-    }
-
-
-    forAll (procMeshes_, procI)
-    {
-        const GeometricField<Type, faePatchField, edgeMesh>& procField =
-            procFields[procI];
-
-        // Set the face values in the reconstructed field
-
-        // It is necessary to create a copy of the addressing array to
-        // take care of the face direction offset trick.
-        //
-        {
-            labelList curAddr(edgeProcAddressing_[procI]);
-
-//             forAll (curAddr, addrI)
-//             {
-//                 curAddr[addrI] -= 1;
-//             }
-
-            internalField.rmap
-            (
-                procField.internalField(),
-                curAddr
-            );
-        }
-
-        // Set the boundary patch values in the reconstructed field
-
-        labelList starts(procMeshes_[procI].boundary().size(), -1);
-
-        if(procMeshes_[procI].boundary().size() > 0)
-        {
-            starts[0] = procMeshes_[procI].nInternalEdges();
-        }
-
-        for(label i=1; i<procMeshes_[procI].boundary().size(); i++)
-        {
-            starts[i] =
-                starts[i-1]
-              + procMeshes_[procI].boundary()[i-1].labelList::size();
-        }
-
-        forAll(boundaryProcAddressing_[procI], patchI)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // Get addressing slice for this patch
-
-//             const labelList::subList cp =
-//                 procMeshes_[procI].boundary()[patchI].patchSlice
-//                 (
-//                     faceProcAddressing_[procI]
-//                 );
-
-            const labelList::subList cp =
-                labelList::subList
-                (
-                    edgeProcAddressing_[procI],
-                    procMeshes_[procI].boundary()[patchI].size(),
-                    starts[patchI]
-                );
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
-            {
-                // Regular patch. Fast looping
-
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        faePatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, edgeMesh>::null(),
-                            faPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
-
-                const label curPatchStart = gStarts[curBPatch];
-//                     mesh_.boundary()[curBPatch].start();
-
-                labelList reverseAddressing(cp.size());
-
-                forAll(cp, edgeI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-//                     reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
-                    reverseAddressing[edgeI] = cp[edgeI] - curPatchStart;
-                }
-
-                patchFields[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchI],
-                    reverseAddressing
-                );
-            }
-            else
-            {
-                const Field<Type>& curProcPatch =
-                    procField.boundaryField()[patchI];
-
-                // In processor patches, there's a mix of internal faces (some
-                // of them turned) and possible cyclics. Slow loop
-                forAll(cp, edgeI)
-                {
-//                     label curF = cp[edgeI] - 1;
-                    label curE = cp[edgeI];
-
-                    // Is the face turned the right side round
-                    if (curE >= 0)
-                    {
-                        // Is the face on the boundary?
-                        if (curE >= mesh_.nInternalEdges())
-                        {
-//                             label curBPatch =
-//                                 mesh_.boundary().whichPatch(curF);
-
-                            label curBPatch = -1;
-
-                            forAll (mesh_.boundary(), pI)
-                            {
-                                if
-                                (
-                                    curE >= gStarts[pI]
-                                 && curE <
-                                    (
-                                        gStarts[pI]
-                                      + mesh_.boundary()[pI].labelList::size()
-                                    )
-                                )
-                                {
-                                    curBPatch = pI;
-                                }
-                            }
-
-                            if (!patchFields(curBPatch))
-                            {
-                                patchFields.set
-                                (
-                                    curBPatch,
-                                    faePatchField<Type>::New
-                                    (
-                                        mesh_.boundary()[curBPatch].type(),
-                                        mesh_.boundary()[curBPatch],
-                                        DimensionedField<Type, edgeMesh>
-                                           ::null()
-                                    )
-                                );
-                            }
-
-                            // add the face
-//                             label curPatchFace =
-//                                 mesh_.boundary()
-//                                 [curBPatch].whichEdge(curF);
-
-                            label curPatchEdge = curE - gStarts[curBPatch];
-
-                            patchFields[curBPatch][curPatchEdge] =
-                                curProcPatch[edgeI];
-                        }
-                        else
-                        {
-                            // Internal face
-                            internalField[curE] = curProcPatch[edgeI];
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    forAll(mesh_.boundary(), patchI)
-    {
-        // add empty patches
-        if
-        (
-            typeid(mesh_.boundary()[patchI]) == typeid(emptyFaPatch)
-         && !patchFields(patchI)
-        )
-        {
-            patchFields.set
-            (
-                patchI,
-                faePatchField<Type>::New
-                (
-                    emptyFaePatchField<Type>::typeName,
-                    mesh_.boundary()[patchI],
-                    DimensionedField<Type, edgeMesh>::null()
-                )
-            );
-        }
-    }
-
-
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, faePatchField, edgeMesh> >
-    (
-        new GeometricField<Type, faePatchField, edgeMesh>
-        (
-            IOobject
-            (
-                fieldIoObject.name(),
-                mesh_.time().timeName(),
-                mesh_(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            procFields[0].dimensions(),
-            internalField,
-            patchFields
-        )
-    );
-}
-
-
-// Reconstruct and write all area fields
-template<class Type>
-void Foam::faFieldReconstructor::reconstructFaAreaFields
-(
-    const IOobjectList& objects
-)
-{
-    const word& fieldClassName =
-        GeometricField<Type, faPatchField, areaMesh>::typeName;
-
-    IOobjectList fields = objects.lookupClass(fieldClassName);
-
-    if (fields.size())
-    {
-        Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
-
-        for
-        (
-            IOobjectList::const_iterator fieldIter = fields.begin();
-            fieldIter != fields.end();
-            ++fieldIter
-        )
-        {
-            Info << "        " << fieldIter()->name() << endl;
-
-            reconstructFaAreaField<Type>(*fieldIter())().write();
-        }
-
-        Info<< endl;
-    }
-}
-
-// Reconstruct and write all edge fields
-template<class Type>
-void Foam::faFieldReconstructor::reconstructFaEdgeFields
-(
-    const IOobjectList& objects
-)
-{
-    const word& fieldClassName =
-        GeometricField<Type, faePatchField, edgeMesh>::typeName;
-
-    IOobjectList fields = objects.lookupClass(fieldClassName);
-
-    if (fields.size())
-    {
-        Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
-
-        for
-        (
-            IOobjectList::const_iterator fieldIter = fields.begin();
-            fieldIter != fields.end();
-            ++fieldIter
-        )
-        {
-            Info<< "        " << fieldIter()->name() << endl;
-
-            reconstructFaEdgeField<Type>(*fieldIter())().write();
-        }
-
-        Info<< endl;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructor.C b/applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructor.C
deleted file mode 100644
index e187c92d9..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructor.C
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvFieldReconstructor.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::fvFieldReconstructor::fvFieldReconstructor
-(
-    fvMesh& mesh,
-    const PtrList<fvMesh>& procMeshes,
-    const PtrList<labelIOList>& faceProcAddressing,
-    const PtrList<labelIOList>& cellProcAddressing,
-    const PtrList<labelIOList>& boundaryProcAddressing
-)
-:
-    mesh_(mesh),
-    procMeshes_(procMeshes),
-    faceProcAddressing_(faceProcAddressing),
-    cellProcAddressing_(cellProcAddressing),
-    boundaryProcAddressing_(boundaryProcAddressing)
-{}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructor.H
deleted file mode 100644
index cb4b09ccf..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructor.H
+++ /dev/null
@@ -1,196 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::fvFieldReconstructor
-
-Description
-    FV volume and surface field reconstructor.
-
-SourceFiles
-    fvFieldReconstructor.C
-    fvFieldReconstructorReconstructFields.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fvFieldReconstructor_H
-#define fvFieldReconstructor_H
-
-#include "PtrList.H"
-#include "fvMesh.H"
-#include "IOobjectList.H"
-#include "fvPatchFieldMapper.H"
-#include "labelIOList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-
-/*---------------------------------------------------------------------------*\
-                 Class fvFieldReconstructor Declaration
-\*---------------------------------------------------------------------------*/
-
-class fvFieldReconstructor
-{
-    // Private data
-
-        //- Reconstructed mesh reference
-        fvMesh& mesh_;
-
-        //- List of processor meshes
-        const PtrList<fvMesh>& procMeshes_;
-
-        //- List of processor face addressing lists
-        const PtrList<labelIOList>& faceProcAddressing_;
-
-        //- List of processor cell addressing lists
-        const PtrList<labelIOList>& cellProcAddressing_;
-
-        //- List of processor boundary addressing lists
-        const PtrList<labelIOList>& boundaryProcAddressing_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        fvFieldReconstructor(const fvFieldReconstructor&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const fvFieldReconstructor&);
-
-
-public:
-
-        class fvPatchFieldReconstructor
-        :
-            public fvPatchFieldMapper
-        {
-            label size_;
-            label sizeBeforeMapping_;
-
-        public:
-
-            // Constructors
-
-                //- Construct given size
-                fvPatchFieldReconstructor
-                (
-                    const label size,
-                    const label sizeBeforeMapping
-                )
-                :
-                    size_(size),
-                    sizeBeforeMapping_(sizeBeforeMapping)
-                {}
-
-
-            // Member functions
-
-                virtual label size() const
-                {
-                    return size_;
-                }
-
-                virtual label sizeBeforeMapping() const
-                {
-                    return sizeBeforeMapping_;
-                }
-
-                virtual bool direct() const
-                {
-                    return true;
-                }
-
-                virtual const unallocLabelList& directAddressing() const
-                {
-                    return unallocLabelList::null();
-                }
-        };
-
-
-    // Constructors
-
-        //- Construct from components
-        fvFieldReconstructor
-        (
-            fvMesh& mesh,
-            const PtrList<fvMesh>& procMeshes,
-            const PtrList<labelIOList>& faceProcAddressing,
-            const PtrList<labelIOList>& cellProcAddressing,
-            const PtrList<labelIOList>& boundaryProcAddressing
-        );
-
-
-    // Member Functions
-
-        //- Reconstruct volume field
-        template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> >
-        reconstructFvVolumeField
-        (
-            const IOobject& fieldIoObject
-        );
-
-        //- Reconstruct surface field
-        template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-        reconstructFvSurfaceField
-        (
-            const IOobject& fieldIoObject
-        );
-
-        //- Reconstruct and write all/selected volume fields
-        template<class Type>
-        void reconstructFvVolumeFields
-        (
-            const IOobjectList& objects,
-            const HashSet<word>& selectedFields
-        );
-
-        //- Reconstruct and write all/selected volume fields
-        template<class Type>
-        void reconstructFvSurfaceFields
-        (
-            const IOobjectList& objects,
-            const HashSet<word>& selectedFields
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "fvFieldReconstructorReconstructFields.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructor.C b/applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructor.C
deleted file mode 100644
index 46ef9b0de..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructor.C
+++ /dev/null
@@ -1,104 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "pointFieldReconstructor.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::pointFieldReconstructor::pointFieldReconstructor
-(
-    const pointMesh& mesh,
-    const PtrList<pointMesh>& procMeshes,
-    const PtrList<labelIOList>& pointProcAddressing,
-    const PtrList<labelIOList>& boundaryProcAddressing
-)
-:
-    mesh_(mesh),
-    procMeshes_(procMeshes),
-    pointProcAddressing_(pointProcAddressing),
-    boundaryProcAddressing_(boundaryProcAddressing),
-    patchPointAddressing_(procMeshes.size())
-{
-    // Inverse-addressing of the patch point labels.
-    labelList pointMap(mesh_.size(), -1);
-
-    // Create the pointPatch addressing
-    forAll(procMeshes_, proci)
-    {
-        const pointMesh& procMesh = procMeshes_[proci];
-
-        patchPointAddressing_[proci].setSize(procMesh.boundary().size());
-
-        forAll(procMesh.boundary(), patchi)
-        {
-            if (boundaryProcAddressing_[proci][patchi] >= 0)
-            {
-                labelList& procPatchAddr = patchPointAddressing_[proci][patchi];
-                procPatchAddr.setSize(procMesh.boundary()[patchi].size(), -1);
-
-                const labelList& patchPointLabels =
-                    mesh_.boundary()[boundaryProcAddressing_[proci][patchi]]
-                    .meshPoints();
-
-                // Create the inverse-addressing of the patch point labels.
-                forAll (patchPointLabels, pointi)
-                {
-                    pointMap[patchPointLabels[pointi]] = pointi;
-                }
-
-                const labelList& procPatchPoints =
-                    procMesh.boundary()[patchi].meshPoints();
-
-                forAll (procPatchPoints, pointi)
-                {
-                    procPatchAddr[pointi] =
-                        pointMap
-                        [
-                            pointProcAddressing_[proci][procPatchPoints[pointi]]
-                        ];
-                }
-
-                if (procPatchAddr.size() && min(procPatchAddr) < 0)
-                {
-                    FatalErrorIn
-                    (
-                        "pointFieldReconstructor::pointFieldReconstructor"
-                        "(\n"
-                        "    const pointMesh& mesh,\n"
-                        "    const PtrList<pointMesh>& procMeshes,\n"
-                        "    const PtrList<labelIOList>& pointProcAddressing,\n"
-                        "    const PtrList<labelIOList>& "
-                        "boundaryProcAddressing\n"
-                        ")"
-                    )   << "Incomplete patch point addressing"
-                        << abort(FatalError);
-                }
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructor.H
deleted file mode 100644
index 10c5229d9..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructor.H
+++ /dev/null
@@ -1,173 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::pointFieldReconstructor
-
-Description
-    Point field reconstructor.
-
-SourceFiles
-    pointFieldReconstructor.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef pointFieldReconstructor_H
-#define pointFieldReconstructor_H
-
-#include "pointMesh.H"
-#include "pointFields.H"
-#include "PointPatchFieldMapperPatchRef.H"
-#include "IOobjectList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                     Class pointFieldReconstructor Declaration
-\*---------------------------------------------------------------------------*/
-
-class pointFieldReconstructor
-{
-    // Private data
-
-        //- Reconstructed mesh reference
-        const pointMesh& mesh_;
-
-        //- List of processor meshes
-        const PtrList<pointMesh>& procMeshes_;
-
-        //- List of processor point addressing lists
-        const PtrList<labelIOList>& pointProcAddressing_;
-
-        //- List of processor boundary addressing lists
-        const PtrList<labelIOList>& boundaryProcAddressing_;
-
-        //- Point patch addressing
-        labelListListList patchPointAddressing_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        pointFieldReconstructor
-        (
-            const pointFieldReconstructor&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const pointFieldReconstructor&);
-
-
-public:
-
-        class pointPatchFieldReconstructor
-        :
-            public PointPatchFieldMapper
-        {
-            label size_;
-            label sizeBeforeMapping_;
-
-
-        public:
-
-            // Constructors
-
-                //- Construct given size
-                pointPatchFieldReconstructor
-                (
-                    const label size,
-                    const label sizeBeforeMapping
-                )
-                :
-                    size_(size),
-                    sizeBeforeMapping_(sizeBeforeMapping)
-                {}
-
-
-            // Member functions
-
-                virtual label size() const
-                {
-                    return size_;
-                }
-
-                virtual label sizeBeforeMapping() const
-                {
-                    return sizeBeforeMapping_;
-                }
-
-                virtual bool direct() const
-                {
-                    return true;
-                }
-
-                virtual const unallocLabelList& directAddressing() const
-                {
-                    return unallocLabelList::null();
-                }
-        };
-
-
-    // Constructors
-
-        //- Construct from components
-        pointFieldReconstructor
-        (
-            const pointMesh& mesh,
-            const PtrList<pointMesh>& procMeshes,
-            const PtrList<labelIOList>& pointProcAddressing,
-            const PtrList<labelIOList>& boundaryProcAddressing
-        );
-
-
-    // Member Functions
-
-        //- Reconstruct field
-        template<class Type>
-        tmp<GeometricField<Type, pointPatchField, pointMesh> >
-        reconstructField(const IOobject& fieldIoObject);
-
-        //- Reconstruct and write all fields
-        template<class Type>
-        void reconstructFields(const IOobjectList& objects);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "pointFieldReconstructorReconstructFields.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructorReconstructFields.C
deleted file mode 100644
index e8eb75dc3..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/pointFieldReconstructorReconstructFields.C
+++ /dev/null
@@ -1,178 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "pointFieldReconstructor.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
-Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
-{
-    // Read the field for all the processors
-    PtrList<GeometricField<Type, pointPatchField, pointMesh> > procFields
-    (
-        procMeshes_.size()
-    );
-
-    forAll (procMeshes_, proci)
-    {
-        procFields.set
-        (
-            proci,
-            new GeometricField<Type, pointPatchField, pointMesh>
-            (
-                IOobject
-                (
-                    fieldIoObject.name(),
-                    procMeshes_[proci]().time().timeName(),
-                    procMeshes_[proci](),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[proci]
-            )
-        );
-    }
-
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.size());
-
-    // Create the patch fields
-    PtrList<pointPatchField<Type> > patchFields(mesh_.boundary().size());
-
-
-    forAll (procMeshes_, proci)
-    {
-        const GeometricField<Type, pointPatchField, pointMesh>&
-            procField = procFields[proci];
-
-        // Get processor-to-global addressing for use in rmap
-        const labelList& procToGlobalAddr = pointProcAddressing_[proci];
-
-        // Set the cell values in the reconstructed field
-        internalField.rmap
-        (
-            procField.internalField(),
-            procToGlobalAddr
-        );
-
-        // Set the boundary patch values in the reconstructed field
-        forAll(boundaryProcAddressing_[proci], patchi)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[proci][patchi];
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
-            {
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        pointPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchi],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, pointMesh>::null(),
-                            pointPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchi].size()
-                            )
-                        )
-                    );
-                }
-
-                patchFields[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchi],
-                    patchPointAddressing_[proci][patchi]
-                );
-            }
-        }
-    }
-
-    // Construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, pointPatchField, pointMesh> >
-    (
-        new GeometricField<Type, pointPatchField, pointMesh>
-        (
-            IOobject
-            (
-                fieldIoObject.name(),
-                mesh_().time().timeName(),
-                mesh_(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            procFields[0].dimensions(),
-            internalField,
-            patchFields
-        )
-    );
-}
-
-
-// Reconstruct and write all point fields
-template<class Type>
-void Foam::pointFieldReconstructor::reconstructFields
-(
-    const IOobjectList& objects
-)
-{
-    word fieldClassName
-    (
-        GeometricField<Type, pointPatchField, pointMesh>::typeName
-    );
-
-    IOobjectList fields = objects.lookupClass(fieldClassName);
-
-    if (fields.size())
-    {
-        Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
-
-        for
-        (
-            IOobjectList::iterator fieldIter = fields.begin();
-            fieldIter != fields.end();
-            ++fieldIter
-        )
-        {
-            Info<< "        " << fieldIter()->name() << endl;
-
-            reconstructField<Type>(*fieldIter())().write();
-        }
-
-        Info<< endl;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/processorFaMeshes.C b/applications/utilities/parallelProcessing/reconstructParMesh/processorFaMeshes.C
deleted file mode 100644
index 67de45c23..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/processorFaMeshes.C
+++ /dev/null
@@ -1,258 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "processorFaMeshes.H"
-#include "foamTime.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::processorFaMeshes::read()
-{
-    forAll (fvMeshes_, procI)
-    {
-        meshes_.set
-        (
-            procI,
-            new faMesh(fvMeshes_[procI])
-        );
-
-        pointProcAddressing_.set
-        (
-            procI,
-            new labelIOList
-            (
-                IOobject
-                (
-                    "pointProcAddressing",
-                    meshes_[procI].time().findInstance
-                    (
-                        meshes_[procI].meshDir(),
-                        "pointProcAddressing"
-                    ),
-                    meshes_[procI].meshSubDir,
-                    fvMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
-
-        edgeProcAddressing_.set
-        (
-            procI,
-            new labelIOList
-            (
-                IOobject
-                (
-                    "edgeProcAddressing",
-                    meshes_[procI].time().findInstance
-                    (
-                        meshes_[procI].meshDir(),
-                        "edgeProcAddressing"
-                    ),
-                    meshes_[procI].meshSubDir,
-                    fvMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
-
-        faceProcAddressing_.set
-        (
-            procI,
-            new labelIOList
-            (
-                IOobject
-                (
-                    "faceProcAddressing",
-                    meshes_[procI].time().findInstance
-                    (
-                        meshes_[procI].meshDir(),
-                        "faceProcAddressing"
-                    ),
-                    meshes_[procI].meshSubDir,
-                    fvMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
-
-        boundaryProcAddressing_.set
-        (
-            procI,
-            new labelIOList
-            (
-                IOobject
-                (
-                    "boundaryProcAddressing",
-                    meshes_[procI].time().findInstance
-                    (
-                        meshes_[procI].meshDir(),
-                        "faceProcAddressing"
-                    ),
-                    meshes_[procI].meshSubDir,
-                    fvMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::processorFaMeshes::processorFaMeshes
-(
-    const PtrList<fvMesh>& processorFvMeshes
-)
-:
-    fvMeshes_(processorFvMeshes),
-    meshes_(processorFvMeshes.size()),
-    pointProcAddressing_(processorFvMeshes.size()),
-    edgeProcAddressing_(processorFvMeshes.size()),
-    faceProcAddressing_(processorFvMeshes.size()),
-    boundaryProcAddressing_(processorFvMeshes.size())
-{
-    read();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-// Foam::fvMesh::readUpdateState Foam::processorFaMeshes::readUpdate()
-// {
-//     fvMesh::readUpdateState stat = fvMesh::UNCHANGED;
-
-//     forAll (databases_, procI)
-//     {
-//         // Check if any new meshes need to be read.
-//         fvMesh::readUpdateState procStat = meshes_[procI].readUpdate();
-
-//         /*
-//         if (procStat != fvMesh::UNCHANGED)
-//         {
-//             Info<< "Processor " << procI
-//                 << " at time " << databases_[procI].timeName()
-//                 << " detected mesh change " << procStat
-//                 << endl;
-//         }
-//         */
-
-//         // Combine into overall mesh change status
-//         if (stat == fvMesh::UNCHANGED)
-//         {
-//             stat = procStat;
-//         }
-//         else
-//         {
-//             if (stat != procStat)
-//             {
-//                 FatalErrorIn("processorFaMeshes::readUpdate()")
-//                     << "Processor " << procI
-//                     << " has a different polyMesh at time "
-//                     << databases_[procI].timeName()
-//                     << " compared to any previous processors." << nl
-//                     << "Please check time " << databases_[procI].timeName()
-//                     << " directories on all processors for consistent"
-//                     << " mesh files."
-//                     << exit(FatalError);
-//             }
-//         }
-//     }
-
-//     if
-//     (
-//         stat == fvMesh::TOPO_CHANGE
-//      || stat == fvMesh::TOPO_PATCH_CHANGE
-//     )
-//     {
-//         // Reread all meshes and addresssing
-//         read();
-//     }
-//     return stat;
-// }
-
-
-// void Foam::processorFaMeshes::reconstructPoints(fvMesh& mesh)
-// {
-//     // Read the field for all the processors
-//     PtrList<pointIOField> procsPoints(meshes_.size());
-
-//     forAll (meshes_, procI)
-//     {
-//         procsPoints.set
-//         (
-//             procI,
-//             new pointIOField
-//             (
-//                 IOobject
-//                 (
-//                     "points",
-//                     meshes_[procI].time().timeName(),
-//                     polyMesh::meshSubDir,
-//                     meshes_[procI],
-//                     IOobject::MUST_READ,
-//                     IOobject::NO_WRITE
-//                 )
-//             )
-//         );
-//     }
-
-//     // Create the new points
-//     vectorField newPoints(mesh.nPoints());
-
-//     forAll (meshes_, procI)
-//     {
-//         const vectorField& procPoints = procsPoints[procI];
-
-//         // Set the cell values in the reconstructed field
-
-//         const labelList& pointProcAddressingI = pointProcAddressing_[procI];
-
-//         if (pointProcAddressingI.size() != procPoints.size())
-//         {
-//             FatalErrorIn("processorFaMeshes")
-//                 << "problem :"
-//                 << " pointProcAddressingI:" << pointProcAddressingI.size()
-//                 << " procPoints:" << procPoints.size()
-//                 << abort(FatalError);
-//         }
-
-//         forAll(pointProcAddressingI, pointI)
-//         {
-//             newPoints[pointProcAddressingI[pointI]] = procPoints[pointI];
-//         }
-//     }
-
-//     mesh.movePoints(newPoints);
-//     mesh.write();
-// }
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/processorFaMeshes.H b/applications/utilities/parallelProcessing/reconstructParMesh/processorFaMeshes.H
deleted file mode 100644
index ee2943954..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/processorFaMeshes.H
+++ /dev/null
@@ -1,140 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    processorFaMeshes
-
-Description
-    Container for processor mesh addressing.
-
-Author
-    Zeljko Tukovic, FSB Zagreb.  All rights reserved
-
-SourceFiles
-    processorFaMeshes.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef processorFaMeshes_H
-#define processorFaMeshes_H
-
-#include "PtrList.H"
-#include "fvMesh.H"
-#include "faMesh.H"
-#include "IOobjectList.H"
-#include "labelIOList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-
-/*---------------------------------------------------------------------------*\
-                     Class processorFaMeshes Declaration
-\*---------------------------------------------------------------------------*/
-
-class processorFaMeshes
-{
-    // Private data
-
-        //- List of processor finite volume meshes
-        const PtrList<fvMesh>& fvMeshes_;
-
-        //- List of processor finite area meshes
-        PtrList<faMesh> meshes_;
-
-        //- List of processor point addressing lists
-        PtrList<labelIOList> pointProcAddressing_;
-
-        //- List of processor face addressing lists
-        PtrList<labelIOList> edgeProcAddressing_;
-
-        //- List of processor cell addressing lists
-        PtrList<labelIOList> faceProcAddressing_;
-
-        //- List of processor boundary addressing lists
-        PtrList<labelIOList> boundaryProcAddressing_;
-
-
-    // Private Member Functions
-
-        //- Read all meshes
-        void read();
-
-        //- Disallow default bitwise copy construct
-        processorFaMeshes(const processorFaMeshes&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const processorFaMeshes&);
-
-
-public:
-
-    // Constructors
-
-        //- Construct from components
-        processorFaMeshes(const PtrList<fvMesh>& processorFvMeshes);
-
-
-    // Member Functions
-
-        //- Update the meshes based on the mesh files saved in
-        //  time directories
-//         fvMesh::readUpdateState readUpdate();
-
-        //- Reconstruct point position after motion in parallel
-//         void reconstructPoints(faMesh& mesh);
-
-        PtrList<faMesh>& meshes()
-        {
-            return meshes_;
-        }
-        const PtrList<labelIOList>& pointProcAddressing() const
-        {
-            return pointProcAddressing_;
-        }
-        PtrList<labelIOList>& edgeProcAddressing()
-        {
-            return edgeProcAddressing_;
-        }
-        const PtrList<labelIOList>& faceProcAddressing() const
-        {
-            return faceProcAddressing_;
-        }
-        const PtrList<labelIOList>& boundaryProcAddressing() const
-        {
-            return boundaryProcAddressing_;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangian.H b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangian.H
deleted file mode 100644
index 0750aa9e3..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangian.H
+++ /dev/null
@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-InClass
-    Foam::reconstructLagrangian
-
-Description
-
-SourceFiles
-    reconstructLagrangianPositions.C
-    reconstructLagrangianFields.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef reconstructLagrangian_H
-#define reconstructLagrangian_H
-
-#include "cloud.H"
-#include "polyMesh.H"
-#include "IOobjectList.H"
-#include "fvMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void reconstructLagrangianPositions
-(
-    const polyMesh& mesh,
-    const word& cloudName,
-    const PtrList<fvMesh>& meshes,
-    const PtrList<labelIOList>& faceProcAddressing,
-    const PtrList<labelIOList>& cellProcAddressing
-);
-
-
-template<class Type>
-tmp<IOField<Type> > reconstructLagrangianField
-(
-    const word& cloudName,
-    const polyMesh& mesh,
-    const PtrList<fvMesh>& meshes,
-    const word& fieldName
-);
-
-
-template<class Type>
-void reconstructLagrangianFields
-(
-    const word& cloudName,
-    const polyMesh& mesh,
-    const PtrList<fvMesh>& meshes,
-    const IOobjectList& objects
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "reconstructLagrangianFields.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangianFields.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangianFields.C
deleted file mode 100644
index 7bcfe8946..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangianFields.C
+++ /dev/null
@@ -1,125 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "IOField.H"
-#include "foamTime.H"
-
-// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::tmp<Foam::IOField<Type> > Foam::reconstructLagrangianField
-(
-    const word& cloudName,
-    const polyMesh& mesh,
-    const PtrList<fvMesh>& meshes,
-    const word& fieldName
-)
-{
-    // Construct empty field on mesh
-    tmp<IOField<Type> > tfield
-    (
-        new IOField<Type>
-        (
-            IOobject
-            (
-                fieldName,
-                mesh.time().timeName(),
-                cloud::prefix/cloudName,
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            Field<Type>(0)
-        )
-    );
-    Field<Type>& field = tfield();
-
-    forAll(meshes, i)
-    {
-        // Check object on local mesh
-        IOobject localIOobject
-        (
-            fieldName,
-            meshes[i].time().timeName(),
-            cloud::prefix/cloudName,
-            meshes[i],
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        );
-
-        if (localIOobject.headerOk())
-        {
-            IOField<Type> fieldi(localIOobject);
-
-            label offset = field.size();
-            field.setSize(offset + fieldi.size());
-
-            forAll(fieldi, j)
-            {
-                field[offset + j] = fieldi[j];
-            }
-        }
-    }
-
-    return tfield;
-}
-
-
-template<class Type>
-void Foam::reconstructLagrangianFields
-(
-    const word& cloudName,
-    const polyMesh& mesh,
-    const PtrList<fvMesh>& meshes,
-    const IOobjectList& objects
-)
-{
-    word fieldClassName(IOField<Type>::typeName);
-
-    IOobjectList fields = objects.lookupClass(fieldClassName);
-
-    if (fields.size())
-    {
-        Info<< "    Reconstructing lagrangian "
-            << fieldClassName << "s\n" << endl;
-
-        forAllIter(IOobjectList, fields, fieldIter)
-        {
-            Info<< "        " << fieldIter()->name() << endl;
-            reconstructLagrangianField<Type>
-            (
-                cloudName,
-                mesh,
-                meshes,
-                fieldIter()->name()
-            )().write();
-        }
-
-        Info<< endl;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangianPositions.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangianPositions.C
deleted file mode 100644
index 9dfec5691..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangianPositions.C
+++ /dev/null
@@ -1,75 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "reconstructLagrangian.H"
-#include "labelIOList.H"
-#include "CloudTemplate.H"
-#include "passiveParticle.H"
-
-// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
-
-void Foam::reconstructLagrangianPositions
-(
-    const polyMesh& mesh,
-    const word& cloudName,
-    const PtrList<fvMesh>& meshes,
-    const PtrList<labelIOList>& faceProcAddressing,
-    const PtrList<labelIOList>& cellProcAddressing
-)
-{
-    Cloud<passiveParticle> lagrangianPositions
-    (
-        mesh,
-        cloudName,
-        IDLList<passiveParticle>()
-    );
-
-    forAll(meshes, i)
-    {
-        const labelList& cellMap = cellProcAddressing[i];
-
-        Cloud<passiveParticle> lpi(meshes[i], cloudName, false);
-
-        forAllIter(Cloud<passiveParticle>, lpi, iter)
-        {
-            const passiveParticle& ppi = iter();
-
-            lagrangianPositions.append
-            (
-                new passiveParticle
-                (
-                    lagrangianPositions,
-                    ppi.position(),
-                    cellMap[ppi.cell()]
-                )
-            );
-        }
-    }
-
-    IOPosition<passiveParticle>(lagrangianPositions).write();
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructor.C b/applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructor.C
deleted file mode 100644
index 05a6f642f..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructor.C
+++ /dev/null
@@ -1,163 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "tetPointFieldReconstructor.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-// Calculate point addressing
-labelList tetPointFieldReconstructor::procAddressing
-(
-    const label procNo
-) const
-{
-    // Allocate the addressing
-    labelList addr(procMeshes_[procNo].nPoints(), -1);
-
-    const labelList& pointAddr = pointProcAddressing_[procNo];
-    const labelList& cellAddr = cellProcAddressing_[procNo];
-
-    label nAddr = 0;
-
-    // Insert point addressing
-
-    // Use only live points.  HJ, 14/Apr/2009
-    for (label pointI = 0; pointI < procMeshes_[procNo]().nPoints(); pointI++)
-    {
-        addr[nAddr] = pointAddr[pointI];
-        nAddr++;
-    }
-
-    // Insert face addressing.  Only for face decomposition
-    const labelList& faceAddr = faceProcAddressing_[procNo];
-
-    const label faceOffset = mesh_.faceOffset();
-
-    // Use only live faces.  HJ, 14/Apr/2009
-    for (label faceI = 0; faceI < procMeshes_[procNo]().nFaces(); faceI++)
-    {
-        // Remember to decrement the index by one (turning index)
-        addr[nAddr] = faceOffset + mag(faceAddr[faceI]) - 1;
-        nAddr++;
-    }
-
-    // Insert cell addressing
-    const label cellOffset = mesh_.cellOffset();
-
-    forAll (cellAddr, cellI)
-    {
-        addr[nAddr] = cellOffset + cellAddr[cellI];
-        nAddr++;
-    }
-
-    return addr;
-}
-
-
-labelList tetPointFieldReconstructor::procPatchAddressing
-(
-    const labelList& procToGlobalAddr,
-    const label procNo,
-    const label patchNo
-) const
-{
-    labelList addr(procMeshes_[procNo].boundary()[patchNo].size(), -1);
-
-    // Algorithm:
-    // Go to the global patch, create a lookup list the size of all
-    // points in the mesh and then gather the points for the current
-    // patch.
-    labelList pointLookup(mesh_.nPoints(), -1);
-
-    const labelList& globalPatchPoints =
-        mesh_.boundary()[boundaryProcAddressing_[procNo][patchNo]].meshPoints();
-
-    forAll (globalPatchPoints, pointI)
-    {
-        pointLookup[globalPatchPoints[pointI]] = pointI;
-    }
-
-    // Gather the information
-
-    const labelList& procPatchPoints =
-        procMeshes_[procNo].boundary()[patchNo].meshPoints();
-
-    forAll (procPatchPoints, pointI)
-    {
-        addr[pointI] =
-            pointLookup[procToGlobalAddr[procPatchPoints[pointI]]];
-    }
-
-    if (addr.size() && min(addr) < 0)
-    {
-        FatalErrorIn
-        (
-            "labelList tetPointFieldReconstructor::"
-            "patchProcAddressing\n"
-            "(\n"
-            "    const labelList& procToGlobalAddr,\n"
-            "    const label procNo,\n"
-            "    const label patchNo\n"
-            ") const"
-        )   << "error in addressing"
-            << abort(FatalError);
-    }
-
-    return addr;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-// Construct from components
-tetPointFieldReconstructor::tetPointFieldReconstructor
-(
-    tetPolyMesh& mesh,
-    const PtrList<tetPolyMesh>& procMeshes,
-    const PtrList<labelIOList>& pointProcAddressing,
-    const PtrList<labelIOList>& faceProcAddressing,
-    const PtrList<labelIOList>& cellProcAddressing,
-    const PtrList<labelIOList>& boundaryProcAddressing
-)
-:
-    mesh_(mesh),
-    procMeshes_(procMeshes),
-    pointProcAddressing_(pointProcAddressing),
-    faceProcAddressing_(faceProcAddressing),
-    cellProcAddressing_(cellProcAddressing),
-    boundaryProcAddressing_(boundaryProcAddressing)
-{}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructor.H
deleted file mode 100644
index 6f9f1641a..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructor.H
+++ /dev/null
@@ -1,217 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    tetPointFieldReconstructor
-
-Description
-    Tet point field reconstructor.
-
-SourceFiles
-    tetPointFieldReconstructor.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef tetPointFieldReconstructor_H
-#define tetPointFieldReconstructor_H
-
-#include "PtrList.H"
-#include "objectRegistry.H"
-#include "foamTime.H"
-#include "tetPolyMesh.H"
-#include "tetPointMesh.H"
-#include "elementMesh.H"
-#include "IOobjectList.H"
-#include "tetPolyPatchFields.H"
-#include "elementPatchFields.H"
-#include "PointPatchFieldMapper.H"
-#include "GeometricField.H"
-#include "labelIOList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-              Class tetPointFieldReconstructor Declaration
-\*---------------------------------------------------------------------------*/
-
-class tetPointFieldReconstructor
-{
-    // Private data
-
-        //- Reconstructed mesh reference
-        const tetPolyMesh& mesh_;
-
-        //- List of processor meshes
-        const PtrList<tetPolyMesh>& procMeshes_;
-
-        //- List of processor point addressing lists
-        const PtrList<labelIOList>& pointProcAddressing_;
-
-        //- List of processor face addressing lists
-        const PtrList<labelIOList>& faceProcAddressing_;
-
-        //- List of processor cell addressing lists
-        const PtrList<labelIOList>& cellProcAddressing_;
-
-        //- List of processor boundary addressing lists
-        const PtrList<labelIOList>& boundaryProcAddressing_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        tetPointFieldReconstructor
-        (
-            const tetPointFieldReconstructor&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const tetPointFieldReconstructor&);
-
-        //- Processor-to-global addressing for all points
-        labelList procAddressing(const label procNo) const;
-
-        //- Patch-to-patch addressing
-        labelList procPatchAddressing
-        (
-            const labelList& procToGlobalAddr,
-            const label procNo,
-            const label patchNo
-        ) const;
-
-
-public:
-
-        class tetPolyPatchFieldReconstructor
-        :
-            public PointPatchFieldMapper
-        {
-            label size_;
-            label sizeBeforeMapping_;
-
-        public:
-
-            // Constructors
-
-                //- Construct given addressing
-                tetPolyPatchFieldReconstructor
-                (
-                    const label size,
-                    const label sizeBeforeMapping
-                )
-                :
-                    size_(size),
-                    sizeBeforeMapping_(sizeBeforeMapping)
-                {}
-
-
-            // Member functions
-
-                virtual label size() const
-                {
-                    return size_;
-                }
-
-                virtual label sizeBeforeMapping() const
-                {
-                    return sizeBeforeMapping_;
-                }
-
-                virtual bool direct() const
-                {
-                    return true;
-                }
-
-                virtual const unallocLabelList& directAddressing() const
-                {
-                    return unallocLabelList::null();
-                }
-        };
-
-
-    // Constructors
-
-        //- Construct from components
-        tetPointFieldReconstructor
-        (
-            tetPolyMesh& mesh,
-            const PtrList<tetPolyMesh>& procMeshes,
-            const PtrList<labelIOList>& pointProcAddressing,
-            const PtrList<labelIOList>& faceProcAddressing,
-            const PtrList<labelIOList>& cellProcAddressing,
-            const PtrList<labelIOList>& boundaryProcAddressing
-        );
-
-
-    // Member Functions
-
-        //- Reconstruct point field
-        template<class Type>
-        tmp<GeometricField<Type, tetPolyPatchField, tetPointMesh> >
-        reconstructTetPointField
-        (
-            const IOobject& fieldIoObject
-        );
-
-        //- Reconstruct element field
-        template<class Type>
-        tmp<GeometricField<Type, elementPatchField, elementMesh> >
-        reconstructElementField
-        (
-            const IOobject& fieldIoObject
-        );
-
-        //- Reconstruct and write all point fields
-        template<class Type>
-        void reconstructTetPointFields
-        (
-            const IOobjectList& objects
-        );
-
-        //- Reconstruct and write all element fields
-        template<class Type>
-        void reconstructElementFields
-        (
-            const IOobjectList& objects
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "tetPointFieldReconstructorReconstructFields.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructorReconstructFields.C
deleted file mode 100644
index d66feb0bb..000000000
--- a/applications/utilities/parallelProcessing/reconstructParMesh/tetPointFieldReconstructorReconstructFields.C
+++ /dev/null
@@ -1,372 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "tetPointFieldReconstructor.H"
-#include "PtrList.H"
-#include "tetPolyPatchFields.H"
-#include "tetFemMatrices.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-tmp<GeometricField<Type, tetPolyPatchField, tetPointMesh> >
-tetPointFieldReconstructor::reconstructTetPointField
-(
-    const IOobject& fieldIoObject
-)
-{
-    // Read the field for all the processors
-    PtrList<GeometricField<Type, tetPolyPatchField, tetPointMesh> > procFields
-    (
-        procMeshes_.size()
-    );
-
-    forAll (procMeshes_, procI)
-    {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, tetPolyPatchField, tetPointMesh>
-            (
-                IOobject
-                (
-                    fieldIoObject.name(),
-                    procMeshes_[procI]().time().timeName(),
-                    procMeshes_[procI](),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
-    }
-
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nPoints());
-
-    // Create the patch fields
-    PtrList<tetPolyPatchField<Type> > patchFields(mesh_.boundary().size());
-
-
-    forAll (procMeshes_, procI)
-    {
-        const GeometricField<Type, tetPolyPatchField, tetPointMesh>&
-            procField = procFields[procI];
-
-        // Get processor-to-global addressing for use in rmap
-        labelList procToGlobalAddr = procAddressing(procI);
-
-        // Set the cell values in the reconstructed field
-        internalField.rmap
-        (
-            procField.internalField(),
-            procToGlobalAddr
-        );
-
-        // Set the boundary patch values in the reconstructed field
-        forAll(boundaryProcAddressing_[procI], patchI)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
-            {
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        tetPolyPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, tetPointMesh>::null(),
-                            tetPolyPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
-
-                // If the field stores values, do the rmap
-                if (patchFields[curBPatch].storesFieldData())
-                {
-                    patchFields[curBPatch].rmap
-                    (
-                        procField.boundaryField()[patchI],
-                        procPatchAddressing
-                        (
-                            procToGlobalAddr,
-                            procI,
-                            patchI
-                        )
-                    );
-                }
-            }
-        }
-    }
-
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, tetPolyPatchField, tetPointMesh> >
-    (
-        new GeometricField<Type, tetPolyPatchField, tetPointMesh>
-        (
-            IOobject
-            (
-                fieldIoObject.name(),
-                mesh_().time().timeName(),
-                mesh_(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            procFields[0].dimensions(),
-            internalField,
-            patchFields
-        )
-    );
-}
-
-
-template<class Type>
-tmp<GeometricField<Type, elementPatchField, elementMesh> >
-tetPointFieldReconstructor::reconstructElementField
-(
-    const IOobject& fieldIoObject
-)
-{
-    // Read the field for all the processors
-    PtrList<GeometricField<Type, elementPatchField, elementMesh> > procFields
-    (
-        procMeshes_.size()
-    );
-
-    forAll (procMeshes_, procI)
-    {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, elementPatchField, elementMesh>
-            (
-                IOobject
-                (
-                    fieldIoObject.name(),
-                    procMeshes_[procI]().time().timeName(),
-                    procMeshes_[procI](),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
-    }
-
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nCells());
-
-    // Create the patch fields
-    PtrList<elementPatchField<Type> > patchFields(mesh_.boundary().size());
-
-
-    forAll (procMeshes_, procI)
-    {
-        const GeometricField<Type, elementPatchField, elementMesh>&
-            procField = procFields[procI];
-
-        // Set the cell values in the reconstructed field
-        internalField.rmap
-        (
-            procField.internalField(),
-            cellProcAddressing_[procI]
-        );
-
-        // Set the boundary patch values in the reconstructed field
-        forAll(boundaryProcAddressing_[procI], patchI)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // Get addressing slice for this patch
-            const labelList::subList cp =
-                procMeshes_[procI]().boundaryMesh()[patchI].patchSlice
-                (
-                    faceProcAddressing_[procI]
-                );
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
-            {
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        elementPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, elementMesh>::null(),
-                            tetPolyPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
-
-                // If the field stores values, do the rmap
-                if (patchFields[curBPatch].storesFieldData())
-                {
-                    const label curPatchStart =
-                        mesh_().boundaryMesh()[curBPatch].start();
-
-                    labelList reverseAddressing(cp.size());
-
-                    forAll(cp, faceI)
-                    {
-                        // Subtract one to take into account offsets for
-                        // face direction.
-                        reverseAddressing[faceI] = cp[faceI] - 1
-                            - curPatchStart;
-                    }
-
-                    patchFields[curBPatch].rmap
-                    (
-                        procField.boundaryField()[patchI],
-                        reverseAddressing
-                    );
-                }
-            }
-        }
-    }
-
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, elementPatchField, elementMesh> >
-    (
-        new GeometricField<Type, elementPatchField, elementMesh>
-        (
-            IOobject
-            (
-                fieldIoObject.name(),
-                mesh_().time().timeName(),
-                mesh_(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            procFields[0].dimensions(),
-            internalField,
-            patchFields
-        )
-    );
-}
-
-
-template<class Type>
-void tetPointFieldReconstructor::reconstructTetPointFields
-(
-    const IOobjectList& objects
-)
-{
-    word fieldClassName
-    (
-        GeometricField<Type, tetPolyPatchField, tetPointMesh>::typeName
-    );
-
-    IOobjectList fields = objects.lookupClass(fieldClassName);
-
-    if (fields.size())
-    {
-        Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
-
-        for
-        (
-            IOobjectList::iterator fieldIter = fields.begin();
-            fieldIter != fields.end();
-            ++fieldIter
-        )
-        {
-            Info<< "        " << fieldIter()->name() << endl;
-
-            reconstructTetPointField<Type>(*fieldIter())().write();
-        }
-
-        Info<< endl;
-    }
-}
-
-
-template<class Type>
-void tetPointFieldReconstructor::reconstructElementFields
-(
-    const IOobjectList& objects
-)
-{
-    word fieldClassName
-    (
-        GeometricField<Type, elementPatchField, elementMesh>::typeName
-    );
-
-    IOobjectList fields = objects.lookupClass(fieldClassName);
-
-    if (fields.size())
-    {
-        Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
-
-        for
-        (
-            IOobjectList::iterator fieldIter = fields.begin();
-            fieldIter != fields.end();
-            ++fieldIter
-        )
-        {
-            Info<< "        " << fieldIter()->name() << endl;
-
-            reconstructElementField<Type>(*fieldIter())().write();
-        }
-
-        Info<< endl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/Make/files b/src/decompositionMethods/decomposeReconstruct/Make/files
new file mode 100644
index 000000000..ed46cfd4f
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/Make/files
@@ -0,0 +1,20 @@
+decomposeTools/finiteVolume/domainDecomposition.C
+decomposeTools/finiteVolume/distributeCells.C
+decomposeTools/finiteVolume/decomposeMesh.C
+decomposeTools/finiteVolume/fvFieldDecomposer.C
+decomposeTools/finiteArea/faMeshDecomposition.C
+decomposeTools/finiteArea/faFieldDecomposer.C
+decomposeTools/point/pointFieldDecomposer.C
+decomposeTools/tetFiniteElement/tetPointFieldDecomposer.C
+decomposeTools/lagrangian/lagrangianFieldDecomposer.C
+
+reconstructTools/finiteVolume/processorMeshesReconstructor.C
+reconstructTools/finiteVolume/processorMeshesRebuild.C
+reconstructTools/finiteVolume/fvFieldReconstructor.C
+reconstructTools/finiteArea/processorFaMeshes.C
+reconstructTools/finiteArea/faFieldReconstructor.C
+reconstructTools/point/pointFieldReconstructor.C
+reconstructTools/tetFiniteElement/tetPointFieldReconstructor.C
+reconstructTools/lagrangian/reconstructLagrangianPositions.C
+
+LIB = $(FOAM_LIBBIN)/libdecomposeReconstruct
diff --git a/src/decompositionMethods/decomposeReconstruct/Make/options b/src/decompositionMethods/decomposeReconstruct/Make/options
new file mode 100644
index 000000000..ae23f0a53
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/Make/options
@@ -0,0 +1,15 @@
+EXE_INC = \
+    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteArea/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/tetFiniteElement/lnInclude
+
+LIB_LIBS = \
+    -ldecompositionMethods \
+    -lfiniteVolume \
+    -lmeshTools \
+    -lfiniteArea \
+    -llagrangian \
+    -ltetFiniteElement
diff --git a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea/faFieldDecomposer.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea/faFieldDecomposer.C
diff --git a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea/faFieldDecomposer.H
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea/faFieldDecomposer.H
diff --git a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposerDecomposeFields.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea/faFieldDecomposerDecomposeFields.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/faFieldDecomposerDecomposeFields.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea/faFieldDecomposerDecomposeFields.C
diff --git a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea/faMeshDecomposition.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea/faMeshDecomposition.C
diff --git a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea/faMeshDecomposition.H
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.H
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteArea/faMeshDecomposition.H
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposeMesh.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
similarity index 98%
rename from applications/utilities/parallelProcessing/decomposePar/decomposeMesh.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
index cae7d29e4..189c8c558 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposeMesh.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
@@ -40,7 +40,7 @@ Description
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
+void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 {
     // Decide which cell goes to which processor
     distributeCells();
@@ -51,12 +51,12 @@ void domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
     Info<< "\nCalculating original mesh data" << endl;
 
     // set references to the original mesh
-    const polyBoundaryMesh& patches = boundaryMesh();
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
     // Access all faces to grab the zones
-    const faceList& fcs = allFaces();
-    const labelList& owner = faceOwner();
-    const labelList& neighbour = faceNeighbour();
+    const faceList& fcs = mesh_.allFaces();
+    const labelList& owner = mesh_.faceOwner();
+    const labelList& neighbour = mesh_.faceNeighbour();
 
     // loop through the list of processor labels for the cell and add the
     // cell shape to the list of cells for the appropriate processor
@@ -483,7 +483,7 @@ void domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
         {
             wordList fzNames(decompositionDict_.lookup("globalFaceZones"));
 
-            const faceZoneMesh& fz = faceZones();
+            const faceZoneMesh& fz = mesh_.faceZones();
 
             forAll (fzNames, nameI)
             {
@@ -767,7 +767,7 @@ void domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
     forAll (procPointAddressing_, procI)
     {
         // Dimension list to all points in the mesh.  HJ, 27/Mar/2009
-        boolList pointLabels(allPoints().size(), false);
+        boolList pointLabels(mesh_.allPoints().size(), false);
 
         // Get reference to list of used faces
         const labelList& procFaceLabels = procFaceAddressing_[procI];
@@ -813,7 +813,7 @@ void domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
         // Second pass: zone faces
 
         // Reset point usage list
-        boolList pointLabelsSecondPass(allPoints().size(), false);
+        boolList pointLabelsSecondPass(mesh_.allPoints().size(), false);
 
         for
         (
@@ -854,13 +854,13 @@ void domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
     // Memory management
     {
         // Dimension list to all points in the mesh.  HJ, 27/Mar/2009
-        labelList pointsUsage(allPoints().size(), 0);
+        labelList pointsUsage(mesh_.allPoints().size(), 0);
 
         // Globally shared points are the ones used by more than 2 processors
         // Size the list approximately and gather the points
         labelHashSet gSharedPoints
         (
-            min(100, nPoints()/1000)
+            min(100, mesh_.nPoints()/1000)
         );
 
         // Loop through all the processors and mark up points used by
@@ -923,3 +923,6 @@ void domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
         sort(globallySharedPoints_);
     }
 }
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/decomposePar/distributeCells.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C
similarity index 91%
rename from applications/utilities/parallelProcessing/decomposePar/distributeCells.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C
index 2612a68f8..7eb61f42c 100644
--- a/applications/utilities/parallelProcessing/decomposePar/distributeCells.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C
@@ -32,7 +32,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void domainDecomposition::distributeCells()
+void Foam::domainDecomposition::distributeCells()
 {
     Info<< "\nCalculating distribution of cells" << endl;
 
@@ -51,7 +51,7 @@ void domainDecomposition::distributeCells()
         Info<< "Keeping owner and neighbour of faces in patches " << pNames
             << " on same processor" << endl;
 
-        const polyBoundaryMesh& patches = boundaryMesh();
+        const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
         forAll(pNames, i)
         {
@@ -73,6 +73,7 @@ void domainDecomposition::distributeCells()
             }
         }
     }
+
     if (decompositionDict_.found("preserveFaceZones"))
     {
         wordList zNames(decompositionDict_.lookup("preserveFaceZones"));
@@ -80,7 +81,7 @@ void domainDecomposition::distributeCells()
         Info<< "Keeping owner and neighbour of faces in zones " << zNames
             << " on same processor" << endl;
 
-        const faceZoneMesh& fZones = faceZones();
+        const faceZoneMesh& fZones = mesh_.faceZones();
 
         forAll(zNames, i)
         {
@@ -111,12 +112,12 @@ void domainDecomposition::distributeCells()
     autoPtr<decompositionMethod> decomposePtr = decompositionMethod::New
     (
         decompositionDict_,
-        *this
+        mesh_
     );
 
     if (sameProcFaces.empty())
     {
-        cellToProc_ = decomposePtr().decompose(cellCentres());
+        cellToProc_ = decomposePtr().decompose(mesh_.cellCentres());
     }
     else
     {
@@ -126,7 +127,7 @@ void domainDecomposition::distributeCells()
 
         // Faces where owner and neighbour are not 'connected' (= all except
         // sameProcFaces)
-        boolList blockedFace(nFaces(), true);
+        boolList blockedFace(mesh_.nFaces(), true);
 
         forAllConstIter(labelHashSet, sameProcFaces, iter)
         {
@@ -134,7 +135,7 @@ void domainDecomposition::distributeCells()
         }
 
         // Connect coupled boundary faces
-        const polyBoundaryMesh& patches =  boundaryMesh();
+        const polyBoundaryMesh& patches =  mesh_.boundaryMesh();
 
         forAll(patches, patchI)
         {
@@ -150,7 +151,7 @@ void domainDecomposition::distributeCells()
         }
 
         // Determine global regions, separated by blockedFaces
-        regionSplit globalRegion(*this, blockedFace);
+        regionSplit globalRegion(mesh_, blockedFace);
 
 
         // Determine region cell centres
@@ -171,7 +172,7 @@ void domainDecomposition::distributeCells()
 
             if (regionCentres[regionI] == greatPoint)
             {
-                regionCentres[regionI] = cellCentres()[cellI];
+                regionCentres[regionI] = mesh_.cellCentres()[cellI];
             }
         }
 
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
new file mode 100644
index 000000000..d90557d20
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
@@ -0,0 +1,687 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "domainDecomposition.H"
+#include "foamTime.H"
+#include "dictionary.H"
+#include "labelIOList.H"
+#include "processorPolyPatch.H"
+#include "fvMesh.H"
+#include "OSspecific.H"
+#include "Map.H"
+#include "globalMeshData.H"
+#include "DynamicList.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(Foam::domainDecomposition, 0);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::domainDecomposition::domainDecomposition
+(
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+:
+    mesh_(mesh),
+    decompositionDict_(dict),
+    nProcs_(readInt(decompositionDict_.lookup("numberOfSubdomains"))),
+    distributed_(false),
+    cellToProc_(mesh_.nCells()),
+    procPointAddressing_(nProcs_),
+    procFaceAddressing_(nProcs_),
+    nInternalProcFaces_(nProcs_),
+    nLiveProcFaces_(nProcs_),
+    procCellAddressing_(nProcs_),
+    procBoundaryAddressing_(nProcs_),
+    procPatchSize_(nProcs_),
+    procPatchStartIndex_(nProcs_),
+    procNeighbourProcessors_(nProcs_),
+    procProcessorPatchSize_(nProcs_),
+    procProcessorPatchStartIndex_(nProcs_),
+    globallySharedPoints_(0),
+    cyclicParallel_(false)
+{
+    if (decompositionDict_.found("distributed"))
+    {
+        distributed_ = Switch(decompositionDict_.lookup("distributed"));
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::domainDecomposition::~domainDecomposition()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
+(
+    const label procI,
+    const Time& processorDb
+) const
+{
+    // Create processor points
+    const labelList& curPointLabels = procPointAddressing_[procI];
+
+    // Access list of all points in the mesh.  HJ, 27/Mar/2009
+    const pointField& meshPoints = mesh_.allPoints();
+
+    labelList pointLookup(meshPoints.size(), -1);
+
+    pointField procPoints(curPointLabels.size());
+
+    forAll (curPointLabels, pointi)
+    {
+        procPoints[pointi] = meshPoints[curPointLabels[pointi]];
+
+        pointLookup[curPointLabels[pointi]] = pointi;
+    }
+
+    // Create processor faces
+    const labelList& curFaceLabels = procFaceAddressing_[procI];
+
+    // Access list of all faces in the mesh.  HJ, 27/Mar/2009
+    const faceList& meshFaces = mesh_.allFaces();
+
+    labelList faceLookup(meshFaces.size(), -1);
+
+    faceList procFaces(curFaceLabels.size());
+
+    forAll (curFaceLabels, facei)
+    {
+        // Mark the original face as used
+        // Remember to decrement the index by one (turning index)
+        // HJ, 5/Dec/2001
+        label curF = mag(curFaceLabels[facei]) - 1;
+
+        faceLookup[curF] = facei;
+
+        // get the original face
+        labelList origFaceLabels;
+
+        if (curFaceLabels[facei] >= 0)
+        {
+            // face not turned
+            origFaceLabels = meshFaces[curF];
+        }
+        else
+        {
+            origFaceLabels = meshFaces[curF].reverseFace();
+        }
+
+        // translate face labels into local point list
+        face& procFaceLabels = procFaces[facei];
+
+        procFaceLabels.setSize(origFaceLabels.size());
+
+        forAll (origFaceLabels, pointi)
+        {
+            procFaceLabels[pointi] = pointLookup[origFaceLabels[pointi]];
+        }
+    }
+
+    // Create cell lookup
+    labelList cellLookup(mesh_.nCells(), -1);
+    const labelList& curCellLabels = procCellAddressing_[procI];
+
+    forAll (curCellLabels, cellI)
+    {
+        cellLookup[curCellLabels[cellI]] = cellI;
+    }
+
+    // Get complete owner-neighour addressing in the mesh
+    const labelList& own = mesh_.faceOwner();
+    const labelList& nei = mesh_.faceNeighbour();
+
+    // Calculate owner and neighbour list
+    // Owner list is sized to number of live faces
+    // Neighbour list is sized to number of internal faces
+
+    labelList procOwner(nLiveProcFaces_[procI]);
+
+    // Note: loop over owner, not all faces: sizes are different
+    forAll (procOwner, faceI)
+    {
+        // Remember to decrement the index by one (turning index)
+        // HJ, 28/Mar/2009
+        label curF = mag(curFaceLabels[faceI]) - 1;
+
+        if (curFaceLabels[faceI] >= 0)
+        {
+            procOwner[faceI] = cellLookup[own[curF]];
+        }
+        else
+        {
+            procOwner[faceI] = cellLookup[nei[curF]];
+        }
+    }
+
+    labelList procNeighbour(nInternalProcFaces_[procI]);
+
+    // Note: loop over neighbour, not all faces: sizes are different
+    forAll (procNeighbour, faceI)
+    {
+        // Remember to decrement the index by one (turning index)
+        // HJ, 28/Mar/2009
+        label curF = mag(curFaceLabels[faceI]) - 1;
+
+        if (curFaceLabels[faceI] >= 0)
+        {
+            procNeighbour[faceI] = cellLookup[nei[curF]];
+        }
+        else
+        {
+            procNeighbour[faceI] = cellLookup[own[curF]];
+        }
+    }
+
+    // Create processor mesh without a boundary
+
+    // Create the mesh
+    autoPtr<fvMesh> procMeshPtr
+    (
+        new fvMesh
+        (
+            IOobject
+            (
+                mesh_.polyMesh::name(),  // region name of undecomposed mesh
+                mesh_.pointsInstance(),
+                processorDb
+            ),
+            xferMove(procPoints),
+            xferMove(procFaces),
+            xferMove(procOwner),
+            xferMove(procNeighbour),
+            false          // Do not sync par
+        )
+    );
+    fvMesh& procMesh = procMeshPtr();
+
+    // Create processor boundary patches
+    const labelList& curBoundaryAddressing = procBoundaryAddressing_[procI];
+
+    const labelList& curPatchSizes = procPatchSize_[procI];
+
+    const labelList& curPatchStarts = procPatchStartIndex_[procI];
+
+    const labelList& curNeighbourProcessors =
+        procNeighbourProcessors_[procI];
+
+    const labelList& curProcessorPatchSizes =
+        procProcessorPatchSize_[procI];
+
+    const labelList& curProcessorPatchStarts =
+        procProcessorPatchStartIndex_[procI];
+
+    const polyPatchList& meshPatches = mesh_.boundaryMesh();
+
+    List<polyPatch*> procPatches
+    (
+        curPatchSizes.size()
+      + curProcessorPatchSizes.size(),
+        reinterpret_cast<polyPatch*>(0)
+    );
+
+    label nPatches = 0;
+
+    forAll (curPatchSizes, patchi)
+    {
+        procPatches[nPatches] =
+            meshPatches[curBoundaryAddressing[patchi]].clone
+            (
+                procMesh.boundaryMesh(),
+                nPatches,
+                curPatchSizes[patchi],
+                curPatchStarts[patchi]
+            ).ptr();
+
+        nPatches++;
+    }
+
+    forAll (curProcessorPatchSizes, procPatchI)
+    {
+        procPatches[nPatches] =
+            new processorPolyPatch
+            (
+                word("procBoundary") + Foam::name(procI)
+              + word("to")
+              + Foam::name(curNeighbourProcessors[procPatchI]),
+                curProcessorPatchSizes[procPatchI],
+                curProcessorPatchStarts[procPatchI],
+                nPatches,
+                procMesh.boundaryMesh(),
+                procI,
+                curNeighbourProcessors[procPatchI]
+        );
+
+        nPatches++;
+    }
+
+    // Add boundary patches
+    procMesh.addPatches(procPatches);
+
+    // Create and add zones
+
+    // Note:
+    // This coding was all wrong, as each point/face/cell may only
+    //  belong to a single zone.
+    // Additionally, ordering of points/faces/cells in the processor mesh
+    // needs to match the ordering in global mesh zones.  Full rewrite.
+    // HJ, 30/Mar/2009
+
+    // Create zones if needed
+    if
+    (
+        !mesh_.pointZones().empty()
+     || !mesh_.faceZones().empty()
+     || !mesh_.cellZones().empty()
+    )
+    {
+        // Point zones
+        List<pointZone*> procPz(mesh_.pointZones().size());
+
+        {
+            const pointZoneMesh& pz = mesh_.pointZones();
+
+            // Go through all the zoned points and find out if they
+            // belong to a processor.  If so, add it to the zone as
+            // necessary
+            forAll (pz, zoneI)
+            {
+                const labelList& zonePoints = pz[zoneI];
+
+                labelList procZonePoints(zonePoints.size());
+                label nZonePoints = 0;
+
+                forAll (zonePoints, pointI)
+                {
+                    const label localIndex =
+                        pointLookup[zonePoints[pointI]];
+
+                    if (localIndex >= 0)
+                    {
+                        // Point live on processor: add to zone
+                        procZonePoints[nZonePoints] = localIndex;
+                        nZonePoints++;
+                    }
+                }
+
+                // Add the zone
+                procZonePoints.setSize(nZonePoints);
+
+                procPz[zoneI] = new pointZone
+                (
+                    pz[zoneI].name(),
+                    procZonePoints,
+                    zoneI,
+                    procMesh.pointZones()
+                );
+            }
+        }
+
+
+        // Face zones
+        List<faceZone*> procFz(mesh_.faceZones().size());
+
+        {
+            const faceZoneMesh& fz = mesh_.faceZones();
+
+            forAll (fz, zoneI)
+            {
+                const labelList& zoneFaces = fz[zoneI];
+                const boolList& flipMap = fz[zoneI].flipMap();
+
+                // Go through all the zoned faces and find out if they
+                // belong to a processor.  If so, add it to the zone as
+                // necessary
+
+                labelList procZoneFaces(zoneFaces.size());
+                boolList procZoneFaceFlips(zoneFaces.size());
+                label nZoneFaces = 0;
+
+                forAll (zoneFaces, faceI)
+                {
+                    const label localIndex = faceLookup[zoneFaces[faceI]];
+
+                    if (localIndex >= 0)
+                    {
+                        // Face is present on the processor
+
+                        // Add the face to the zone
+                        procZoneFaces[nZoneFaces] = localIndex;
+
+                        // Grab the flip
+                        bool flip = flipMap[faceI];
+
+                        if (curFaceLabels[localIndex] < 0)
+                        {
+                            flip = !flip;
+                        }
+
+                        procZoneFaceFlips[nZoneFaces] = flip;
+                        nZoneFaces++;
+                    }
+                }
+
+                // Add the zone
+                procZoneFaces.setSize(nZoneFaces);
+                procZoneFaceFlips.setSize(nZoneFaces);
+
+                procFz[zoneI] = new faceZone
+                (
+                    fz[zoneI].name(),
+                    procZoneFaces,
+                    procZoneFaceFlips,
+                    zoneI,
+                    procMesh.faceZones()
+                );
+            }
+        }
+
+        // Cell zones
+        List<cellZone*> procCz(mesh_.cellZones().size());
+
+        {
+            const cellZoneMesh& cz = mesh_.cellZones();
+
+            // Go through all the zoned cells and find out if they
+            // belong to a processor.  If so, add it to the zone as
+            // necessary
+
+            forAll (cz, zoneI)
+            {
+                const labelList& zoneCells = cz[zoneI];
+
+                labelList procZoneCells(zoneCells.size());
+                label nZoneCells = 0;
+
+                forAll (zoneCells, cellI)
+                {
+                    const label localIndex = cellLookup[zoneCells[cellI]];
+
+                    if (localIndex >= 0)
+                    {
+                        procZoneCells[nZoneCells] = localIndex;
+                        nZoneCells++;
+                    }
+                }
+
+                // Add the zone
+                procZoneCells.setSize(nZoneCells);
+
+                procCz[zoneI] = new cellZone
+                (
+                    cz[zoneI].name(),
+                    procZoneCells,
+                    zoneI,
+                    procMesh.cellZones()
+                );
+            }
+        }
+
+        // Add zones
+        procMesh.addZones(procPz, procFz, procCz);
+    }
+
+    // Return mesh
+    return procMeshPtr;
+}
+
+
+bool Foam::domainDecomposition::writeDecomposition()
+{
+    Info<< "\nConstructing processor meshes" << endl;
+
+    // Make a lookup map for globally shared points
+    Map<label> sharedPointLookup(2*globallySharedPoints_.size());
+
+    forAll (globallySharedPoints_, pointi)
+    {
+        sharedPointLookup.insert(globallySharedPoints_[pointi], pointi);
+    }
+
+
+    // Mark point/faces/cells that are in zones.  Bad coding - removed
+    // HJ, 31/Mar/2009
+
+    label totProcFaces = 0;
+    label maxProcPatches = 0;
+    label maxProcFaces = 0;
+
+
+    // Note: get cellLevel and pointLevel. Avoid checking whether they exist or
+    // not by hand. If they don't exist, simply assume that the level is 0
+    const labelIOList globalCellLevel
+    (
+        IOobject
+        (
+            "cellLevel",
+            mesh_.facesInstance(),
+            polyMesh::meshSubDir,
+            mesh_,
+            IOobject::READ_IF_PRESENT,
+            IOobject::NO_WRITE
+        ),
+        labelList(mesh_.nCells(), 0)
+    );
+
+    const labelIOList globalPointLevel
+    (
+        IOobject
+        (
+            "pointLevel",
+            mesh_.facesInstance(),
+            polyMesh::meshSubDir,
+            mesh_,
+            IOobject::READ_IF_PRESENT,
+            IOobject::NO_WRITE
+        ),
+        labelList(mesh_.nPoints(), 0)
+    );
+
+
+    // Write out the meshes
+    for (label procI = 0; procI < nProcs_; procI++)
+    {
+        fileName processorCasePath
+        (
+            mesh_.time().caseName()/fileName(word("processor") + name(procI))
+        );
+
+        // make the processor directory
+        mkDir(mesh_.time().rootPath()/processorCasePath);
+
+        // create a database
+        Time processorDb
+        (
+            Time::controlDictName,
+            mesh_.time().rootPath(),
+            processorCasePath,
+            "system",
+            "constant",
+            true
+        );
+
+        // Set the precision of the points data to 10
+        IOstream::defaultPrecision(10);
+
+        autoPtr<fvMesh> procMeshPtr = processorMesh(procI, processorDb);
+        fvMesh& procMesh = procMeshPtr();
+
+        procMesh.write();
+
+        Info<< endl
+            << "Processor " << procI << nl
+            << "    Number of cells = " << procMesh.nCells()
+            << endl;
+
+        label nBoundaryFaces = 0;
+        label nProcPatches = 0;
+        label nProcFaces = 0;
+
+        forAll (procMesh.boundaryMesh(), patchi)
+        {
+            if
+            (
+                procMesh.boundaryMesh()[patchi].type()
+             == processorPolyPatch::typeName
+            )
+            {
+                const processorPolyPatch& ppp =
+                refCast<const processorPolyPatch>
+                (
+                    procMesh.boundaryMesh()[patchi]
+                );
+
+                Info<< "    Number of faces shared with processor "
+                    << ppp.neighbProcNo() << " = " << ppp.size() << endl;
+
+                nProcPatches++;
+                nProcFaces += ppp.size();
+            }
+            else
+            {
+                nBoundaryFaces += procMesh.boundaryMesh()[patchi].size();
+            }
+        }
+
+        Info<< "    Number of processor patches = " << nProcPatches << nl
+            << "    Number of processor faces = " << nProcFaces << nl
+            << "    Number of boundary faces = " << nBoundaryFaces << endl;
+
+        totProcFaces += nProcFaces;
+        maxProcPatches = max(maxProcPatches, nProcPatches);
+        maxProcFaces = max(maxProcFaces, nProcFaces);
+
+        // create and write the addressing information
+        labelIOList pointProcAddressing
+        (
+            IOobject
+            (
+                "pointProcAddressing",
+                procMesh.facesInstance(),
+                procMesh.meshSubDir,
+                procMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            procPointAddressing_[procI]
+        );
+        pointProcAddressing.write();
+
+        labelIOList faceProcAddressing
+        (
+            IOobject
+            (
+                "faceProcAddressing",
+                procMesh.facesInstance(),
+                procMesh.meshSubDir,
+                procMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            procFaceAddressing_[procI]
+        );
+        faceProcAddressing.write();
+
+        labelIOList cellProcAddressing
+        (
+            IOobject
+            (
+                "cellProcAddressing",
+                procMesh.facesInstance(),
+                procMesh.meshSubDir,
+                procMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            procCellAddressing_[procI]
+        );
+        cellProcAddressing.write();
+
+        labelIOList boundaryProcAddressing
+        (
+            IOobject
+            (
+                "boundaryProcAddressing",
+                procMesh.facesInstance(),
+                procMesh.meshSubDir,
+                procMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            procBoundaryAddressing_[procI]
+        );
+        boundaryProcAddressing.write();
+
+        // Create and write cellLevel and pointLevel information
+        const unallocLabelList& cellMap = cellProcAddressing;
+        labelIOList procCellLevel
+        (
+            IOobject
+            (
+                "cellLevel",
+                procMesh.facesInstance(),
+                procMesh.meshSubDir,
+                procMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            labelList(globalCellLevel, cellMap)
+        );
+        procCellLevel.write();
+
+        const unallocLabelList& pointMap = pointProcAddressing;
+        labelIOList procPointLevel
+        (
+            IOobject
+            (
+                "pointLevel",
+                procMesh.facesInstance(),
+                procMesh.meshSubDir,
+                procMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            labelList(globalPointLevel, pointMap)
+        );
+        procPointLevel.write();
+    }
+
+    Info<< nl
+        << "Number of processor faces = " << totProcFaces/2 << nl
+        << "Max number of processor patches = " << maxProcPatches << nl
+        << "Max number of faces between processors = " << maxProcFaces
+        << endl;
+
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
similarity index 71%
rename from applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
index 0f6936ccd..f2c2abf4f 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
@@ -29,6 +29,8 @@ Description
 
 SourceFiles
     domainDecomposition.C
+    distributeCells.C
+    decomposeMesh.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -41,23 +43,24 @@ SourceFiles
 #include "PtrList.H"
 #include "point.H"
 
-#ifndef namespaceFoam
-#define namespaceFoam
-    using namespace Foam;
-#endif
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
 
 /*---------------------------------------------------------------------------*\
                      Class domainDecomposition Declaration
 \*---------------------------------------------------------------------------*/
 
 class domainDecomposition
-:
-    public fvMesh
 {
     // Private data
 
+        //- Mesh reference
+        const fvMesh& mesh_;
+
         //- Mesh decomposition control dictionary
-        IOdictionary decompositionDict_;
+        dictionary decompositionDict_;
 
         //- Number of processors in decomposition
         label nProcs_;
@@ -119,24 +122,37 @@ class domainDecomposition
 
     // Private Member Functions
 
+        //- Create cell-to processor list using domain decomposition tools
         void distributeCells();
 
 
 public:
 
+    // Declare name of the class and its debug switch
+    ClassName("domainDecomposition");
+
     // Constructors
 
-        //- Construct from IOobject
-        domainDecomposition(const IOobject& io);
+        //- Construct from mesh and dictionary
+        domainDecomposition
+        (
+            const fvMesh& mesh,
+            const dictionary& dict
+        );
 
 
-    // Destructor
-
-        ~domainDecomposition();
+    //- Destructor
+    ~domainDecomposition();
 
 
     // Member Functions
 
+        //- Return mesh reference
+        const fvMesh& mesh() const
+        {
+            return mesh_;
+        }
+
         //- Number of processor in decomposition
         label nProcs() const
         {
@@ -149,20 +165,59 @@ public:
             return distributed_;
         }
 
-        //- Decompose mesh. Optionally remove zero-sized patches.
-        void decomposeMesh(const bool filterEmptyPatches);
-
-        //- Write decomposition
-        bool writeDecomposition();
-
-        //- Cell-processor decomposition labels
+        //- Return cell-processor decomposition labels
         const labelList& cellToProc() const
         {
             return cellToProc_;
         }
+
+        //- Decompose mesh. Optionally remove zero-sized patches.
+        void decomposeMesh(const bool filterEmptyPatches);
+
+
+        // Decomposed mesh and addressing
+
+            //- Decompose mesh for a given processor
+            autoPtr<fvMesh> processorMesh
+            (
+                const label procI,
+                const Time& procDb
+            ) const;
+
+            //- Return processor point addressing
+            const labelListList& procPointAddressing() const
+            {
+                return procPointAddressing_;
+            }
+
+            //- Return processor face addressing
+            const labelListList& procFaceAddressing() const
+            {
+                return procFaceAddressing_;
+            }
+
+            //- Return processor cell addressing
+            const labelListList& procCellAddressing() const
+            {
+                return procCellAddressing_;
+            }
+
+            //- Return processor boundary addressing
+            const labelListList& procBoundaryAddressing() const
+            {
+                return procBoundaryAddressing_;
+            }
+
+
+        //- Write decomposition
+        bool writeDecomposition();
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposer.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposer.C
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposer.H
similarity index 99%
rename from applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposer.H
index e80ea948a..cbf16bbb2 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposer.H
@@ -276,6 +276,7 @@ public:
             const GeometricField<Type, fvsPatchField, surfaceMesh>& field
         ) const;
 
+        //- Decompose and write all fields from the list
         template<class GeoField>
         void decomposeFields(const PtrList<GeoField>& fields) const;
 };
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposerDecomposeFields.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposerDecomposeFields.C
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/lagrangian/lagrangianFieldDecomposer.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/lagrangian/lagrangianFieldDecomposer.C
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/lagrangian/lagrangianFieldDecomposer.H
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/lagrangian/lagrangianFieldDecomposer.H
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/lagrangian/lagrangianFieldDecomposerDecomposeFields.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/lagrangian/lagrangianFieldDecomposerDecomposeFields.C
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/point/pointFieldDecomposer.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/point/pointFieldDecomposer.C
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/point/pointFieldDecomposer.H
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/point/pointFieldDecomposer.H
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/point/pointFieldDecomposerDecomposeFields.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/point/pointFieldDecomposerDecomposeFields.C
diff --git a/applications/utilities/parallelProcessing/decomposePar/tetPointFieldDecomposer.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/tetFiniteElement/tetPointFieldDecomposer.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/tetPointFieldDecomposer.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/tetFiniteElement/tetPointFieldDecomposer.C
diff --git a/applications/utilities/parallelProcessing/decomposePar/tetPointFieldDecomposer.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/tetFiniteElement/tetPointFieldDecomposer.H
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/tetPointFieldDecomposer.H
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/tetFiniteElement/tetPointFieldDecomposer.H
diff --git a/applications/utilities/parallelProcessing/decomposePar/tetPointFieldDecomposerDecomposeFields.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/tetFiniteElement/tetPointFieldDecomposerDecomposeFields.C
similarity index 100%
rename from applications/utilities/parallelProcessing/decomposePar/tetPointFieldDecomposerDecomposeFields.C
rename to src/decompositionMethods/decomposeReconstruct/decomposeTools/tetFiniteElement/tetPointFieldDecomposerDecomposeFields.C
diff --git a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.C
diff --git a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.H
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.H
diff --git a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructorReconstructFields.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructorReconstructFields.C
diff --git a/applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.C
diff --git a/applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.H
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.H
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.H
diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.C
diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H
similarity index 92%
rename from applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H
index cb4b09ccf..6a6e283e9 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H
@@ -49,7 +49,7 @@ namespace Foam
 
 
 /*---------------------------------------------------------------------------*\
-                 Class fvFieldReconstructor Declaration
+                    Class fvFieldReconstructor Declaration
 \*---------------------------------------------------------------------------*/
 
 class fvFieldReconstructor
@@ -145,6 +145,16 @@ public:
 
     // Member Functions
 
+        //- Reconstruct volume field into a given field
+        //  If a PtrList slot is empty, it is skipped
+        template<class Type>
+        void reconstructFvVolumeField
+        (
+            GeometricField<Type, fvPatchField, volMesh>& reconField,
+            const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+                procFields
+        );
+
         //- Reconstruct volume field
         template<class Type>
         tmp<GeometricField<Type, fvPatchField, volMesh> >
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructorReconstructFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C
similarity index 91%
rename from applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructorReconstructFields.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C
index 236faa138..bc45eceb9 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/fvFieldReconstructorReconstructFields.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C
@@ -33,6 +33,177 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Type>
+void Foam::fvFieldReconstructor::reconstructFvVolumeField
+(
+    GeometricField<Type, fvPatchField, volMesh>& reconField,
+    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& procFields
+)
+{
+    // Get references to internal and boundary field
+    Field<Type>& iField = reconField.internalField();
+    GeometricField<Type, fvPatchField, volMesh>::BoundaryField& boundaryField =
+        reconField.boundaryField();
+
+    forAll (procMeshes_, procI)
+    {
+        const GeometricField<Type, fvPatchField, volMesh>& procField =
+            procFields[procI];
+
+        // Set the cell values in the reconstructed field
+        iField.rmap
+        (
+            procField.internalField(),
+            cellProcAddressing_[procI]
+        );
+
+        // Set the boundary patch values in the reconstructed field
+        forAll (boundaryProcAddressing_[procI], patchI)
+        {
+            // Get patch index of the original patch
+            const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+            // Get addressing slice for this patch
+            const labelList::subList cp =
+                procMeshes_[procI].boundary()[patchI].patchSlice
+                (
+                    faceProcAddressing_[procI]
+                );
+
+            // check if the boundary patch is not a processor patch
+            if (curBPatch >= 0)
+            {
+                // Regular patch. Fast looping
+
+                if (!boundaryField(curBPatch))
+                {
+                    boundaryField.set
+                    (
+                        curBPatch,
+                        fvPatchField<Type>::New
+                        (
+                            procField.boundaryField()[patchI],
+                            mesh_.boundary()[curBPatch],
+                            DimensionedField<Type, volMesh>::null(),
+                            fvPatchFieldReconstructor
+                            (
+                                mesh_.boundary()[curBPatch].size(),
+                                procField.boundaryField()[patchI].size()
+                            )
+                        )
+                    );
+                }
+
+                const label curPatchStart =
+                    mesh_.boundaryMesh()[curBPatch].start();
+
+                labelList reverseAddressing(cp.size());
+
+                forAll (cp, faceI)
+                {
+                    // Subtract one to take into account offsets for
+                    // face direction.
+                    reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
+                }
+
+                boundaryField[curBPatch].rmap
+                (
+                    procField.boundaryField()[patchI],
+                    reverseAddressing
+                );
+            }
+            else
+            {
+                const Field<Type>& curProcPatch =
+                    procField.boundaryField()[patchI];
+
+                // In processor patches, there's a mix of internal faces (some
+                // of them turned) and possible cyclics. Slow loop
+                forAll (cp, faceI)
+                {
+                    // Subtract one to take into account offsets for
+                    // face direction.
+                    label curF = cp[faceI] - 1;
+
+                    // Is the face on the boundary?
+                    if (curF >= mesh_.nInternalFaces())
+                    {
+                        label curBPatch =
+                            mesh_.boundaryMesh().whichPatch(curF);
+
+                        if (!boundaryField(curBPatch))
+                        {
+                            boundaryField.set
+                            (
+                                curBPatch,
+                                fvPatchField<Type>::New
+                                (
+                                    mesh_.boundary()[curBPatch].type(),
+                                    mesh_.boundary()[curBPatch],
+                                    DimensionedField<Type, volMesh>::null()
+                                )
+                            );
+                        }
+
+                        // add the face
+                        label curPatchFace =
+                            mesh_.boundaryMesh()
+                                [curBPatch].whichFace(curF);
+
+                        boundaryField[curBPatch][curPatchFace] =
+                            curProcPatch[faceI];
+                    }
+                }
+            }
+        }
+    }
+
+    forAll (mesh_.boundary(), patchI)
+    {
+        // add empty patches
+        if
+        (
+            isType<emptyFvPatch>(mesh_.boundary()[patchI])
+         && !boundaryField(patchI)
+        )
+        {
+            boundaryField.set
+            (
+                patchI,
+                fvPatchField<Type>::New
+                (
+                    emptyFvPatchField<Type>::typeName,
+                    mesh_.boundary()[patchI],
+                    DimensionedField<Type, volMesh>::null()
+                )
+            );
+        }
+    }
+
+
+    // Now construct and write the field
+    // setting the internalField and boundaryField
+    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    (
+        new GeometricField<Type, fvPatchField, volMesh>
+        (
+            IOobject
+            (
+                fieldIoObject.name(),
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            procFields[0].dimensions(),
+            iField,
+            patchFields
+        )
+    );
+}
+
+
 template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::fvFieldReconstructor::reconstructFvVolumeField
@@ -66,153 +237,8 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
         );
     }
 
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nCells());
-
-    // Create the patch fields
-    PtrList<fvPatchField<Type> > patchFields(mesh_.boundary().size());
-
-
-    forAll (procMeshes_, procI)
-    {
-        const GeometricField<Type, fvPatchField, volMesh>& procField =
-            procFields[procI];
-
-        // Set the cell values in the reconstructed field
-        internalField.rmap
-        (
-            procField.internalField(),
-            cellProcAddressing_[procI]
-        );
-
-        // Set the boundary patch values in the reconstructed field
-        forAll (boundaryProcAddressing_[procI], patchI)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // Get addressing slice for this patch
-            const labelList::subList cp =
-                procMeshes_[procI].boundary()[patchI].patchSlice
-                (
-                    faceProcAddressing_[procI]
-                );
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
-            {
-                // Regular patch. Fast looping
-
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        fvPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, volMesh>::null(),
-                            fvPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
-
-                const label curPatchStart =
-                    mesh_.boundaryMesh()[curBPatch].start();
-
-                labelList reverseAddressing(cp.size());
-
-                forAll (cp, faceI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-                    reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
-                }
-
-                patchFields[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchI],
-                    reverseAddressing
-                );
-            }
-            else
-            {
-                const Field<Type>& curProcPatch =
-                    procField.boundaryField()[patchI];
-
-                // In processor patches, there's a mix of internal faces (some
-                // of them turned) and possible cyclics. Slow loop
-                forAll (cp, faceI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-                    label curF = cp[faceI] - 1;
-
-                    // Is the face on the boundary?
-                    if (curF >= mesh_.nInternalFaces())
-                    {
-                        label curBPatch =
-                            mesh_.boundaryMesh().whichPatch(curF);
-
-                        if (!patchFields(curBPatch))
-                        {
-                            patchFields.set
-                            (
-                                curBPatch,
-                                fvPatchField<Type>::New
-                                (
-                                    mesh_.boundary()[curBPatch].type(),
-                                    mesh_.boundary()[curBPatch],
-                                    DimensionedField<Type, volMesh>::null()
-                                )
-                            );
-                        }
-
-                        // add the face
-                        label curPatchFace =
-                            mesh_.boundaryMesh()
-                                [curBPatch].whichFace(curF);
-
-                        patchFields[curBPatch][curPatchFace] =
-                            curProcPatch[faceI];
-                    }
-                }
-            }
-        }
-    }
-
-    forAll (mesh_.boundary(), patchI)
-    {
-        // add empty patches
-        if
-        (
-            isType<emptyFvPatch>(mesh_.boundary()[patchI])
-         && !patchFields(patchI)
-        )
-        {
-            patchFields.set
-            (
-                patchI,
-                fvPatchField<Type>::New
-                (
-                    emptyFvPatchField<Type>::typeName,
-                    mesh_.boundary()[patchI],
-                    DimensionedField<Type, volMesh>::null()
-                )
-            );
-        }
-    }
-
-
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    // Construct the reconstructed field
+    tmp<GeometricField<Type, fvPatchField, volMesh> > tReconField
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -225,11 +251,18 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
                 IOobject::NO_WRITE
             ),
             mesh_,
-            procFields[0].dimensions(),
-            internalField,
-            patchFields
+            procFields[0].dimensions()
         )
     );
+
+    // Reconstruct fields
+    reconstructFvVolumeField
+    (
+        tReconField(),
+        procFields
+    );
+
+    return treconField;
 }
 
 
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/processorMeshesRebuild.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructParMesh/processorMeshesRebuild.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/processorMeshesReconstructor.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructParMesh/processorMeshesReconstructor.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/processorMeshesReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
similarity index 97%
rename from applications/utilities/parallelProcessing/reconstructParMesh/processorMeshesReconstructor.H
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
index eff9cb2e0..3070b16e4 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/processorMeshesReconstructor.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
@@ -51,7 +51,7 @@ namespace Foam
 class processorPolyPatch;
 
 /*---------------------------------------------------------------------------*\
-                  Class processorMeshesReconstructor Declaration
+                Class processorMeshesReconstructor Declaration
 \*---------------------------------------------------------------------------*/
 
 class processorMeshesReconstructor
@@ -61,6 +61,7 @@ class processorMeshesReconstructor
         //- Processor databases
         PtrList<Time>& databases_;
 
+        //- Name of mesh region to reconstruct
         const word meshName_;
 
         //- List of processor meshes
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructLagrangian.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangian.H
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/reconstructLagrangian.H
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangian.H
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructLagrangianFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianFields.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/reconstructLagrangianFields.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianFields.C
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructLagrangianPositions.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianPositions.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/reconstructLagrangianPositions.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianPositions.C
diff --git a/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructor.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructor.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructor.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructor.C
diff --git a/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructor.H
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructor.H
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructor.H
diff --git a/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructorReconstructFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructorReconstructFields.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructorReconstructFields.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructorReconstructFields.C
diff --git a/applications/utilities/parallelProcessing/reconstructPar/tetPointFieldReconstructor.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructor.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/tetPointFieldReconstructor.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructor.C
diff --git a/applications/utilities/parallelProcessing/reconstructPar/tetPointFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructor.H
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/tetPointFieldReconstructor.H
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructor.H
diff --git a/applications/utilities/parallelProcessing/reconstructPar/tetPointFieldReconstructorReconstructFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructorReconstructFields.C
similarity index 100%
rename from applications/utilities/parallelProcessing/reconstructPar/tetPointFieldReconstructorReconstructFields.C
rename to src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructorReconstructFields.C

From d7a925cf5005f97298f3c26ffd3e5bd1a9266dda Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Wed, 28 Feb 2018 18:35:48 +0000
Subject: [PATCH 02/45] Refactor mapping tools for partially filled PtrLists

---
 .../finiteArea/faFieldReconstructor.H         |   36 +-
 .../faFieldReconstructorReconstructFields.C   |  943 +++++++-------
 .../finiteArea/processorFaMeshes.C            |  276 ++--
 .../finiteArea/processorFaMeshes.H            |   29 +-
 .../finiteVolume/fvFieldReconstructor.H       |   30 +-
 .../fvFieldReconstructorReconstructFields.C   |  662 +++++-----
 .../finiteVolume/processorMeshesRebuild.C     | 1105 +++++++++--------
 .../processorMeshesReconstructor.C            |   50 +-
 .../processorMeshesReconstructor.H            |   16 +-
 .../lagrangian/reconstructLagrangianFields.C  |   41 +-
 .../reconstructLagrangianPositions.C          |   33 +-
 .../point/pointFieldReconstructor.H           |   21 +-
 ...pointFieldReconstructorReconstructFields.C |  216 ++--
 .../tetPointFieldReconstructor.H              |   41 +-
 ...PointFieldReconstructorReconstructFields.C |  467 ++++---
 15 files changed, 2186 insertions(+), 1780 deletions(-)

diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.H
index b592d001e..683adc6be 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.H
@@ -29,6 +29,7 @@ Description
 
 Author
     Zeljko Tukovic, FSB Zagreb.  All rights reserved
+    Hrvoje Jasak, Wikki Ltd.
 
 SourceFiles
     faFieldReconstructor.C
@@ -109,6 +110,11 @@ public:
                 {}
 
 
+            //- Destructor
+            virtual ~faPatchFieldReconstructor()
+            {}
+            
+
             // Member functions
 
                 virtual label size() const
@@ -148,13 +154,33 @@ public:
 
     // Member Functions
 
+        //- Reconstruct area field data into a given field
+        //  If a PtrList slot is empty, it is skipped
+        template<class Type>
+        void reconstructFaAreaField
+        (
+            GeometricField<Type, faPatchField, areaMesh>& reconField,
+            const PtrList<GeometricField<Type, faPatchField, areaMesh> >&
+                procFields
+        ) const;
+
         //- Reconstruct area field
         template<class Type>
         tmp<GeometricField<Type, faPatchField, areaMesh> >
         reconstructFaAreaField
         (
             const IOobject& fieldIoObject
-        );
+        ) const;
+
+        //- Reconstruct edge field data into a given field
+        //  If a PtrList slot is empty, it is skipped
+        template<class Type>
+        void reconstructFaEdgeField
+        (
+            GeometricField<Type, faePatchField, edgeMesh>& reconField,
+            const PtrList<GeometricField<Type, faePatchField, edgeMesh> >&
+                procFields
+        ) const;
 
         //- Reconstruct edge field
         template<class Type>
@@ -162,21 +188,21 @@ public:
         reconstructFaEdgeField
         (
             const IOobject& fieldIoObject
-        );
+        ) const;
 
         //- Reconstruct and write all area fields
         template<class Type>
         void reconstructFaAreaFields
         (
             const IOobjectList& objects
-        );
+        ) const;
 
-        //- Reconstruct and write all area fields
+        //- Reconstruct and write all edge fields
         template<class Type>
         void reconstructFaEdgeFields
         (
             const IOobjectList& objects
-        );
+        ) const;
 };
 
 
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructorReconstructFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructorReconstructFields.C
index 75167729e..a36ce41e8 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructorReconstructFields.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructorReconstructFields.C
@@ -34,44 +34,17 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh> >
-Foam::faFieldReconstructor::reconstructFaAreaField
+void Foam::faFieldReconstructor::reconstructFaAreaField
 (
-    const IOobject& fieldIoObject
-)
+    GeometricField<Type, faPatchField, areaMesh>& reconField,
+    const PtrList<GeometricField<Type, faPatchField, areaMesh> >& procFields
+) const
 {
-    // Read the field for all the processors
-    PtrList<GeometricField<Type, faPatchField, areaMesh> > procFields
-    (
-        procMeshes_.size()
-    );
-
-    forAll (procMeshes_, procI)
-    {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, faPatchField, areaMesh>
-            (
-                IOobject
-                (
-                    fieldIoObject.name(),
-                    procMeshes_[procI].time().timeName(),
-                    procMeshes_[procI](),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
-    }
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nFaces());
-
-    // Create the patch fields
-    PtrList<faPatchField<Type> > patchFields(mesh_.boundary().size());
+    // Get references to internal and boundary field
+    Field<Type>& iField = reconField.internalField();
 
+    typename GeometricField<Type, faPatchField, areaMesh>::
+        GeometricBoundaryField& bouField = reconField.boundaryField();
 
     // Create global mesh patchs starts
 
@@ -82,396 +55,103 @@ Foam::faFieldReconstructor::reconstructFaAreaField
         gStarts[0] = mesh_.nInternalEdges();
     }
 
-    for(label i=1; i<mesh_.boundary().size(); i++)
+    for(label i = 1; i < mesh_.boundary().size(); i++)
     {
-        gStarts[i] = gStarts[i-1] + mesh_.boundary()[i-1].labelList::size();
+        gStarts[i] = gStarts[i - 1] + mesh_.boundary()[i - 1].labelList::size();
     }
 
-    forAll (procMeshes_, procI)
+    forAll (procFields, procI)
     {
-        const GeometricField<Type, faPatchField, areaMesh>& procField =
-            procFields[procI];
-
-        // Set the face values in the reconstructed field
-        internalField.rmap
-        (
-            procField.internalField(),
-            faceProcAddressing_[procI]
-        );
-
-
-
-        // Set the boundary patch values in the reconstructed field
-
-        labelList starts(procMeshes_[procI].boundary().size(), -1);
-
-        if(procMeshes_[procI].boundary().size() > 0)
+        if (procFields.set(procI))
         {
-            starts[0] = procMeshes_[procI].nInternalEdges();
-        }
+            const GeometricField<Type, faPatchField, areaMesh>& procField =
+                procFields[procI];
 
-        for(label i=1; i<procMeshes_[procI].boundary().size(); i++)
-        {
-            starts[i] =
-                starts[i-1]
-              + procMeshes_[procI].boundary()[i-1].labelList::size();
-        }
-
-        forAll(boundaryProcAddressing_[procI], patchI)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // Get addressing slice for this patch
-
-//             const labelList::subList cp =
-//                 procMeshes_[procI].boundary()[patchI].patchSlice
-//                 (
-//                     edgeProcAddressing_[procI]
-//                 );
-
-            const labelList::subList cp =
-                labelList::subList
-                (
-                    edgeProcAddressing_[procI],
-                    procMeshes_[procI].boundary()[patchI].size(),
-                    starts[patchI]
-                );
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
-            {
-                // Regular patch. Fast looping
-
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        faPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, areaMesh>::null(),
-                            faPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
-
-                const label curPatchStart = gStarts[curBPatch];
-//                     mesh_.boundary()[curBPatch].start();
-
-                labelList reverseAddressing(cp.size());
-
-                forAll(cp, edgeI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-//                     reverseAddressing[edgeI] = cp[edgeI] - 1 - curPatchStart;
-                    reverseAddressing[edgeI] = cp[edgeI] - curPatchStart;
-                }
-
-                patchFields[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchI],
-                    reverseAddressing
-                );
-            }
-            else
-            {
-                const Field<Type>& curProcPatch =
-                    procField.boundaryField()[patchI];
-
-                // In processor patches, there's a mix of internal faces (some
-                // of them turned) and possible cyclics. Slow loop
-                forAll(cp, edgeI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-//                     label curE = cp[edgeI] - 1;
-                    label curE = cp[edgeI];
-
-                    // Is the face on the boundary?
-                    if (curE >= mesh_.nInternalEdges())
-                    {
-//                         label curBPatch = mesh_.boundary().whichPatch(curE);
-                        label curBPatch = -1;
-
-                        forAll (mesh_.boundary(), pI)
-                        {
-                            if
-                            (
-                                curE >= gStarts[pI]
-                             && curE <
-                                (
-                                    gStarts[pI]
-                                  + mesh_.boundary()[pI].labelList::size()
-                                )
-                            )
-                            {
-                                curBPatch = pI;
-                            }
-                        }
-
-                        if (!patchFields(curBPatch))
-                        {
-                            patchFields.set
-                            (
-                                curBPatch,
-                                faPatchField<Type>::New
-                                (
-                                    mesh_.boundary()[curBPatch].type(),
-                                    mesh_.boundary()[curBPatch],
-                                    DimensionedField<Type, areaMesh>::null()
-                                )
-                            );
-                        }
-
-                        // add the edge
-//                         label curPatchEdge =
-//                             mesh_.boundary()
-//                                 [curBPatch].whichEdge(curE);
-
-                        label curPatchEdge = curE - gStarts[curBPatch];
-
-                        patchFields[curBPatch][curPatchEdge] =
-                            curProcPatch[edgeI];
-                    }
-                }
-            }
-        }
-    }
-
-    forAll(mesh_.boundary(), patchI)
-    {
-        // add empty patches
-        if
-        (
-            typeid(mesh_.boundary()[patchI]) == typeid(emptyFaPatch)
-         && !patchFields(patchI)
-        )
-        {
-            patchFields.set
-            (
-                patchI,
-                faPatchField<Type>::New
-                (
-                    emptyFaPatchField<Type>::typeName,
-                    mesh_.boundary()[patchI],
-                    DimensionedField<Type, areaMesh>::null()
-                )
-            );
-        }
-    }
-
-
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, faPatchField, areaMesh> >
-    (
-        new GeometricField<Type, faPatchField, areaMesh>
-        (
-            IOobject
-            (
-                fieldIoObject.name(),
-                mesh_.time().timeName(),
-                mesh_(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            procFields[0].dimensions(),
-            internalField,
-            patchFields
-        )
-    );
-}
-
-
-template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::faePatchField, Foam::edgeMesh> >
-Foam::faFieldReconstructor::reconstructFaEdgeField
-(
-    const IOobject& fieldIoObject
-)
-{
-    // Read the field for all the processors
-    PtrList<GeometricField<Type, faePatchField, edgeMesh> > procFields
-    (
-        procMeshes_.size()
-    );
-
-    forAll (procMeshes_, procI)
-    {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, faePatchField, edgeMesh>
-            (
-                IOobject
-                (
-                    fieldIoObject.name(),
-                    procMeshes_[procI].time().timeName(),
-                    procMeshes_[procI](),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
-    }
-
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nInternalEdges());
-
-    // Create the patch fields
-    PtrList<faePatchField<Type> > patchFields(mesh_.boundary().size());
-
-
-    labelList gStarts(mesh_.boundary().size(), -1);
-
-    if(mesh_.boundary().size() > 0)
-    {
-        gStarts[0] = mesh_.nInternalEdges();
-    }
-
-    for(label i=1; i<mesh_.boundary().size(); i++)
-    {
-        gStarts[i] = gStarts[i-1] + mesh_.boundary()[i-1].labelList::size();
-    }
-
-
-    forAll (procMeshes_, procI)
-    {
-        const GeometricField<Type, faePatchField, edgeMesh>& procField =
-            procFields[procI];
-
-        // Set the face values in the reconstructed field
-
-        // It is necessary to create a copy of the addressing array to
-        // take care of the face direction offset trick.
-        //
-        {
-            labelList curAddr(edgeProcAddressing_[procI]);
-
-//             forAll (curAddr, addrI)
-//             {
-//                 curAddr[addrI] -= 1;
-//             }
-
-            internalField.rmap
+            // Set the face values in the reconstructed field
+            iField.rmap
             (
                 procField.internalField(),
-                curAddr
+                faceProcAddressing_[procI]
             );
-        }
 
-        // Set the boundary patch values in the reconstructed field
+            // Set the boundary patch values in the reconstructed field
 
-        labelList starts(procMeshes_[procI].boundary().size(), -1);
+            labelList starts(procMeshes_[procI].boundary().size(), -1);
 
-        if(procMeshes_[procI].boundary().size() > 0)
-        {
-            starts[0] = procMeshes_[procI].nInternalEdges();
-        }
-
-        for(label i=1; i<procMeshes_[procI].boundary().size(); i++)
-        {
-            starts[i] =
-                starts[i-1]
-              + procMeshes_[procI].boundary()[i-1].labelList::size();
-        }
-
-        forAll(boundaryProcAddressing_[procI], patchI)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // Get addressing slice for this patch
-
-//             const labelList::subList cp =
-//                 procMeshes_[procI].boundary()[patchI].patchSlice
-//                 (
-//                     faceProcAddressing_[procI]
-//                 );
-
-            const labelList::subList cp =
-                labelList::subList
-                (
-                    edgeProcAddressing_[procI],
-                    procMeshes_[procI].boundary()[patchI].size(),
-                    starts[patchI]
-                );
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
+            if (procMeshes_[procI].boundary().size() > 0)
             {
-                // Regular patch. Fast looping
+                starts[0] = procMeshes_[procI].nInternalEdges();
+            }
 
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
+            for(label i = 1; i < procMeshes_[procI].boundary().size(); i++)
+            {
+                starts[i] =
+                    starts[i-1]
+                  + procMeshes_[procI].boundary()[i-1].labelList::size();
+            }
+
+            forAll (boundaryProcAddressing_[procI], patchI)
+            {
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // Get addressing slice for this patch
+
+//                 const labelList::subList cp =
+//                     procMeshes_[procI].boundary()[patchI].patchSlice
+//                     (
+//                         edgeProcAddressing_[procI]
+//                     );
+
+                const labelList::subList cp =
+                    labelList::subList
                     (
-                        curBPatch,
-                        faePatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, edgeMesh>::null(),
-                            faPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
+                        edgeProcAddressing_[procI],
+                        procMeshes_[procI].boundary()[patchI].size(),
+                        starts[patchI]
+                    );
+
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    // Regular patch. Fast looping
+                    const label curPatchStart = gStarts[curBPatch];
+//                         mesh_.boundary()[curBPatch].start();
+
+                    labelList reverseAddressing(cp.size());
+
+                    forAll (cp, edgeI)
+                    {
+                        // Subtract one to take into account offsets for
+                        // face direction.
+//                         reverseAddressing[edgeI] = cp[edgeI] - 1 - curPatchStart;
+                        reverseAddressing[edgeI] = cp[edgeI] - curPatchStart;
+                    }
+
+                    bouField[curBPatch].rmap
+                    (
+                        procField.boundaryField()[patchI],
+                        reverseAddressing
                     );
                 }
-
-                const label curPatchStart = gStarts[curBPatch];
-//                     mesh_.boundary()[curBPatch].start();
-
-                labelList reverseAddressing(cp.size());
-
-                forAll(cp, edgeI)
+                else
                 {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-//                     reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
-                    reverseAddressing[edgeI] = cp[edgeI] - curPatchStart;
-                }
+                    const Field<Type>& curProcPatch =
+                        procField.boundaryField()[patchI];
 
-                patchFields[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchI],
-                    reverseAddressing
-                );
-            }
-            else
-            {
-                const Field<Type>& curProcPatch =
-                    procField.boundaryField()[patchI];
-
-                // In processor patches, there's a mix of internal faces (some
-                // of them turned) and possible cyclics. Slow loop
-                forAll(cp, edgeI)
-                {
-//                     label curF = cp[edgeI] - 1;
-                    label curE = cp[edgeI];
-
-                    // Is the face turned the right side round
-                    if (curE >= 0)
+                    // In processor patches, there's a mix of internal faces
+                    // (some of them turned) and possible cyclics. Slow loop
+                    forAll (cp, edgeI)
                     {
+                        // Subtract one to take into account offsets for
+                        // face direction.
+//                         label curE = cp[edgeI] - 1;
+                        label curE = cp[edgeI];
+
                         // Is the face on the boundary?
                         if (curE >= mesh_.nInternalEdges())
                         {
-//                             label curBPatch =
-//                                 mesh_.boundary().whichPatch(curF);
-
+//                             label curBPatch = mesh_.boundary().whichPatch(curE);
                             label curBPatch = -1;
 
                             forAll (mesh_.boundary(), pI)
@@ -490,50 +170,417 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
                                 }
                             }
 
-                            if (!patchFields(curBPatch))
-                            {
-                                patchFields.set
-                                (
-                                    curBPatch,
-                                    faePatchField<Type>::New
-                                    (
-                                        mesh_.boundary()[curBPatch].type(),
-                                        mesh_.boundary()[curBPatch],
-                                        DimensionedField<Type, edgeMesh>
-                                           ::null()
-                                    )
-                                );
-                            }
-
-                            // add the face
-//                             label curPatchFace =
+                            // add the edge
+//                             label curPatchEdge =
 //                                 mesh_.boundary()
-//                                 [curBPatch].whichEdge(curF);
+//                                     [curBPatch].whichEdge(curE);
 
                             label curPatchEdge = curE - gStarts[curBPatch];
 
-                            patchFields[curBPatch][curPatchEdge] =
+                            bouField[curBPatch][curPatchEdge] =
                                 curProcPatch[edgeI];
                         }
-                        else
-                        {
-                            // Internal face
-                            internalField[curE] = curProcPatch[edgeI];
-                        }
                     }
                 }
             }
         }
     }
+}
 
-    forAll(mesh_.boundary(), patchI)
+
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh> >
+Foam::faFieldReconstructor::reconstructFaAreaField
+(
+    const IOobject& fieldIoObject
+) const
+{
+    // Read the field for all the processors
+    PtrList<GeometricField<Type, faPatchField, areaMesh> > procFields
+    (
+        procMeshes_.size()
+    );
+
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            procFields.set
+            (
+                procI,
+                new GeometricField<Type, faPatchField, areaMesh>
+                (
+                    IOobject
+                    (
+                        fieldIoObject.name(),
+                        procMeshes_[procI].time().timeName(),
+                        procMeshes_[procI](),
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    procMeshes_[procI]
+                )
+            );
+        }
+    }
+
+    // Create the patch fields
+    PtrList<faPatchField<Type> > patchFields(mesh_.boundary().size());
+
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            forAll (boundaryProcAddressing_[procI], patchI)
+            {
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    // Regular patch. Clone with map
+                    if (!patchFields(curBPatch))
+                    {
+                        patchFields.set
+                        (
+                            curBPatch,
+                            faPatchField<Type>::New
+                            (
+                                procFields[procI].boundaryField()[patchI],
+                                mesh_.boundary()[curBPatch],
+                                DimensionedField<Type, areaMesh>::null(),
+                                faPatchFieldReconstructor
+                                (
+                                    mesh_.boundary()[curBPatch].size(),
+                                    procFields[procI].boundaryField()
+                                        [patchI].size()
+                                )
+                            )
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    // Add missing patch fields
+    forAll (mesh_.boundary(), patchI)
+    {
+        if (!patchFields(patchI))
+        {
+            patchFields.set
+            (
+                patchI,
+                faPatchField<Type>::New
+                (
+                    emptyFaPatchField<Type>::typeName,
+                    mesh_.boundary()[patchI],
+                    DimensionedField<Type, areaMesh>::null()
+                )
+            );
+        }
+    }
+
+    label firstValidMesh = 0;
+
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            firstValidMesh = procI;
+            break;
+        }
+    }
+
+    // Construct the reconstructed field with patches
+    tmp<GeometricField<Type, faPatchField, areaMesh> > treconField
+    (
+        new GeometricField<Type, faPatchField, areaMesh>
+        (
+            IOobject
+            (
+                fieldIoObject.name(),
+                mesh_.time().timeName(),
+                mesh_(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            procFields[firstValidMesh].dimensions(),
+            Field<Type>(mesh_.nFaces()),
+            patchFields
+        )
+    );
+
+    reconstructFaAreaField
+    (
+        treconField(),
+        procFields
+    );
+
+    return treconField;
+}
+
+
+template<class Type>
+void Foam::faFieldReconstructor::reconstructFaEdgeField
+(
+    GeometricField<Type, Foam::faePatchField, Foam::edgeMesh>& reconField,
+    const PtrList<GeometricField<Type, faePatchField, edgeMesh> >& procFields
+) const
+{
+    // Get references to internal and boundary field
+    Field<Type>& iField = reconField.internalField();
+
+    typename GeometricField<Type, faePatchField, edgeMesh>::
+        GeometricBoundaryField& bouField = reconField.boundaryField();
+
+    labelList gStarts(mesh_.boundary().size(), -1);
+
+    if (mesh_.boundary().size() > 0)
+    {
+        gStarts[0] = mesh_.nInternalEdges();
+    }
+
+    for(label i = 1; i < mesh_.boundary().size(); i++)
+    {
+        gStarts[i] = gStarts[i - 1] + mesh_.boundary()[i - 1].labelList::size();
+    }
+
+
+    forAll (procMeshes_, procI)
+    {
+        if (procFields.set(procI))
+        {
+            const GeometricField<Type, faePatchField, edgeMesh>& procField =
+                procFields[procI];
+
+            // Set the edge values in the reconstructed field
+
+            // It is necessary to create a copy of the addressing array to
+            // take care of the face direction offset trick.
+            //
+            {
+                labelList curAddr(edgeProcAddressing_[procI]);
+
+//                 forAll (curAddr, addrI)
+//                 {
+//                     curAddr[addrI] -= 1;
+//                 }
+
+                iField.rmap
+                (
+                    procField.internalField(),
+                    curAddr
+                );
+            }
+
+            // Set the boundary patch values in the reconstructed field
+
+            labelList starts(procMeshes_[procI].boundary().size(), -1);
+
+            if (procMeshes_[procI].boundary().size() > 0)
+            {
+                starts[0] = procMeshes_[procI].nInternalEdges();
+            }
+
+            for (label i = 1; i < procMeshes_[procI].boundary().size(); i++)
+            {
+                starts[i] =
+                    starts[i - 1]
+                  + procMeshes_[procI].boundary()[i - 1].labelList::size();
+            }
+
+            forAll (boundaryProcAddressing_[procI], patchI)
+            {
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // Get addressing slice for this patch
+
+//                 const labelList::subList cp =
+//                     procMeshes_[procI].boundary()[patchI].patchSlice
+//                     (
+//                         faceProcAddressing_[procI]
+//                     );
+
+                const labelList::subList cp =
+                    labelList::subList
+                    (
+                        edgeProcAddressing_[procI],
+                        procMeshes_[procI].boundary()[patchI].size(),
+                        starts[patchI]
+                    );
+
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    // Regular patch. Fast looping
+                    const label curPatchStart = gStarts[curBPatch];
+//                         mesh_.boundary()[curBPatch].start();
+
+                    labelList reverseAddressing(cp.size());
+
+                    forAll (cp, edgeI)
+                    {
+                        // Subtract one to take into account offsets for
+                        // face direction.
+//                         reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
+                        reverseAddressing[edgeI] = cp[edgeI] - curPatchStart;
+                    }
+
+                    bouField[curBPatch].rmap
+                    (
+                        procField.boundaryField()[patchI],
+                        reverseAddressing
+                    );
+                }
+                else
+                {
+                    const Field<Type>& curProcPatch =
+                        procField.boundaryField()[patchI];
+
+                    // In processor patches, there's a mix of internal faces
+                    // (some of them turned) and possible cyclics. Slow loop
+                    forAll (cp, edgeI)
+                    {
+//                         label curF = cp[edgeI] - 1;
+                        label curE = cp[edgeI];
+
+                        // Is the face turned the right side round
+                        if (curE >= 0)
+                        {
+                            // Is the face on the boundary?
+                            if (curE >= mesh_.nInternalEdges())
+                            {
+//                                 label curBPatch =
+//                                     mesh_.boundary().whichPatch(curF);
+
+                                label curBPatch = -1;
+
+                                forAll (mesh_.boundary(), pI)
+                                {
+                                    if
+                                    (
+                                        curE >= gStarts[pI]
+                                     && curE <
+                                        (
+                                            gStarts[pI]
+                                          + mesh_.boundary()[pI].labelList::size()
+                                        )
+                                    )
+                                    {
+                                        curBPatch = pI;
+                                    }
+                                }
+
+                                // add the face
+//                                 label curPatchFace =
+//                                     mesh_.boundary()
+//                                     [curBPatch].whichEdge(curF);
+
+                                label curPatchEdge = curE - gStarts[curBPatch];
+
+                                bouField[curBPatch][curPatchEdge] =
+                                    curProcPatch[edgeI];
+                            }
+                            else
+                            {
+                                // Internal face
+                                iField[curE] = curProcPatch[edgeI];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::faePatchField, Foam::edgeMesh> >
+Foam::faFieldReconstructor::reconstructFaEdgeField
+(
+    const IOobject& fieldIoObject
+) const
+{
+    // Read the field for all the processors
+    PtrList<GeometricField<Type, faePatchField, edgeMesh> > procFields
+    (
+        procMeshes_.size()
+    );
+
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            procFields.set
+            (
+                procI,
+                new GeometricField<Type, faePatchField, edgeMesh>
+                (
+                    IOobject
+                    (
+                        fieldIoObject.name(),
+                        procMeshes_[procI].time().timeName(),
+                        procMeshes_[procI](),
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    procMeshes_[procI]
+                )
+            );
+        }
+    }
+
+    // Create the patch fields
+    PtrList<faePatchField<Type> > patchFields(mesh_.boundary().size());
+
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            // Set the boundary patch in the reconstructed field
+            forAll(boundaryProcAddressing_[procI], patchI)
+            {
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    // Regular patch. Clone with map
+                    if (!patchFields(curBPatch))
+                    {
+                        patchFields.set
+                        (
+                            curBPatch,
+                            faePatchField<Type>::New
+                            (
+                                procFields[procI].boundaryField()[patchI],
+                                mesh_.boundary()[curBPatch],
+                                DimensionedField<Type, edgeMesh>::null(),
+                                faPatchFieldReconstructor
+                                (
+                                    mesh_.boundary()[curBPatch].size(),
+                                    procFields[procI].boundaryField()
+                                        [patchI].size()
+                                )
+                            )
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    // Add missing patch fields
+    forAll (mesh_.boundary(), patchI)
     {
         // add empty patches
-        if
-        (
-            typeid(mesh_.boundary()[patchI]) == typeid(emptyFaPatch)
-         && !patchFields(patchI)
-        )
+        if (!patchFields(patchI))
         {
             patchFields.set
             (
@@ -548,10 +595,19 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
         }
     }
 
+    label firstValidMesh = 0;
 
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, faePatchField, edgeMesh> >
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            firstValidMesh = procI;
+            break;
+        }
+    }
+
+    // Construct the reconstructed field with patches
+    tmp<GeometricField<Type, faePatchField, edgeMesh> > treconField
     (
         new GeometricField<Type, faePatchField, edgeMesh>
         (
@@ -564,11 +620,20 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
                 IOobject::NO_WRITE
             ),
             mesh_,
-            procFields[0].dimensions(),
-            internalField,
+            procFields[firstValidMesh].dimensions(),
+            Field<Type>(mesh_.nInternalEdges()),
             patchFields
         )
     );
+
+    // Reconstruct field
+    reconstructFaEdgeField
+    (
+        treconField(),
+        procFields
+    );
+
+    return treconField;
 }
 
 
@@ -577,7 +642,7 @@ template<class Type>
 void Foam::faFieldReconstructor::reconstructFaAreaFields
 (
     const IOobjectList& objects
-)
+) const
 {
     const word& fieldClassName =
         GeometricField<Type, faPatchField, areaMesh>::typeName;
@@ -609,7 +674,7 @@ template<class Type>
 void Foam::faFieldReconstructor::reconstructFaEdgeFields
 (
     const IOobjectList& objects
-)
+) const
 {
     const word& fieldClassName =
         GeometricField<Type, faePatchField, edgeMesh>::typeName;
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.C
index 67de45c23..e8e33a7f5 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.C
@@ -28,99 +28,102 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::processorFaMeshes::read()
+void Foam::processorFaMeshes::readMeshes()
 {
     forAll (fvMeshes_, procI)
     {
-        meshes_.set
-        (
-            procI,
-            new faMesh(fvMeshes_[procI])
-        );
-
-        pointProcAddressing_.set
-        (
-            procI,
-            new labelIOList
+        if (fvMeshes_.set(procI))
+        {
+            meshes_.set
             (
-                IOobject
-                (
-                    "pointProcAddressing",
-                    meshes_[procI].time().findInstance
-                    (
-                        meshes_[procI].meshDir(),
-                        "pointProcAddressing"
-                    ),
-                    meshes_[procI].meshSubDir,
-                    fvMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
+                procI,
+                new faMesh(fvMeshes_[procI])
+            );
 
-        edgeProcAddressing_.set
-        (
-            procI,
-            new labelIOList
-            (
-                IOobject
-                (
-                    "edgeProcAddressing",
-                    meshes_[procI].time().findInstance
-                    (
-                        meshes_[procI].meshDir(),
-                        "edgeProcAddressing"
-                    ),
-                    meshes_[procI].meshSubDir,
-                    fvMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
+            pointProcAddressing_.set
+           (
+               procI,
+               new labelIOList
+               (
+                   IOobject
+                   (
+                       "pointProcAddressing",
+                       meshes_[procI].time().findInstance
+                       (
+                           meshes_[procI].meshDir(),
+                           "pointProcAddressing"
+                       ),
+                       meshes_[procI].meshSubDir,
+                       fvMeshes_[procI],
+                       IOobject::MUST_READ,
+                       IOobject::NO_WRITE
+                   )
+               )
+           );
 
-        faceProcAddressing_.set
-        (
-            procI,
-            new labelIOList
+            edgeProcAddressing_.set
             (
-                IOobject
+                procI,
+                new labelIOList
                 (
-                    "faceProcAddressing",
-                    meshes_[procI].time().findInstance
+                    IOobject
                     (
-                        meshes_[procI].meshDir(),
-                        "faceProcAddressing"
-                    ),
-                    meshes_[procI].meshSubDir,
-                    fvMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
+                        "edgeProcAddressing",
+                        meshes_[procI].time().findInstance
+                        (
+                            meshes_[procI].meshDir(),
+                            "edgeProcAddressing"
+                        ),
+                        meshes_[procI].meshSubDir,
+                        fvMeshes_[procI],
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    )
                 )
-            )
-        );
+            );
 
-        boundaryProcAddressing_.set
-        (
-            procI,
-            new labelIOList
+            faceProcAddressing_.set
             (
-                IOobject
+                procI,
+                new labelIOList
                 (
-                    "boundaryProcAddressing",
-                    meshes_[procI].time().findInstance
+                    IOobject
                     (
-                        meshes_[procI].meshDir(),
-                        "faceProcAddressing"
-                    ),
-                    meshes_[procI].meshSubDir,
-                    fvMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
+                        "faceProcAddressing",
+                        meshes_[procI].time().findInstance
+                        (
+                            meshes_[procI].meshDir(),
+                            "faceProcAddressing"
+                        ),
+                        meshes_[procI].meshSubDir,
+                        fvMeshes_[procI],
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    )
                 )
-            )
-        );
+            );
+
+            boundaryProcAddressing_.set
+            (
+                procI,
+                new labelIOList
+                (
+                    IOobject
+                    (
+                        "boundaryProcAddressing",
+                        meshes_[procI].time().findInstance
+                        (
+                            meshes_[procI].meshDir(),
+                            "faceProcAddressing"
+                        ),
+                        meshes_[procI].meshSubDir,
+                        fvMeshes_[procI],
+                        IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                    )
+                )
+            );
+        }
     }
 }
 
@@ -129,7 +132,8 @@ void Foam::processorFaMeshes::read()
 
 Foam::processorFaMeshes::processorFaMeshes
 (
-    const PtrList<fvMesh>& processorFvMeshes
+    const PtrList<fvMesh>& processorFvMeshes,
+    const bool read
 )
 :
     fvMeshes_(processorFvMeshes),
@@ -139,120 +143,14 @@ Foam::processorFaMeshes::processorFaMeshes
     faceProcAddressing_(processorFvMeshes.size()),
     boundaryProcAddressing_(processorFvMeshes.size())
 {
-    read();
+    if (read)
+    {
+        readMeshes();
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Foam::fvMesh::readUpdateState Foam::processorFaMeshes::readUpdate()
-// {
-//     fvMesh::readUpdateState stat = fvMesh::UNCHANGED;
-
-//     forAll (databases_, procI)
-//     {
-//         // Check if any new meshes need to be read.
-//         fvMesh::readUpdateState procStat = meshes_[procI].readUpdate();
-
-//         /*
-//         if (procStat != fvMesh::UNCHANGED)
-//         {
-//             Info<< "Processor " << procI
-//                 << " at time " << databases_[procI].timeName()
-//                 << " detected mesh change " << procStat
-//                 << endl;
-//         }
-//         */
-
-//         // Combine into overall mesh change status
-//         if (stat == fvMesh::UNCHANGED)
-//         {
-//             stat = procStat;
-//         }
-//         else
-//         {
-//             if (stat != procStat)
-//             {
-//                 FatalErrorIn("processorFaMeshes::readUpdate()")
-//                     << "Processor " << procI
-//                     << " has a different polyMesh at time "
-//                     << databases_[procI].timeName()
-//                     << " compared to any previous processors." << nl
-//                     << "Please check time " << databases_[procI].timeName()
-//                     << " directories on all processors for consistent"
-//                     << " mesh files."
-//                     << exit(FatalError);
-//             }
-//         }
-//     }
-
-//     if
-//     (
-//         stat == fvMesh::TOPO_CHANGE
-//      || stat == fvMesh::TOPO_PATCH_CHANGE
-//     )
-//     {
-//         // Reread all meshes and addresssing
-//         read();
-//     }
-//     return stat;
-// }
-
-
-// void Foam::processorFaMeshes::reconstructPoints(fvMesh& mesh)
-// {
-//     // Read the field for all the processors
-//     PtrList<pointIOField> procsPoints(meshes_.size());
-
-//     forAll (meshes_, procI)
-//     {
-//         procsPoints.set
-//         (
-//             procI,
-//             new pointIOField
-//             (
-//                 IOobject
-//                 (
-//                     "points",
-//                     meshes_[procI].time().timeName(),
-//                     polyMesh::meshSubDir,
-//                     meshes_[procI],
-//                     IOobject::MUST_READ,
-//                     IOobject::NO_WRITE
-//                 )
-//             )
-//         );
-//     }
-
-//     // Create the new points
-//     vectorField newPoints(mesh.nPoints());
-
-//     forAll (meshes_, procI)
-//     {
-//         const vectorField& procPoints = procsPoints[procI];
-
-//         // Set the cell values in the reconstructed field
-
-//         const labelList& pointProcAddressingI = pointProcAddressing_[procI];
-
-//         if (pointProcAddressingI.size() != procPoints.size())
-//         {
-//             FatalErrorIn("processorFaMeshes")
-//                 << "problem :"
-//                 << " pointProcAddressingI:" << pointProcAddressingI.size()
-//                 << " procPoints:" << procPoints.size()
-//                 << abort(FatalError);
-//         }
-
-//         forAll(pointProcAddressingI, pointI)
-//         {
-//             newPoints[pointProcAddressingI[pointI]] = procPoints[pointI];
-//         }
-//     }
-
-//     mesh.movePoints(newPoints);
-//     mesh.write();
-// }
-
 
 // ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.H
index ee2943954..6f40895b6 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/processorFaMeshes.H
@@ -80,7 +80,10 @@ class processorFaMeshes
     // Private Member Functions
 
         //- Read all meshes
-        void read();
+        void readMeshes();
+
+        //- Return first valid mesh index
+        label firstValidMesh() const;
 
         //- Disallow default bitwise copy construct
         processorFaMeshes(const processorFaMeshes&);
@@ -94,34 +97,40 @@ public:
     // Constructors
 
         //- Construct from components
-        processorFaMeshes(const PtrList<fvMesh>& processorFvMeshes);
+        processorFaMeshes
+        (
+            const PtrList<fvMesh>& processorFvMeshes,
+            const bool read
+        );
 
 
     // Member Functions
 
-        //- Update the meshes based on the mesh files saved in
-        //  time directories
-//         fvMesh::readUpdateState readUpdate();
-
-        //- Reconstruct point position after motion in parallel
-//         void reconstructPoints(faMesh& mesh);
-
-        PtrList<faMesh>& meshes()
+        //- Return meshes
+        const PtrList<faMesh>& meshes() const
         {
             return meshes_;
         }
+
+        //- Return point addressing
         const PtrList<labelIOList>& pointProcAddressing() const
         {
             return pointProcAddressing_;
         }
+
+        //- Return edge addressing
         PtrList<labelIOList>& edgeProcAddressing()
         {
             return edgeProcAddressing_;
         }
+
+        //- Return face addressing
         const PtrList<labelIOList>& faceProcAddressing() const
         {
             return faceProcAddressing_;
         }
+
+        //- Return boundary addressing
         const PtrList<labelIOList>& boundaryProcAddressing() const
         {
             return boundaryProcAddressing_;
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H
index 6a6e283e9..a1482069c 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H
@@ -106,6 +106,11 @@ public:
                 {}
 
 
+            //- Destructor
+            virtual ~fvPatchFieldReconstructor()
+            {}
+            
+
             // Member functions
 
                 virtual label size() const
@@ -143,9 +148,12 @@ public:
         );
 
 
+    // Destructor - default
+
+
     // Member Functions
 
-        //- Reconstruct volume field into a given field
+        //- Reconstruct volume field data into a given field
         //  If a PtrList slot is empty, it is skipped
         template<class Type>
         void reconstructFvVolumeField
@@ -153,7 +161,7 @@ public:
             GeometricField<Type, fvPatchField, volMesh>& reconField,
             const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
                 procFields
-        );
+        ) const;
 
         //- Reconstruct volume field
         template<class Type>
@@ -161,7 +169,17 @@ public:
         reconstructFvVolumeField
         (
             const IOobject& fieldIoObject
-        );
+        ) const;
+
+        //- Reconstruct volume field data into a given field
+        //  If a PtrList slot is empty, it is skipped
+        template<class Type>
+        void reconstructFvSurfaceField
+        (
+            GeometricField<Type, fvsPatchField, surfaceMesh>& reconField,
+            const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+                procFields
+        ) const;
 
         //- Reconstruct surface field
         template<class Type>
@@ -169,7 +187,7 @@ public:
         reconstructFvSurfaceField
         (
             const IOobject& fieldIoObject
-        );
+        ) const;
 
         //- Reconstruct and write all/selected volume fields
         template<class Type>
@@ -177,7 +195,7 @@ public:
         (
             const IOobjectList& objects,
             const HashSet<word>& selectedFields
-        );
+        ) const;
 
         //- Reconstruct and write all/selected volume fields
         template<class Type>
@@ -185,7 +203,7 @@ public:
         (
             const IOobjectList& objects,
             const HashSet<word>& selectedFields
-        );
+        ) const;
 };
 
 
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C
index bc45eceb9..5d52249f1 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C
@@ -30,6 +30,9 @@ License
 #include "emptyFvPatch.H"
 #include "emptyFvPatchField.H"
 #include "emptyFvsPatchField.H"
+#include "processorFvPatch.H"
+#include "processorFvPatchField.H"
+#include "processorFvsPatchField.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -38,169 +41,97 @@ void Foam::fvFieldReconstructor::reconstructFvVolumeField
 (
     GeometricField<Type, fvPatchField, volMesh>& reconField,
     const PtrList<GeometricField<Type, fvPatchField, volMesh> >& procFields
-)
+) const
 {
     // Get references to internal and boundary field
     Field<Type>& iField = reconField.internalField();
-    GeometricField<Type, fvPatchField, volMesh>::BoundaryField& boundaryField =
-        reconField.boundaryField();
 
-    forAll (procMeshes_, procI)
+    typename GeometricField<Type, fvPatchField, volMesh>::
+        GeometricBoundaryField& bouField = reconField.boundaryField();
+
+    forAll (procFields, procI)
     {
-        const GeometricField<Type, fvPatchField, volMesh>& procField =
-            procFields[procI];
-
-        // Set the cell values in the reconstructed field
-        iField.rmap
-        (
-            procField.internalField(),
-            cellProcAddressing_[procI]
-        );
-
-        // Set the boundary patch values in the reconstructed field
-        forAll (boundaryProcAddressing_[procI], patchI)
+        if (procFields.set(procI))
         {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
+            const GeometricField<Type, fvPatchField, volMesh>& procField =
+                procFields[procI];
 
-            // Get addressing slice for this patch
-            const labelList::subList cp =
-                procMeshes_[procI].boundary()[patchI].patchSlice
-                (
-                    faceProcAddressing_[procI]
-                );
+            // Set the cell values in the reconstructed field
+            iField.rmap
+            (
+                procField.internalField(),
+                cellProcAddressing_[procI]
+            );
 
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
+            // Set the boundary patch values in the reconstructed field
+            forAll (boundaryProcAddressing_[procI], patchI)
             {
-                // Regular patch. Fast looping
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
 
-                if (!boundaryField(curBPatch))
-                {
-                    boundaryField.set
+                // Get addressing slice for this patch
+                const labelList::subList cp =
+                    procMeshes_[procI].boundary()[patchI].patchSlice
                     (
-                        curBPatch,
-                        fvPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, volMesh>::null(),
-                            fvPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
+                        faceProcAddressing_[procI]
+                    );
+
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    // Regular patch. Fast looping
+                    const label curPatchStart =
+                        mesh_.boundaryMesh()[curBPatch].start();
+
+                    labelList reverseAddressing(cp.size());
+
+                    forAll (cp, faceI)
+                    {
+                        // Subtract one to take into account offsets for
+                        // face direction.
+                        reverseAddressing[faceI] =
+                            cp[faceI] - 1 - curPatchStart;
+                    }
+
+                    bouField[curBPatch].rmap
+                    (
+                        procField.boundaryField()[patchI],
+                        reverseAddressing
                     );
                 }
-
-                const label curPatchStart =
-                    mesh_.boundaryMesh()[curBPatch].start();
-
-                labelList reverseAddressing(cp.size());
-
-                forAll (cp, faceI)
+                else
                 {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-                    reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
-                }
+                    const Field<Type>& curProcPatch =
+                        procField.boundaryField()[patchI];
 
-                boundaryField[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchI],
-                    reverseAddressing
-                );
-            }
-            else
-            {
-                const Field<Type>& curProcPatch =
-                    procField.boundaryField()[patchI];
+                    // General mapping: patch to patch or patch to/from internal
 
-                // In processor patches, there's a mix of internal faces (some
-                // of them turned) and possible cyclics. Slow loop
-                forAll (cp, faceI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-                    label curF = cp[faceI] - 1;
-
-                    // Is the face on the boundary?
-                    if (curF >= mesh_.nInternalFaces())
+                    // In processor patches, there's a mix of internal faces
+                    // (some of them turned) and possible cyclics. Slow loop
+                    forAll (cp, faceI)
                     {
-                        label curBPatch =
-                            mesh_.boundaryMesh().whichPatch(curF);
+                        // Subtract one to take into account offsets for
+                        // face direction.
+                        label curF = cp[faceI] - 1;
 
-                        if (!boundaryField(curBPatch))
+                        // Is the face on the boundary?
+                        if (curF >= mesh_.nInternalFaces())
                         {
-                            boundaryField.set
-                            (
-                                curBPatch,
-                                fvPatchField<Type>::New
-                                (
-                                    mesh_.boundary()[curBPatch].type(),
-                                    mesh_.boundary()[curBPatch],
-                                    DimensionedField<Type, volMesh>::null()
-                                )
-                            );
+                            label curBPatch =
+                                mesh_.boundaryMesh().whichPatch(curF);
+
+                            // Add the face
+                            label curPatchFace =
+                                mesh_.boundaryMesh()[curBPatch].whichFace(curF);
+
+                            bouField[curBPatch][curPatchFace] =
+                                curProcPatch[faceI];
                         }
-
-                        // add the face
-                        label curPatchFace =
-                            mesh_.boundaryMesh()
-                                [curBPatch].whichFace(curF);
-
-                        boundaryField[curBPatch][curPatchFace] =
-                            curProcPatch[faceI];
                     }
                 }
             }
         }
     }
-
-    forAll (mesh_.boundary(), patchI)
-    {
-        // add empty patches
-        if
-        (
-            isType<emptyFvPatch>(mesh_.boundary()[patchI])
-         && !boundaryField(patchI)
-        )
-        {
-            boundaryField.set
-            (
-                patchI,
-                fvPatchField<Type>::New
-                (
-                    emptyFvPatchField<Type>::typeName,
-                    mesh_.boundary()[patchI],
-                    DimensionedField<Type, volMesh>::null()
-                )
-            );
-        }
-    }
-
-
-    // Now construct and write the field
-    // setting the internalField and boundaryField
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
-    (
-        new GeometricField<Type, fvPatchField, volMesh>
-        (
-            IOobject
-            (
-                fieldIoObject.name(),
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            procFields[0].dimensions(),
-            iField,
-            patchFields
-        )
-    );
 }
 
 
@@ -209,7 +140,7 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::fvFieldReconstructor::reconstructFvVolumeField
 (
     const IOobject& fieldIoObject
-)
+) const
 {
     // Read the field for all the processors
     PtrList<GeometricField<Type, fvPatchField, volMesh> > procFields
@@ -219,26 +150,99 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
 
     forAll (procMeshes_, procI)
     {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, fvPatchField, volMesh>
+        if (procMeshes_.set(procI))
+        {
+            procFields.set
             (
-                IOobject
+                procI,
+                new GeometricField<Type, fvPatchField, volMesh>
                 (
-                    fieldIoObject.name(),
-                    procMeshes_[procI].time().timeName(),
-                    procMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
+                    IOobject
+                    (
+                        fieldIoObject.name(),
+                        procMeshes_[procI].time().timeName(),
+                        procMeshes_[procI],
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    procMeshes_[procI]
+                )
+            );
+        }
     }
 
-    // Construct the reconstructed field
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tReconField
+    // Create the patch fields
+    PtrList<fvPatchField<Type> > patchFields(mesh_.boundary().size());
+
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            // Set the boundary patch in the reconstructed field
+            forAll (boundaryProcAddressing_[procI], patchI)
+            {
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // Check if the boundary field is a regular patch field
+                if (curBPatch >= 0)
+                {
+                    // Regular patch. Clone with map
+                    if (!patchFields(curBPatch))
+                    {
+                        patchFields.set
+                        (
+                            curBPatch,
+                            fvPatchField<Type>::New
+                            (
+                                procFields[procI].boundaryField()[patchI],
+                                mesh_.boundary()[curBPatch],
+                                DimensionedField<Type, volMesh>::null(),
+                                fvPatchFieldReconstructor
+                                (
+                                    mesh_.boundary()[curBPatch].size(),
+                                    procFields[procI].boundaryField()
+                                        [patchI].size()
+                                )
+                            )
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    // Add missing patch fields
+    forAll (mesh_.boundary(), patchI)
+    {
+        if (!patchFields(patchI))
+        {
+            patchFields.set
+            (
+                patchI,
+                fvPatchField<Type>::New
+                (
+                    mesh_.boundary()[patchI].type(),
+                    mesh_.boundary()[patchI],
+                    DimensionedField<Type, volMesh>::null()
+                )
+            );
+        }
+    }
+
+    label firstValidMesh = 0;
+
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            firstValidMesh = procI;
+            break;
+        }
+    }
+
+    // Construct the reconstructed field with patches
+    tmp<GeometricField<Type, fvPatchField, volMesh> > treconField
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -251,14 +255,16 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
                 IOobject::NO_WRITE
             ),
             mesh_,
-            procFields[0].dimensions()
+            procFields[firstValidMesh].dimensions(),
+            Field<Type>(mesh_.nCells()),
+            patchFields
         )
     );
 
-    // Reconstruct fields
+    // Reconstruct field
     reconstructFvVolumeField
     (
-        tReconField(),
+        treconField(),
         procFields
     );
 
@@ -266,12 +272,130 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
 }
 
 
+template<class Type>
+void Foam::fvFieldReconstructor::reconstructFvSurfaceField
+(
+    GeometricField<Type, fvsPatchField, surfaceMesh>& reconField,
+    const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& procFields
+) const
+{
+    // Create the internalField
+    Field<Type>& iField = reconField.internalField();
+
+    typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+        GeometricBoundaryField& bouField = reconField.boundaryField();
+
+    forAll (procFields, procI)
+    {
+        if (procFields.set(procI))
+        {
+            const GeometricField<Type, fvsPatchField, surfaceMesh>& procField =
+                procFields[procI];
+
+            // Set the face values in the reconstructed field
+
+            // It is necessary to create a copy of the addressing array to
+            // take care of the face direction offset trick.
+            //
+            {
+                labelList curAddr(faceProcAddressing_[procI]);
+
+                forAll (curAddr, addrI)
+                {
+                    curAddr[addrI] -= 1;
+                }
+
+                iField.rmap
+                (
+                    procField.internalField(),
+                    curAddr
+                );
+            }
+
+            // Set the boundary patch values in the reconstructed field
+            forAll (boundaryProcAddressing_[procI], patchI)
+            {
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // Get addressing slice for this patch
+                const labelList::subList cp =
+                    procMeshes_[procI].boundary()[patchI].patchSlice
+                    (
+                        faceProcAddressing_[procI]
+                    );
+
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    // Regular patch. Fast looping
+                    const label curPatchStart =
+                        mesh_.boundaryMesh()[curBPatch].start();
+
+                    labelList reverseAddressing(cp.size());
+
+                    forAll (cp, faceI)
+                    {
+                        // Subtract one to take into account offsets for
+                        // face direction.
+                        reverseAddressing[faceI] =
+                            cp[faceI] - 1 - curPatchStart;
+                    }
+
+                    bouField[curBPatch].rmap
+                    (
+                        procField.boundaryField()[patchI],
+                        reverseAddressing
+                    );
+                }
+                else
+                {
+                    const Field<Type>& curProcPatch =
+                        procField.boundaryField()[patchI];
+
+                    // In processor patches, there's a mix of internal faces
+                    // (some of them turned) and possible cyclics. Slow loop
+                    forAll (cp, faceI)
+                    {
+                        label curF = cp[faceI] - 1;
+
+                        // Is the face turned the right side round
+                        if (curF >= 0)
+                        {
+                            // Is the face on the boundary?
+                            if (curF >= mesh_.nInternalFaces())
+                            {
+                                label curBPatch =
+                                    mesh_.boundaryMesh().whichPatch(curF);
+
+                                // Add the face
+                                label curPatchFace =
+                                    mesh_.boundaryMesh()
+                                    [curBPatch].whichFace(curF);
+
+                                bouField[curBPatch][curPatchFace] =
+                                    curProcPatch[faceI];
+                            }
+                            else
+                            {
+                                // Internal face
+                                iField[curF] = curProcPatch[faceI];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
 template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
 Foam::fvFieldReconstructor::reconstructFvSurfaceField
 (
     const IOobject& fieldIoObject
-)
+) const
 {
     // Read the field for all the processors
     PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> > procFields
@@ -281,179 +405,79 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
 
     forAll (procMeshes_, procI)
     {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, fvsPatchField, surfaceMesh>
+        if (procMeshes_.set(procI))
+        {
+            procFields.set
             (
-                IOobject
+                procI,
+                new GeometricField<Type, fvsPatchField, surfaceMesh>
                 (
-                    fieldIoObject.name(),
-                    procMeshes_[procI].time().timeName(),
-                    procMeshes_[procI],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
+                    IOobject
+                    (
+                        fieldIoObject.name(),
+                        procMeshes_[procI].time().timeName(),
+                        procMeshes_[procI],
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    procMeshes_[procI]
+                )
+            );
+        }
     }
 
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nInternalFaces());
-
     // Create the patch fields
     PtrList<fvsPatchField<Type> > patchFields(mesh_.boundary().size());
 
     forAll (procMeshes_, procI)
     {
-        const GeometricField<Type, fvsPatchField, surfaceMesh>& procField =
-            procFields[procI];
-
-        // Set the face values in the reconstructed field
-
-        // It is necessary to create a copy of the addressing array to
-        // take care of the face direction offset trick.
-        //
+        if (procMeshes_.set(procI))
         {
-            labelList curAddr(faceProcAddressing_[procI]);
-
-            forAll (curAddr, addrI)
+            // Set the boundary patch in the reconstructed field
+            forAll (boundaryProcAddressing_[procI], patchI)
             {
-                curAddr[addrI] -= 1;
-            }
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
 
-            internalField.rmap
-            (
-                procField.internalField(),
-                curAddr
-            );
-        }
-
-        // Set the boundary patch values in the reconstructed field
-        forAll (boundaryProcAddressing_[procI], patchI)
-        {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // Get addressing slice for this patch
-            const labelList::subList cp =
-                procMeshes_[procI].boundary()[patchI].patchSlice
-                (
-                    faceProcAddressing_[procI]
-                );
-
-            // Check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
-            {
-                // Regular patch. Fast looping
-                if (!patchFields(curBPatch))
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
                 {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        fvsPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, surfaceMesh>::null(),
-                            fvPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
-
-                const label curPatchStart =
-                    mesh_.boundaryMesh()[curBPatch].start();
-
-                labelList reverseAddressing(cp.size());
-
-                forAll (cp, faceI)
-                {
-                    // Subtract one to take into account offsets for
-                    // face direction.
-                    reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
-                }
-
-                patchFields[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchI],
-                    reverseAddressing
-                );
-            }
-            else
-            {
-                const Field<Type>& curProcPatch =
-                    procField.boundaryField()[patchI];
-
-                // In processor patches, there's a mix of internal faces (some
-                // of them turned) and possible cyclics. Slow loop
-                forAll (cp, faceI)
-                {
-                    label curF = cp[faceI] - 1;
-
-                    // Is the face turned the right side round
-                    if (curF >= 0)
+                    // Regular patch. Fast looping
+                    if (!patchFields(curBPatch))
                     {
-                        // Is the face on the boundary?
-                        if (curF >= mesh_.nInternalFaces())
-                        {
-                            label curBPatch =
-                                mesh_.boundaryMesh().whichPatch(curF);
-
-                            if (!patchFields(curBPatch))
-                            {
-                                patchFields.set
+                        patchFields.set
+                        (
+                            curBPatch,
+                            fvsPatchField<Type>::New
+                            (
+                                procFields[procI].boundaryField()[patchI],
+                                mesh_.boundary()[curBPatch],
+                                DimensionedField<Type, surfaceMesh>::null(),
+                                fvPatchFieldReconstructor
                                 (
-                                    curBPatch,
-                                    fvsPatchField<Type>::New
-                                    (
-                                        mesh_.boundary()[curBPatch].type(),
-                                        mesh_.boundary()[curBPatch],
-                                        DimensionedField<Type, surfaceMesh>
-                                           ::null()
-                                    )
-                                );
-                            }
-
-                            // add the face
-                            label curPatchFace =
-                                mesh_.boundaryMesh()
-                                [curBPatch].whichFace(curF);
-
-                            patchFields[curBPatch][curPatchFace] =
-                                curProcPatch[faceI];
-                        }
-                        else
-                        {
-                            // Internal face
-                            internalField[curF] = curProcPatch[faceI];
-                        }
+                                    mesh_.boundary()[curBPatch].size(),
+                                    procFields[procI].boundaryField()
+                                        [patchI].size()
+                                )
+                            )
+                        );
                     }
                 }
             }
         }
     }
 
+    // Add missing patch fields
     forAll (mesh_.boundary(), patchI)
     {
-        // add empty patches
-        if
-        (
-            isType<emptyFvPatch>(mesh_.boundary()[patchI])
-         && !patchFields(patchI)
-        )
+        if (!patchFields(patchI))
         {
             patchFields.set
             (
                 patchI,
                 fvsPatchField<Type>::New
                 (
-                    emptyFvsPatchField<Type>::typeName,
+                    mesh_.boundary()[patchI].type(),
                     mesh_.boundary()[patchI],
                     DimensionedField<Type, surfaceMesh>::null()
                 )
@@ -461,10 +485,19 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         }
     }
 
+    label firstValidMesh = 0;
 
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            firstValidMesh = procI;
+            break;
+        }
+    }
+
+    // Now construct the field with patches
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > treconField
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
@@ -477,11 +510,20 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
                 IOobject::NO_WRITE
             ),
             mesh_,
-            procFields[0].dimensions(),
-            internalField,
+            procFields[firstValidMesh].dimensions(),
+            Field<Type>(mesh_.nInternalFaces()),
             patchFields
         )
     );
+
+    // Reconstruct field
+    reconstructFvSurfaceField
+    (
+        treconField(),
+        procFields
+    );
+
+    return treconField;
 }
 
 
@@ -491,7 +533,7 @@ void Foam::fvFieldReconstructor::reconstructFvVolumeFields
 (
     const IOobjectList& objects,
     const HashSet<word>& selectedFields
-)
+) const
 {
     const word& fieldClassName =
         GeometricField<Type, fvPatchField, volMesh>::typeName;
@@ -526,7 +568,7 @@ void Foam::fvFieldReconstructor::reconstructFvSurfaceFields
 (
     const IOobjectList& objects,
     const HashSet<word>& selectedFields
-)
+) const
 {
     const word& fieldClassName =
         GeometricField<Type, fvsPatchField, surfaceMesh>::typeName;
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
index 8d66ceb4b..90556868f 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
@@ -29,67 +29,87 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+Foam::label Foam::processorMeshesReconstructor::firstValidMesh() const
+{
+    forAll (meshes_, procI)
+    {
+        if (meshes_.set(procI))
+        {
+            return procI;
+        }
+    }
+
+    FatalErrorIn("label processorMeshesReconstructor::firstValidMesh() const")
+        << "Cannot find a valid mesh in reconstruction set"
+        << abort(FatalError);
+
+    return 0;
+}
+    
+
 bool Foam::processorMeshesReconstructor::readMapping()
 {
     // Check for mapping
-    Info<< "Check for mesh mapping data for instance "
-        << meshes_[0].facesInstance() << ".  ";
+    Info<< "Check for mesh mapping data for instance.  ";
 
     bool readOk = true;
 
     forAll (meshes_, procI)
     {
-        const fvMesh& procMesh = meshes_[procI];
-
-        IOobject pointProcAddressingHeader
-        (
-            "pointProcAddressing",
-            procMesh.facesInstance(),
-            procMesh.meshSubDir,
-            procMesh,
-            IOobject::MUST_READ
-        );
-
-        IOobject faceProcAddressingHeader
-        (
-            "faceProcAddressing",
-            procMesh.facesInstance(),
-            procMesh.meshSubDir,
-            procMesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        );
-
-        IOobject cellProcAddressingHeader
-        (
-            "cellProcAddressing",
-            procMesh.facesInstance(),
-            procMesh.meshSubDir,
-            procMesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        );
-
-        IOobject boundaryProcAddressingHeader
-        (
-            "boundaryProcAddressing",
-            procMesh.facesInstance(),
-            procMesh.meshSubDir,
-            procMesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        );
-
-        if
-        (
-            !pointProcAddressingHeader.headerOk()
-         || !faceProcAddressingHeader.headerOk()
-         || !cellProcAddressingHeader.headerOk()
-         || !boundaryProcAddressingHeader.headerOk()
-        )
+        if (meshes_.set(procI))
         {
-            readOk = false;
-            break;
+            const fvMesh& procMesh = meshes_[procI];
+
+            IOobject pointProcAddressingHeader
+            (
+                "pointProcAddressing",
+                procMesh.facesInstance(),
+                procMesh.meshSubDir,
+                procMesh,
+                IOobject::MUST_READ
+            );
+
+            IOobject faceProcAddressingHeader
+            (
+                "faceProcAddressing",
+                procMesh.facesInstance(),
+                procMesh.meshSubDir,
+                procMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            );
+
+            IOobject cellProcAddressingHeader
+            (
+                "cellProcAddressing",
+                procMesh.facesInstance(),
+                procMesh.meshSubDir,
+                procMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            );
+
+            IOobject boundaryProcAddressingHeader
+            (
+                "boundaryProcAddressing",
+                procMesh.facesInstance(),
+                procMesh.meshSubDir,
+                procMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            );
+
+            if
+            (
+                !pointProcAddressingHeader.headerOk()
+             || !faceProcAddressingHeader.headerOk()
+             || !cellProcAddressingHeader.headerOk()
+             || !boundaryProcAddressingHeader.headerOk()
+            )
+            {
+                readOk = false;
+                break;
+            }
         }
     }
 
@@ -106,86 +126,93 @@ bool Foam::processorMeshesReconstructor::readMapping()
 
         forAll (meshes_, procI)
         {
-            const fvMesh& procMesh = meshes_[procI];
+            if (meshes_.set(procI))
+            {
+                const fvMesh& procMesh = meshes_[procI];
 
-            pointProcAddressing_.set
-            (
-                procI,
-                new labelIOList
+                pointProcAddressing_.set
                 (
-                    IOobject
+                    procI,
+                    new labelIOList
                     (
-                        "pointProcAddressing",
-                        procMesh.facesInstance(),
-                        procMesh.meshSubDir,
-                        procMesh,
-                        IOobject::MUST_READ,
-                        IOobject::NO_WRITE
+                        IOobject
+                        (
+                            "pointProcAddressing",
+                            procMesh.facesInstance(),
+                            procMesh.meshSubDir,
+                            procMesh,
+                            IOobject::MUST_READ,
+                            IOobject::NO_WRITE
+                        )
                     )
-                )
-            );
+                );
 
-            faceProcAddressing_.set
-            (
-                procI,
-                new labelIOList
+                faceProcAddressing_.set
                 (
-                    IOobject
+                    procI,
+                    new labelIOList
                     (
-                        "faceProcAddressing",
-                        procMesh.facesInstance(),
-                        procMesh.meshSubDir,
-                        procMesh,
-                        IOobject::MUST_READ,
-                        IOobject::NO_WRITE
+                        IOobject
+                        (
+                            "faceProcAddressing",
+                            procMesh.facesInstance(),
+                            procMesh.meshSubDir,
+                            procMesh,
+                            IOobject::MUST_READ,
+                            IOobject::NO_WRITE
+                        )
                     )
-                )
-            );
+                );
 
-            cellProcAddressing_.set
-            (
-                procI,
-                new labelIOList
+                cellProcAddressing_.set
                 (
-                    IOobject
+                    procI,
+                    new labelIOList
                     (
-                        "cellProcAddressing",
-                        procMesh.facesInstance(),
-                        procMesh.meshSubDir,
-                        procMesh,
-                        IOobject::MUST_READ,
-                        IOobject::NO_WRITE
+                        IOobject
+                        (
+                            "cellProcAddressing",
+                            procMesh.facesInstance(),
+                            procMesh.meshSubDir,
+                            procMesh,
+                            IOobject::MUST_READ,
+                            IOobject::NO_WRITE
+                        )
                     )
-                )
-            );
+                );
 
-            boundaryProcAddressing_.set
-            (
-                procI,
-                new labelIOList
+                boundaryProcAddressing_.set
                 (
-                    IOobject
+                    procI,
+                    new labelIOList
                     (
-                        "boundaryProcAddressing",
-                        procMesh.facesInstance(),
-                        procMesh.meshSubDir,
-                        procMesh,
-                        IOobject::MUST_READ,
-                        IOobject::NO_WRITE
+                        IOobject
+                        (
+                            "boundaryProcAddressing",
+                            procMesh.facesInstance(),
+                            procMesh.meshSubDir,
+                            procMesh,
+                            IOobject::MUST_READ,
+                            IOobject::NO_WRITE
+                        )
                     )
-                )
-            );
+                );
+            }
         }
 
         Info<< "Addressing from files: " << nl;
         forAll (meshes_, procI)
         {
-            Info<< "Proc " << procI
-                << " point addr: " << pointProcAddressing_[procI].size()
-                << " face addr: " << faceProcAddressing_[procI].size()
-                << " cell addr: " << cellProcAddressing_[procI].size()
-                << " boundary addr: " << boundaryProcAddressing_[procI].size()
-                << endl;
+            if (meshes_.set(procI))
+            {
+                Info<< "Proc " << procI
+                    << " point addr: " << pointProcAddressing_[procI].size()
+                    << " face addr: " << faceProcAddressing_[procI].size()
+                    << " cell addr: " << cellProcAddressing_[procI].size()
+                    << " boundary addr: "
+                    << boundaryProcAddressing_[procI].size()
+                    << endl;
+            }
         }
     }
     else
@@ -201,10 +228,13 @@ void Foam::processorMeshesReconstructor::writeAddressing()
 {
     forAll (pointProcAddressing_, procI)
     {
-        pointProcAddressing_[procI].write();
-        faceProcAddressing_[procI].write();
-        cellProcAddressing_[procI].write();
-        boundaryProcAddressing_[procI].write();
+        if (meshes_.set(procI))
+        {
+            pointProcAddressing_[procI].write();
+            faceProcAddressing_[procI].write();
+            cellProcAddressing_[procI].write();
+            boundaryProcAddressing_[procI].write();
+        }
     }
 }
 
@@ -217,6 +247,21 @@ Foam::processorMeshesReconstructor::neighbourProcPatch
 {
     const label masterProcID = procPatch.neighbProcNo();
 
+    if (!meshes_.set(masterProcID))
+    {
+        FatalErrorIn
+        (
+            "const processorPolyPatch&\n"
+            "processorMeshesReconstructor::neighbourProcPatch\n"
+            "(\n"
+            "    const processorPolyPatch& procPatch\n"
+            ") const"
+        )   << "Cannot find processor patch pair ("
+            << procPatch.myProcNo() << " "
+            << procPatch.neighbProcNo() << ") for merging"
+            << abort(FatalError);
+    }
+
     const polyMesh& masterMesh = meshes_[masterProcID];
 
     bool found = false;
@@ -278,27 +323,31 @@ void Foam::processorMeshesReconstructor::reconstructPoints(fvMesh& mesh) const
 
     forAll (meshes_, procI)
     {
-        // Reconstruct only live points.  HJ, 7/Mar/2011
-        const vectorField& procPoints = meshes_[procI].points();
-
-        // Set the cell values in the reconstructed field
-
-        const labelList& pointProcAddressingI = pointProcAddressing()[procI];
-
-        if (pointProcAddressingI.size() != procPoints.size())
+        if (meshes_.set(procI))
         {
-            FatalErrorIn("processorMeshes")
-                << "problem :"
-                << " pointProcAddressingI:" << pointProcAddressingI.size()
-                << " procPoints:" << procPoints.size()
-                << abort(FatalError);
-        }
+            // Reconstruct only live points.  HJ, 7/Mar/2011
+            const vectorField& procPoints = meshes_[procI].points();
 
-        // Only live points carry reconstruction data.  Reconsider
-        // HJ, 6/Sep/2009
-        for (label pointI = 0; pointI < meshes_[procI].nPoints(); pointI++)
-        {
-            newPoints[pointProcAddressingI[pointI]] = procPoints[pointI];
+            // Set the cell values in the reconstructed field
+
+            const labelList& pointProcAddressingI =
+                pointProcAddressing()[procI];
+
+            if (pointProcAddressingI.size() != procPoints.size())
+            {
+                FatalErrorIn("processorMeshes")
+                    << "problem :"
+                    << " pointProcAddressingI: " << pointProcAddressingI.size()
+                    << " procPoints:" << procPoints.size()
+                    << abort(FatalError);
+            }
+
+            // Only live points carry reconstruction data.  Reconsider
+            // HJ, 6/Sep/2009
+            for (label pointI = 0; pointI < meshes_[procI].nPoints(); pointI++)
+            {
+                newPoints[pointProcAddressingI[pointI]] = procPoints[pointI];
+            }
         }
     }
 
@@ -311,6 +360,7 @@ Foam::autoPtr<Foam::fvMesh>
 Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 {
     // Check for read
+
     if (readMapping())
     {
         // Mapping data present and read.  Reconstructed mesh may be
@@ -322,7 +372,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
             (
                 "points",
                 db.timeName(),
-                meshes_[0].meshSubDir,
+                meshes_[firstValidMesh()].meshSubDir,
                 db,
                 IOobject::MUST_READ
             );
@@ -365,7 +415,8 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     // Grab names and types of patches, excluding processor patches
     // Order must be identical on all processors
     {
-        const polyBoundaryMesh& proc0Boundary = meshes_[0].boundaryMesh();
+        const polyBoundaryMesh& proc0Boundary =
+            meshes_[firstValidMesh()].boundaryMesh();
 
         reconPatchNames.setSize(proc0Boundary.size());
         reconPatchTypes.setSize(proc0Boundary.size());
@@ -394,40 +445,44 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
     forAll (meshes_, procI)
     {
-        // Count total number of points and faces
-        nReconPoints += meshes_[procI].nPoints();
-        nReconFaces += meshes_[procI].allFaces().size();
-        nReconCells += meshes_[procI].nCells();
-
-        const polyBoundaryMesh& procPatches = meshes_[procI].boundaryMesh();
-
-        nReconPatches = 0;
-
-        forAll (procPatches, patchI)
+        if (meshes_.set(procI))
         {
-            if (!isA<processorPolyPatch>(procPatches[patchI]))
-            {
-                // Check patch name and type
-                if
-                (
-                    procPatches[patchI].name()
-                 != reconPatchNames[nReconPatches]
-                 || procPatches[patchI].type()
-                 != reconPatchTypes[nReconPatches]
-                )
-                {
-                    FatalErrorIn
-                    (
-                        "autoPtr<fvMesh> processorMeshesReconstructor::"
-                        "reconstructMesh(const Time& db)"
-                    )   << "Patch names, types or ordering does not match "
-                        << "across processors"
-                        << abort(FatalError);
-                }
+            // Count total number of points and faces
+            nReconPoints += meshes_[procI].nPoints();
+            nReconFaces += meshes_[procI].allFaces().size();
+            nReconCells += meshes_[procI].nCells();
 
-                // Record number of faces in patch
-                reconPatchSizes[nReconPatches] += procPatches[patchI].size();
-                nReconPatches++;
+            const polyBoundaryMesh& procPatches = meshes_[procI].boundaryMesh();
+
+            nReconPatches = 0;
+
+            forAll (procPatches, patchI)
+            {
+                if (!isA<processorPolyPatch>(procPatches[patchI]))
+                {
+                    // Check patch name and type
+                    if
+                    (
+                        procPatches[patchI].name()
+                     != reconPatchNames[nReconPatches]
+                     || procPatches[patchI].type()
+                     != reconPatchTypes[nReconPatches]
+                    )
+                    {
+                        FatalErrorIn
+                        (
+                            "autoPtr<fvMesh> processorMeshesReconstructor::"
+                            "reconstructMesh(const Time& db)"
+                        )   << "Patch names, types or ordering does not match "
+                            << "across processors"
+                            << abort(FatalError);
+                    }
+
+                    // Record number of faces in patch
+                    reconPatchSizes[nReconPatches] +=
+                        procPatches[patchI].size();
+                    nReconPatches++;
+                }
             }
         }
     }
@@ -465,79 +520,82 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     // Allocate addressing arrays on all meshes
     forAll (meshes_, procI)
     {
-        const fvMesh& procMesh = meshes_[procI];
+        if (meshes_.set(procI))
+        {
+            const fvMesh& procMesh = meshes_[procI];
 
-        pointProcAddressing_.set
-        (
-            procI,
-            new labelIOList
+            pointProcAddressing_.set
             (
-                IOobject
+                procI,
+                new labelIOList
                 (
-                    "pointProcAddressing",
-                    procMesh.facesInstance(),
-                    procMesh.meshSubDir,
-                    procMesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                labelList(procMesh.nPoints(), -1)
-            )
-        );
+                    IOobject
+                    (
+                        "pointProcAddressing",
+                        procMesh.facesInstance(),
+                        procMesh.meshSubDir,
+                        procMesh,
+                        IOobject::NO_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    labelList(procMesh.nPoints(), -1)
+                )
+            );
 
-        faceProcAddressing_.set
-        (
-            procI,
-            new labelIOList
+            faceProcAddressing_.set
             (
-                IOobject
+                procI,
+                new labelIOList
                 (
-                    "faceProcAddressing",
-                    procMesh.facesInstance(),
-                    procMesh.meshSubDir,
-                    procMesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                labelList(procMesh.allFaces().size(), -1)
-            )
-        );
+                    IOobject
+                    (
+                        "faceProcAddressing",
+                        procMesh.facesInstance(),
+                        procMesh.meshSubDir,
+                        procMesh,
+                        IOobject::NO_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    labelList(procMesh.allFaces().size(), -1)
+                )
+            );
 
-        cellProcAddressing_.set
-        (
-            procI,
-            new labelIOList
+            cellProcAddressing_.set
             (
-                IOobject
+                procI,
+                new labelIOList
                 (
-                    "cellProcAddressing",
-                    procMesh.facesInstance(),
-                    procMesh.meshSubDir,
-                    procMesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                labelList(procMesh.nCells(), -1)
-            )
-        );
+                    IOobject
+                    (
+                        "cellProcAddressing",
+                        procMesh.facesInstance(),
+                        procMesh.meshSubDir,
+                        procMesh,
+                        IOobject::NO_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    labelList(procMesh.nCells(), -1)
+                )
+            );
 
-        boundaryProcAddressing_.set
-        (
-            procI,
-            new labelIOList
+            boundaryProcAddressing_.set
             (
-                IOobject
+                procI,
+                new labelIOList
                 (
-                    "boundaryProcAddressing",
-                    procMesh.facesInstance(),
-                    procMesh.meshSubDir,
-                    procMesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                labelList(procMesh.boundaryMesh().size(), -1)
-            )
-        );
+                    IOobject
+                    (
+                        "boundaryProcAddressing",
+                        procMesh.facesInstance(),
+                        procMesh.meshSubDir,
+                        procMesh,
+                        IOobject::NO_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    labelList(procMesh.boundaryMesh().size(), -1)
+                )
+            );
+        }
     }
 
     // Reset the counters
@@ -549,15 +607,17 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     // Prepare handling for globally shared points
     labelList globalPointMapping;
 
-    // Dump mesh zero without checking
+    // Dump first valid mesh without checking
     {
-        cellOffset[0] = 0;
+        const label fvmId = firstValidMesh();
+        
+        cellOffset[fvmId] = 0;
 
-        const polyMesh& curMesh = meshes_[0];
-        labelList& ppAddr = pointProcAddressing_[0];
-        labelList& fpAddr = faceProcAddressing_[0];
-        labelList& cpAddr = cellProcAddressing_[0];
-        labelList& bpAddr = boundaryProcAddressing_[0];
+        const polyMesh& curMesh = meshes_[fvmId];
+        labelList& ppAddr = pointProcAddressing_[fvmId];
+        labelList& fpAddr = faceProcAddressing_[fvmId];
+        labelList& cpAddr = cellProcAddressing_[fvmId];
+        labelList& bpAddr = boundaryProcAddressing_[fvmId];
 
         // Prepare handling for global mesh data: set to -1
         globalPointMapping.setSize(curMesh.globalData().nGlobalPoints());
@@ -576,6 +636,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         }
 
         // Collect globally shared point labels
+        // CHANGE HERE!!!
         const labelList& curSpl = curMesh.globalData().sharedPointLabels();
 
         forAll (curSpl, splI)
@@ -597,8 +658,8 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
             inplaceRenumber(ppAddr, newFace);
 
             reconFaces[nReconFaces] = newFace;
-            reconOwner[nReconFaces] = curOwner[faceI];//+cellOffset[0];
-            reconNeighbour[nReconFaces] = curNeighbour[faceI];//+cellOffset[0];
+            reconOwner[nReconFaces] = curOwner[faceI];//+cellOffset[firstValidMesh()];
+            reconNeighbour[nReconFaces] = curNeighbour[faceI];//+cellOffset[firstValidMesh()];
 
             // Face-processor addressing uses offset of 1 and a turning index
             // If the label is negative, it means the global face points
@@ -633,7 +694,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                     reconFaces[nReconFaces] = newFace;
 
                     fpAddr[faceI] = nReconFaces + 1;
-                    reconOwner[nReconFaces] = curOwner[faceI];//+cellOffset[0];
+                    reconOwner[nReconFaces] = curOwner[faceI];//+cellOffset[firstValidMesh()];
 
                     // For partially completed neighbour, set nbr to -2
                     // for easier debugging
@@ -663,7 +724,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                     inplaceRenumber(ppAddr, newFace);
 
                     curRpFaces[nRpf] = newFace;
-                    curRpfOwner[nRpf] = curOwner[faceI];//+cellOffset[0];
+                    curRpfOwner[nRpf] = curOwner[faceI];//+cellOffset[firstValidMesh()];
 
                     // Temporarily record position of face in the patch.
                     // Offset for nInternalFaces will be added in the end
@@ -679,7 +740,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         // Cell-processor addressing
         forAll (cpAddr, cellI)
         {
-            cpAddr[cellI] = cellI; // + cellOffset[0];
+            cpAddr[cellI] = cellI; // + cellOffset[firstValidMesh()];
         }
 
         // Sort out boundary addressing: i for live patches, -1 for processor
@@ -701,181 +762,257 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         cellOffset[procI] =
             cellOffset[procI - 1] + meshes_[procI - 1].nCells();
 
-        const polyMesh& curMesh = meshes_[procI];
-        const polyBoundaryMesh& procPatches = curMesh.boundaryMesh();
-
-        labelList& ppAddr = pointProcAddressing_[procI];
-        labelList& fpAddr = faceProcAddressing_[procI];
-        labelList& cpAddr = cellProcAddressing_[procI];
-        labelList& bpAddr = boundaryProcAddressing_[procI];
-
-        // Point mapping
-
-        // Reconstruct only live points.  HJ, 7/Mar/2011
-        const pointField& curPoints = curMesh.points();
-
-        // Set ppAddr to -1, to use as point usage indicators
-        ppAddr.setSize(curPoints.size());
-        ppAddr = -1;
-
-        // Find points already added via processor patches and mark them
-        // in ppAddr
-
-        // Collect point-processor addressing for points on processor patches
-
-        // Go through all patches.  For neighbour patches, access
-        // owner addressing and dump into ppAddr
-        forAll (procPatches, patchI)
+        if (meshes_.set(procI))
         {
-            if (isA<processorPolyPatch>(procPatches[patchI]))
+            const polyMesh& curMesh = meshes_[procI];
+            const polyBoundaryMesh& procPatches = curMesh.boundaryMesh();
+
+            labelList& ppAddr = pointProcAddressing_[procI];
+            labelList& fpAddr = faceProcAddressing_[procI];
+            labelList& cpAddr = cellProcAddressing_[procI];
+            labelList& bpAddr = boundaryProcAddressing_[procI];
+
+            // Point mapping
+
+            // Reconstruct only live points.  HJ, 7/Mar/2011
+            const pointField& curPoints = curMesh.points();
+
+            // Set ppAddr to -1, to use as point usage indicators
+            ppAddr.setSize(curPoints.size());
+            ppAddr = -1;
+
+            // Find points already added via processor patches and mark them
+            // in ppAddr
+
+            // Collect point-processor addressing for points on processor patches
+
+            // Go through all patches.  For neighbour patches, access
+            // owner addressing and dump into ppAddr
+            forAll (procPatches, patchI)
             {
-                // Processor patch: faces become internal faces
-                const processorPolyPatch& procPatch =
-                    refCast<const processorPolyPatch>(procPatches[patchI]);
-
-                // If patch is a neighbour, its master has already inserted
-                // the points
-                if (procPatch.slave())
+                if (isA<processorPolyPatch>(procPatches[patchI]))
                 {
-                    const label masterProcID = procPatch.neighbProcNo();
+                    // Processor patch: faces become internal faces
+                    const processorPolyPatch& procPatch =
+                        refCast<const processorPolyPatch>(procPatches[patchI]);
 
-                    // Get the neighbour side patch
-                    const processorPolyPatch& masterProcPatch =
-                        neighbourProcPatch(procPatch);
-
-                    // Find the addressing of the master side
-                    const labelList& masterPpAddr =
-                        pointProcAddressing_[masterProcID];
-
-                    // Assemble neighbour mesh point addressing in matching
-                    // order by reversing processor patch faces
-                    faceList reversedFaces(procPatch.size());
-
-                    forAll (reversedFaces, faceI)
+                    // If patch is a neighbour, its master has already inserted
+                    // the points
+                    if (procPatch.slave())
                     {
-                        reversedFaces[faceI] = procPatch[faceI].reverseFace();
-                    }
+                        const label masterProcID = procPatch.neighbProcNo();
 
-                    primitiveFacePatch reversedPatch
-                    (
-                        reversedFaces,
-                        procPatch.points()
-                    );
+                        // Get the neighbour side patch
+                        const processorPolyPatch& masterProcPatch =
+                            neighbourProcPatch(procPatch);
 
-                    // Insert addressing from master side into
-                    // local point addressing.  Each face of reversed patch
-                    // now matches the master face.
-                    // Note: this is done by visiting faces, since meshPoints
-                    // are ordered in increasing order.  HJ, 10/Mar/2011
+                        // Find the addressing of the master side
+                        const labelList& masterPpAddr =
+                            pointProcAddressing_[masterProcID];
 
-                    forAll (reversedFaces, faceI)
-                    {
-                        // Current reverse face
-                        const face& curRF = reversedFaces[faceI];
+                        // Assemble neighbour mesh point addressing in matching
+                        // order by reversing processor patch faces
+                        faceList reversedFaces(procPatch.size());
 
-                        // Current master face
-                        const face& curMF = masterProcPatch[faceI];
-
-                        forAll (curRF, pointI)
+                        forAll (reversedFaces, faceI)
                         {
-                            // Mapping is established
-                            ppAddr[curRF[pointI]] =
-                                masterPpAddr[curMF[pointI]];
+                            reversedFaces[faceI] = procPatch[faceI].reverseFace();
                         }
-                    }
-                } // End of "is neighbour"
-            } // End of "is processor"
-        }
 
-        // Dump unmarked points into the global point list
-        label nMergedPoints = 0;
+                        primitiveFacePatch reversedPatch
+                        (
+                            reversedFaces,
+                            procPatch.points()
+                        );
 
-        forAll (curPoints, pointI)
-        {
-            if (ppAddr[pointI] == -1)
-            {
-                // Unmerged point
-                reconPoints[nReconPoints] = curPoints[pointI];
-                ppAddr[pointI] = nReconPoints;
-                nReconPoints++;
+                        // Insert addressing from master side into
+                        // local point addressing.  Each face of reversed patch
+                        // now matches the master face.
+                        // Note: this is done by visiting faces, since meshPoints
+                        // are ordered in increasing order.  HJ, 10/Mar/2011
+
+                        forAll (reversedFaces, faceI)
+                        {
+                            // Current reverse face
+                            const face& curRF = reversedFaces[faceI];
+
+                            // Current master face
+                            const face& curMF = masterProcPatch[faceI];
+
+                            forAll (curRF, pointI)
+                            {
+                                // Mapping is established
+                                ppAddr[curRF[pointI]] =
+                                    masterPpAddr[curMF[pointI]];
+                            }
+                        }
+                    } // End of "is neighbour"
+                } // End of "is processor"
             }
-            else
+
+            // Dump unmarked points into the global point list
+            label nMergedPoints = 0;
+
+            forAll (curPoints, pointI)
             {
-                nMergedPoints++;
-            }
-        }
-
-        Info<< "Processor " << procI << " merged " << nMergedPoints
-            << " points out of local " << curPoints.size()
-            << " and total " << nReconPoints << endl;
-
-        // Dump all internal faces into the list
-        const faceList& curFaces = curMesh.allFaces();
-        const labelList& curOwner = curMesh.faceOwner();
-        const labelList& curNeighbour = curMesh.faceNeighbour();
-        fpAddr.setSize(curFaces.size());
-
-        // Collect globally shared point labels
-        const labelList& curSpl = curMesh.globalData().sharedPointLabels();
-
-        forAll (curSpl, splI)
-        {
-            // From other processors, check if point is already marked
-            // If not, mark it; otherwise compare (and correct?) with local
-            // mark
-            if (globalPointMapping[curSpl[splI]] < 0)
-            {
-                globalPointMapping[curSpl[splI]] = ppAddr[curSpl[splI]];
-            }
-            else
-            {
-                // Compare.  Is this needed - should always be OK.
-                if (globalPointMapping[curSpl[splI]] != ppAddr[curSpl[splI]])
+                if (ppAddr[pointI] == -1)
                 {
-                    WarningIn
-                    (
-                        "autoPtr<fvMesh> "
-                        "processorMeshesReconstructor::"
-                        "reconstructMesh(const Time& db)"
-                    )   << "Loss of sync???"
-                        << abort(FatalError);
+                    // Unmerged point
+                    reconPoints[nReconPoints] = curPoints[pointI];
+                    ppAddr[pointI] = nReconPoints;
+                    nReconPoints++;
+                }
+                else
+                {
+                    nMergedPoints++;
                 }
             }
-        }
 
+            Info<< "Processor " << procI << " merged " << nMergedPoints
+                << " points out of local " << curPoints.size()
+                << " and total " << nReconPoints << endl;
 
-        for (label faceI = 0; faceI < curMesh.nInternalFaces(); faceI++)
-        {
-            // Renumber face in new vertices
-            face newFace = curFaces[faceI];
-            inplaceRenumber(ppAddr, newFace);
+            // Dump all internal faces into the list
+            const faceList& curFaces = curMesh.allFaces();
+            const labelList& curOwner = curMesh.faceOwner();
+            const labelList& curNeighbour = curMesh.faceNeighbour();
+            fpAddr.setSize(curFaces.size());
 
-            reconFaces[nReconFaces] = newFace;
-            reconOwner[nReconFaces] = curOwner[faceI] + cellOffset[procI];
-            reconNeighbour[nReconFaces] = curNeighbour[faceI]
-                + cellOffset[procI];
-            fpAddr[faceI] = nReconFaces + 1;
-            nReconFaces++;
-        }
+            // Collect globally shared point labels
+            const labelList& curSpl = curMesh.globalData().sharedPointLabels();
 
-        // Go through all patches.  For regular patches
-        // dump the faces into patch lists
-        forAll (procPatches, patchI)
-        {
-            if (isA<processorPolyPatch>(procPatches[patchI]))
+            forAll (curSpl, splI)
             {
-                // Processor patch: faces become internal faces
-                const processorPolyPatch& procPatch =
-                    refCast<const processorPolyPatch>(procPatches[patchI]);
-
-                // If patch is a master, drop the faces and fill the
-                // owner side addressing
-                if (procPatch.master())
+                // From other processors, check if point is already marked
+                // If not, mark it; otherwise compare (and correct?) with local
+                // mark
+                if (globalPointMapping[curSpl[splI]] < 0)
                 {
+                    globalPointMapping[curSpl[splI]] = ppAddr[curSpl[splI]];
+                }
+                else
+                {
+                    // Compare.  Is this needed - should always be OK.
+                    if (globalPointMapping[curSpl[splI]] != ppAddr[curSpl[splI]])
+                    {
+                        WarningIn
+                        (
+                            "autoPtr<fvMesh> "
+                            "processorMeshesReconstructor::"
+                            "reconstructMesh(const Time& db)"
+                        )   << "Loss of sync???"
+                            << abort(FatalError);
+                    }
+                }
+            }
+
+            for (label faceI = 0; faceI < curMesh.nInternalFaces(); faceI++)
+            {
+                // Renumber face in new vertices
+                face newFace = curFaces[faceI];
+                inplaceRenumber(ppAddr, newFace);
+
+                reconFaces[nReconFaces] = newFace;
+                reconOwner[nReconFaces] = curOwner[faceI] + cellOffset[procI];
+                reconNeighbour[nReconFaces] = curNeighbour[faceI]
+                    + cellOffset[procI];
+                fpAddr[faceI] = nReconFaces + 1;
+                nReconFaces++;
+            }
+
+            // Go through all patches.  For regular patches
+            // dump the faces into patch lists
+            forAll (procPatches, patchI)
+            {
+                if (isA<processorPolyPatch>(procPatches[patchI]))
+                {
+                    // Processor patch: faces become internal faces
+                    const processorPolyPatch& procPatch =
+                        refCast<const processorPolyPatch>(procPatches[patchI]);
+
+                    // If patch is a master, drop the faces and fill the
+                    // owner side addressing
+                    if (procPatch.master())
+                    {
+                        for
+                        (
+                            label faceI = procPatch.start();
+                            faceI < procPatch.start() + procPatch.size();
+                            faceI++
+                        )
+                        {
+                            // Renumber face in new vertices
+                            face newFace = curFaces[faceI];
+                            inplaceRenumber(ppAddr, newFace);
+
+                            reconFaces[nReconFaces] = newFace;
+                            fpAddr[faceI] = nReconFaces + 1;
+                            reconOwner[nReconFaces] = curOwner[faceI]
+                                + cellOffset[procI];
+
+                            // For partially completed neighbour, set nbr to -2
+                            // for easier debugging
+                            reconNeighbour[nReconFaces] = -2;
+
+                            nReconFaces++;
+                        }
+                    }
+                    else
+                    {
+                        // Fill the addressing for the neighbour side
+
+                        const label masterProcID = procPatch.neighbProcNo();
+
+                        // Get local face-cell addressing: it will become neighbour
+                        // addressing for the already inserted faces
+                        const labelList procFaceCells = procPatch.faceCells();
+
+                        // Get the neighbour side patch
+                        const processorPolyPatch& masterProcPatch =
+                            neighbourProcPatch(procPatch);
+
+                        // Find the addressing of the master side
+                        // and insert the neighbour with offset
+
+                        const labelList& masterFaceAddr =
+                            faceProcAddressing_[masterProcID];
+
+                        for
+                        (
+                            label faceI = procPatch.start();
+                            faceI < procPatch.start() + procPatch.size();
+                            faceI++
+                        )
+                        {
+                            label faceInPatch = faceI - procPatch.start();
+
+                            // Calculate master index
+                            label masterIndex = masterProcPatch.start()
+                                + faceInPatch;
+
+                            label masterFp = masterFaceAddr[masterIndex] - 1;
+
+                            // Record face-cells for the neighbour
+                            fpAddr[faceI] = -masterFaceAddr[masterIndex];
+
+                            reconNeighbour[masterFp] =
+                                procFaceCells[faceInPatch] + cellOffset[procI];
+                        }
+                    }
+                }
+                else
+                {
+                    // Regular patch: dump faces into patch face list
+                    faceList& curRpFaces = reconPatchFaces[patchI];
+                    labelList& curRpfOwner = reconPatchOwner[patchI];
+                    label& nRpf = reconPatchSizes[patchI];
+
+                    const polyPatch& curPatch = procPatches[patchI];
+
                     for
                     (
-                        label faceI = procPatch.start();
-                        faceI < procPatch.start() + procPatch.size();
+                        label faceI = curPatch.start();
+                        faceI < curPatch.start() + curPatch.size();
                         faceI++
                     )
                     {
@@ -883,108 +1020,33 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                         face newFace = curFaces[faceI];
                         inplaceRenumber(ppAddr, newFace);
 
-                        reconFaces[nReconFaces] = newFace;
-                        fpAddr[faceI] = nReconFaces + 1;
-                        reconOwner[nReconFaces] = curOwner[faceI]
-                            + cellOffset[procI];
+                        curRpFaces[nRpf] = newFace;
+                        curRpfOwner[nRpf] = curOwner[faceI] + cellOffset[procI];
 
-                        // For partially completed neighbour, set nbr to -2
-                        // for easier debugging
-                        reconNeighbour[nReconFaces] = -2;
-
-                        nReconFaces++;
-                    }
-                }
-                else
-                {
-                    // Fill the addressing for the neighbour side
-
-                    const label masterProcID = procPatch.neighbProcNo();
-
-                    // Get local face-cell addressing: it will become neighbour
-                    // addressing for the already inserted faces
-                    const labelList procFaceCells = procPatch.faceCells();
-
-                    // Get the neighbour side patch
-                    const processorPolyPatch& masterProcPatch =
-                        neighbourProcPatch(procPatch);
-
-                    // Find the addressing of the master side
-                    // and insert the neighbour with offset
-
-                    const labelList& masterFaceAddr =
-                        faceProcAddressing_[masterProcID];
-
-                    for
-                    (
-                        label faceI = procPatch.start();
-                        faceI < procPatch.start() + procPatch.size();
-                        faceI++
-                    )
-                    {
-                        label faceInPatch = faceI - procPatch.start();
-
-                        // Calculate master index
-                        label masterIndex = masterProcPatch.start()
-                            + faceInPatch;
-
-                        label masterFp = masterFaceAddr[masterIndex] - 1;
-
-                        // Record face-cells for the neighbour
-                        fpAddr[faceI] = -masterFaceAddr[masterIndex];
-
-                        reconNeighbour[masterFp] =
-                            procFaceCells[faceInPatch] + cellOffset[procI];
+                        // Temporarily record position of face in the patch.
+                        // Offset for nInternalFaces will be added in the end
+                        // when the complete list of faces is assembled
+                        // HJ, 16/Feb/2011
+                        fpAddr[faceI] = nRpf + 1;
+                        nRpf++;
                     }
                 }
             }
-            else
+
+            // Cell-processor addressing
+            forAll (cpAddr, cellI)
             {
-                // Regular patch: dump faces into patch face list
-                faceList& curRpFaces = reconPatchFaces[patchI];
-                labelList& curRpfOwner = reconPatchOwner[patchI];
-                label& nRpf = reconPatchSizes[patchI];
-
-                const polyPatch& curPatch = procPatches[patchI];
-
-                for
-                (
-                    label faceI = curPatch.start();
-                    faceI < curPatch.start() + curPatch.size();
-                    faceI++
-                )
-                {
-                    // Renumber face in new vertices
-                    face newFace = curFaces[faceI];
-                    inplaceRenumber(ppAddr, newFace);
-
-                    curRpFaces[nRpf] = newFace;
-                    curRpfOwner[nRpf] = curOwner[faceI] + cellOffset[procI];
-
-                    // Temporarily record position of face in the patch.
-                    // Offset for nInternalFaces will be added in the end
-                    // when the complete list of faces is assembled
-                    // HJ, 16/Feb/2011
-                    fpAddr[faceI] = nRpf + 1;
-                    nRpf++;
-
-                }
+                cpAddr[cellI] = cellI + cellOffset[procI];
             }
-        }
 
-        // Cell-processor addressing
-        forAll (cpAddr, cellI)
-        {
-            cpAddr[cellI] = cellI + cellOffset[procI];
-        }
+            // Sort out boundary addressing: i for live patches, -1 for processor
+            bpAddr = -1;
 
-        // Sort out boundary addressing: i for live patches, -1 for processor
-        bpAddr = -1;
-
-        // Note: loop over mapped patches
-        forAll (reconPatchSizes, patchI)
-        {
-            bpAddr[patchI] = patchI;
+            // Note: loop over mapped patches
+            forAll (reconPatchSizes, patchI)
+            {
+                bpAddr[patchI] = patchI;
+            }
         }
     }
 
@@ -1038,38 +1100,41 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     // now that the number of internal faces is known
     forAll (meshes_, procI)
     {
-        // Get processor mesh and boundary
-        const polyMesh& curMesh = meshes_[procI];
-        const polyBoundaryMesh& procPatches = curMesh.boundaryMesh();
-
-        // Get face-processor addressing for corrent prorcessor
-        labelList& fpAddr = faceProcAddressing_[procI];
-
-        const labelList& bpAddr = boundaryProcAddressing_[procI];
-
-        forAll (procPatches, patchI)
+        if (meshes_.set(procI))
         {
-            if (!isA<processorPolyPatch>(procPatches[patchI]))
+            // Get processor mesh and boundary
+            const polyMesh& curMesh = meshes_[procI];
+            const polyBoundaryMesh& procPatches = curMesh.boundaryMesh();
+
+            // Get face-processor addressing for corrent prorcessor
+            labelList& fpAddr = faceProcAddressing_[procI];
+
+            const labelList& bpAddr = boundaryProcAddressing_[procI];
+
+            forAll (procPatches, patchI)
             {
-                // Get master processor patch
-                const label reconPatchID = bpAddr[patchI];
-
-                // Skip processor patches: bpAddr = -1
-                if (reconPatchID > -1)
+                if (!isA<processorPolyPatch>(procPatches[patchI]))
                 {
-                    const label reconStart = reconPatchStarts[reconPatchID];
+                    // Get master processor patch
+                    const label reconPatchID = bpAddr[patchI];
 
-                    const polyPatch& curPatch = procPatches[patchI];
-
-                    for
-                    (
-                        label faceI = curPatch.start();
-                        faceI < curPatch.start() + curPatch.size();
-                        faceI++
-                    )
+                    // Skip processor patches: bpAddr = -1
+                    if (reconPatchID > -1)
                     {
-                        // Add patch start
-                        fpAddr[faceI] += reconStart;
+                        const label reconStart = reconPatchStarts[reconPatchID];
+
+                        const polyPatch& curPatch = procPatches[patchI];
+
+                        for
+                        (
+                            label faceI = curPatch.start();
+                            faceI < curPatch.start() + curPatch.size();
+                            faceI++
+                        )
+                        {
+                            // Add patch start
+                            fpAddr[faceI] += reconStart;
+                        }
                     }
                 }
             }
@@ -1099,7 +1164,8 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     List<polyPatch*> reconPatches(nReconPatches);
 
     {
-        const polyBoundaryMesh& procPatches = meshes_[0].boundaryMesh();
+        const polyBoundaryMesh& procPatches =
+            meshes_[firstValidMesh()].boundaryMesh();
 
         reconPatches.setSize(reconPatchSizes.size());
 
@@ -1124,12 +1190,15 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     Info<< "Reconstructed addressing: " << nl;
     forAll (meshes_, procI)
     {
-        Info<< "Proc " << procI
-            << " point addr: " << pointProcAddressing_[procI].size()
-            << " face addr: " << faceProcAddressing_[procI].size()
-            << " cell addr: " << cellProcAddressing_[procI].size()
-            << " boundary addr: " << boundaryProcAddressing_[procI].size()
-            << endl;
+        if (meshes_.set(procI))
+        {
+            Info<< "Proc " << procI
+                << " point addr: " << pointProcAddressing_[procI].size()
+                << " face addr: " << faceProcAddressing_[procI].size()
+                << " cell addr: " << cellProcAddressing_[procI].size()
+                << " boundary addr: " << boundaryProcAddressing_[procI].size()
+                << endl;
+        }
     }
 
     return globalMeshPtr;
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C
index 6d7fd8d41..7a2f06172 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C
@@ -67,7 +67,8 @@ void Foam::processorMeshesReconstructor::clearMaps()
 Foam::processorMeshesReconstructor::processorMeshesReconstructor
 (
     PtrList<Time>& databases,
-    const word& meshName
+    const word& meshName,
+    const bool read
 )
 :
     databases_(databases),
@@ -78,7 +79,10 @@ Foam::processorMeshesReconstructor::processorMeshesReconstructor
     cellProcAddressing_(),
     boundaryProcAddressing_()
 {
-    readMeshes();
+    if (read)
+    {
+        readMeshes();
+    }
 }
 
 
@@ -91,27 +95,31 @@ Foam::processorMeshesReconstructor::readUpdate()
 
     forAll (databases_, procI)
     {
-        // Check if any new meshes need to be read.
-        polyMesh::readUpdateState procStat = meshes_[procI].readUpdate();
+        // Only do action if database has been set
+        if (databases_.set(procI))
+        {
+            // Check if any new meshes need to be read.
+            polyMesh::readUpdateState procStat = meshes_[procI].readUpdate();
 
-        // Combine into overall mesh change status
-        if (stat == polyMesh::UNCHANGED)
-        {
-            stat = procStat;
-        }
-        else
-        {
-            if (stat != procStat)
+            // Combine into overall mesh change status
+            if (stat == polyMesh::UNCHANGED)
             {
-                FatalErrorIn("processorMeshesReconstructor::readUpdate()")
-                    << "Processor " << procI
-                    << " has a different polyMesh at time "
-                    << databases_[procI].timeName()
-                    << " compared to any previous processors." << nl
-                    << "Please check time " << databases_[procI].timeName()
-                    << " directories on all processors for consistent"
-                    << " mesh files."
-                    << exit(FatalError);
+                stat = procStat;
+            }
+            else
+            {
+                if (stat != procStat)
+                {
+                    FatalErrorIn("processorMeshesReconstructor::readUpdate()")
+                        << "Processor " << procI
+                        << " has a different polyMesh at time "
+                        << databases_[procI].timeName()
+                        << " compared to any previous processors." << nl
+                        << "Please check time " << databases_[procI].timeName()
+                        << " directories on all processors for consistent"
+                        << " mesh files."
+                        << exit(FatalError);
+                }
             }
         }
     }
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
index 3070b16e4..e715515c7 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
@@ -95,6 +95,9 @@ class processorMeshesReconstructor
         //- Attempt to read mapping.  If not available, return false
         bool readMapping();
 
+        //- Return first valid mesh index
+        label firstValidMesh() const;
+
         //- Return neighbour processor patch
         const processorPolyPatch& neighbourProcPatch
         (
@@ -115,11 +118,12 @@ public:
 
     // Constructors
 
-        //- Construct from components
+        //- Construct reading mesh names
         processorMeshesReconstructor
         (
             PtrList<Time>& databases,
-            const word& meshName
+            const word& meshName,
+            const bool read
         );
 
 
@@ -139,7 +143,13 @@ public:
         void reconstructPoints(fvMesh& mesh) const;
 
         //- Return meshes
-        const PtrList<fvMesh>& meshes()
+        const PtrList<fvMesh>& meshes() const
+        {
+            return meshes_;
+        }
+
+        //- Return access to meshes
+        PtrList<fvMesh>& meshes()
         {
             return meshes_;
         }
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianFields.C
index 7bcfe8946..4331c0a1e 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianFields.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianFields.C
@@ -56,29 +56,32 @@ Foam::tmp<Foam::IOField<Type> > Foam::reconstructLagrangianField
     );
     Field<Type>& field = tfield();
 
-    forAll(meshes, i)
+    forAll (meshes, i)
     {
-        // Check object on local mesh
-        IOobject localIOobject
-        (
-            fieldName,
-            meshes[i].time().timeName(),
-            cloud::prefix/cloudName,
-            meshes[i],
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        );
-
-        if (localIOobject.headerOk())
+        if (meshes.set(i))
         {
-            IOField<Type> fieldi(localIOobject);
+            // Check object on local mesh
+            IOobject localIOobject
+            (
+                fieldName,
+                meshes[i].time().timeName(),
+                cloud::prefix/cloudName,
+                meshes[i],
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            );
 
-            label offset = field.size();
-            field.setSize(offset + fieldi.size());
-
-            forAll(fieldi, j)
+            if (localIOobject.headerOk())
             {
-                field[offset + j] = fieldi[j];
+                IOField<Type> fieldi(localIOobject);
+
+                label offset = field.size();
+                field.setSize(offset + fieldi.size());
+
+                forAll (fieldi, j)
+                {
+                    field[offset + j] = fieldi[j];
+                }
             }
         }
     }
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianPositions.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianPositions.C
index 9dfec5691..4f95d9c18 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianPositions.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/lagrangian/reconstructLagrangianPositions.C
@@ -46,25 +46,28 @@ void Foam::reconstructLagrangianPositions
         IDLList<passiveParticle>()
     );
 
-    forAll(meshes, i)
+    forAll (meshes, i)
     {
-        const labelList& cellMap = cellProcAddressing[i];
-
-        Cloud<passiveParticle> lpi(meshes[i], cloudName, false);
-
-        forAllIter(Cloud<passiveParticle>, lpi, iter)
+        if (meshes.set(i))
         {
-            const passiveParticle& ppi = iter();
+            const labelList& cellMap = cellProcAddressing[i];
 
-            lagrangianPositions.append
-            (
-                new passiveParticle
+            Cloud<passiveParticle> lpi(meshes[i], cloudName, false);
+
+            forAllIter (Cloud<passiveParticle>, lpi, iter)
+            {
+                const passiveParticle& ppi = iter();
+
+                lagrangianPositions.append
                 (
-                    lagrangianPositions,
-                    ppi.position(),
-                    cellMap[ppi.cell()]
-                )
-            );
+                    new passiveParticle
+                    (
+                        lagrangianPositions,
+                        ppi.position(),
+                        cellMap[ppi.cell()]
+                    )
+                );
+            }
         }
     }
 
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructor.H
index 10c5229d9..c00f338c9 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructor.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructor.H
@@ -143,16 +143,29 @@ public:
         );
 
 
+    // Destructor - default
+
+
     // Member Functions
 
-        //- Reconstruct field
+        //- Reconstruct point field data into a given field
+        //  If a PtrList slot is empty, it is skipped
+        template<class Type>
+        void reconstructField
+        (
+            GeometricField<Type, pointPatchField, pointMesh>& reconField,
+            const PtrList<GeometricField<Type, pointPatchField, pointMesh> >&
+                procFields
+        ) const;
+
+        //- Reconstruct point field
         template<class Type>
         tmp<GeometricField<Type, pointPatchField, pointMesh> >
-        reconstructField(const IOobject& fieldIoObject);
+        reconstructField(const IOobject& fieldIoObject) const;
 
-        //- Reconstruct and write all fields
+        //- Reconstruct and write all point fields
         template<class Type>
-        void reconstructFields(const IOobjectList& objects);
+        void reconstructFields(const IOobjectList& objects) const;
 };
 
 
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructorReconstructFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructorReconstructFields.C
index e8eb75dc3..456116210 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructorReconstructFields.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/point/pointFieldReconstructorReconstructFields.C
@@ -27,9 +27,63 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Type>
+void Foam::pointFieldReconstructor::reconstructField
+(
+    GeometricField<Type, pointPatchField, pointMesh>& reconField,
+    const PtrList<GeometricField<Type, pointPatchField, pointMesh> >& procFields
+) const
+{
+    // Get references to internal and boundary field
+    Field<Type>& iField = reconField.internalField();
+
+    typename GeometricField<Type, pointPatchField, pointMesh>::
+        GeometricBoundaryField& bouField = reconField.boundaryField();
+
+    forAll (procMeshes_, procI)
+    {
+        if (procFields.set(procI))
+        {
+            const GeometricField<Type, pointPatchField, pointMesh>&
+                procField = procFields[procI];
+
+            // Get processor-to-global addressing for use in rmap
+            const labelList& procToGlobalAddr = pointProcAddressing_[procI];
+
+            // Set the cell values in the reconstructed field
+            iField.rmap
+            (
+                procField.internalField(),
+                procToGlobalAddr
+            );
+
+            // Set the boundary patch values in the reconstructed field
+            forAll (boundaryProcAddressing_[procI], patchI)
+            {
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    bouField[curBPatch].rmap
+                    (
+                        procFields[procI].boundaryField()[patchI],
+                        patchPointAddressing_[procI][patchI]
+                    );
+                }
+            }
+        }
+    }
+}
+
+
 template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
-Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
+Foam::pointFieldReconstructor::reconstructField
+(
+    const IOobject& fieldIoObject
+) const
 {
     // Read the field for all the processors
     PtrList<GeometricField<Type, pointPatchField, pointMesh> > procFields
@@ -37,89 +91,100 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
         procMeshes_.size()
     );
 
-    forAll (procMeshes_, proci)
+    forAll (procMeshes_, procI)
     {
-        procFields.set
-        (
-            proci,
-            new GeometricField<Type, pointPatchField, pointMesh>
+        if (procMeshes_.set(procI))
+        {
+            procFields.set
             (
-                IOobject
+                procI,
+                new GeometricField<Type, pointPatchField, pointMesh>
                 (
-                    fieldIoObject.name(),
-                    procMeshes_[proci]().time().timeName(),
-                    procMeshes_[proci](),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[proci]
-            )
-        );
+                    IOobject
+                    (
+                        fieldIoObject.name(),
+                        procMeshes_[procI]().time().timeName(),
+                        procMeshes_[procI](),
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    procMeshes_[procI]
+                )
+            );
+        }
     }
 
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.size());
-
     // Create the patch fields
     PtrList<pointPatchField<Type> > patchFields(mesh_.boundary().size());
 
-
-    forAll (procMeshes_, proci)
+    forAll (procMeshes_, procI)
     {
-        const GeometricField<Type, pointPatchField, pointMesh>&
-            procField = procFields[proci];
-
-        // Get processor-to-global addressing for use in rmap
-        const labelList& procToGlobalAddr = pointProcAddressing_[proci];
-
-        // Set the cell values in the reconstructed field
-        internalField.rmap
-        (
-            procField.internalField(),
-            procToGlobalAddr
-        );
-
-        // Set the boundary patch values in the reconstructed field
-        forAll(boundaryProcAddressing_[proci], patchi)
+        if (procMeshes_.set(procI))
         {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[proci][patchi];
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
+            // Set the boundary patch in the reconstructed field
+            forAll (boundaryProcAddressing_[procI], patchI)
             {
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        pointPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchi],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, pointMesh>::null(),
-                            pointPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchi].size()
-                            )
-                        )
-                    );
-                }
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
 
-                patchFields[curBPatch].rmap
-                (
-                    procField.boundaryField()[patchi],
-                    patchPointAddressing_[proci][patchi]
-                );
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    if (!patchFields(curBPatch))
+                    {
+                        patchFields.set
+                        (
+                            curBPatch,
+                            pointPatchField<Type>::New
+                            (
+                                procFields[procI].boundaryField()[patchI],
+                                mesh_.boundary()[curBPatch],
+                                DimensionedField<Type, pointMesh>::null(),
+                                pointPatchFieldReconstructor
+                                (
+                                    mesh_.boundary()[curBPatch].size(),
+                                    procFields[procI].boundaryField()
+                                        [patchI].size()
+                                )
+                            )
+                        );
+                    }
+                }
             }
         }
     }
 
-    // Construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, pointPatchField, pointMesh> >
+    // Add missing patch fields
+    forAll (mesh_.boundary(), patchI)
+    {
+        if (!patchFields(patchI))
+        {
+            patchFields.set
+            (
+                patchI,
+                pointPatchField<Type>::New
+                (
+                    mesh_.boundary()[patchI].type(),
+                    mesh_.boundary()[patchI],
+                    DimensionedField<Type, pointMesh>::null()
+                )
+            );
+        }
+    }
+
+    label firstValidMesh = 0;
+
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            firstValidMesh = procI;
+            break;
+        }
+    }
+
+    // Construct the reconstructed field with patches
+    tmp<GeometricField<Type, pointPatchField, pointMesh> > treconField
     (
         new GeometricField<Type, pointPatchField, pointMesh>
         (
@@ -132,11 +197,20 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
                 IOobject::NO_WRITE
             ),
             mesh_,
-            procFields[0].dimensions(),
-            internalField,
+            procFields[firstValidMesh].dimensions(),
+            Field<Type>(mesh_.size()),
             patchFields
         )
     );
+
+    // Reconstruct field
+    reconstructField
+    (
+        treconField(),
+        procFields
+    );
+
+    return treconField;
 }
 
 
@@ -145,7 +219,7 @@ template<class Type>
 void Foam::pointFieldReconstructor::reconstructFields
 (
     const IOobjectList& objects
-)
+) const
 {
     word fieldClassName
     (
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructor.H
index 6f9f1641a..3c4b8ce80 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructor.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructor.H
@@ -54,7 +54,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-              Class tetPointFieldReconstructor Declaration
+                  Class tetPointFieldReconstructor Declaration
 \*---------------------------------------------------------------------------*/
 
 class tetPointFieldReconstructor
@@ -166,37 +166,60 @@ public:
         );
 
 
+    // Destructor - default
+
+
     // Member Functions
 
-        //- Reconstruct point field
+        //- Reconstruct tetPoint field data into a given field
+        //  If a PtrList slot is empty, it is skipped
+        template<class Type>
+        void reconstructTetPointField
+        (
+            GeometricField<Type, tetPolyPatchField, tetPointMesh>& reconField,
+            const PtrList<GeometricField<Type, tetPolyPatchField, tetPointMesh> >&
+                procFields
+        ) const;
+
+        //- Reconstruct tetPoint field
         template<class Type>
         tmp<GeometricField<Type, tetPolyPatchField, tetPointMesh> >
         reconstructTetPointField
         (
             const IOobject& fieldIoObject
-        );
+        ) const;
 
-        //- Reconstruct element field
+        //- Reconstruct tetElement field data into a given field
+        //  If a PtrList slot is empty, it is skipped
+        template<class Type>
+        void reconstructElementField
+        (
+            GeometricField<Type, elementPatchField, elementMesh>& reconField,
+            const PtrList<GeometricField<Type, elementPatchField, elementMesh> >&
+                procFields
+        ) const;
+
+        //- Reconstruct tetElement field
         template<class Type>
         tmp<GeometricField<Type, elementPatchField, elementMesh> >
         reconstructElementField
         (
             const IOobject& fieldIoObject
-        );
+        ) const;
 
-        //- Reconstruct and write all point fields
+        //- Reconstruct and write all tetPoint fields
         template<class Type>
         void reconstructTetPointFields
         (
             const IOobjectList& objects
-        );
+        ) const;
 
-        //- Reconstruct and write all element fields
+        //- Reconstruct and write all tetElement fields
         template<class Type>
         void reconstructElementFields
         (
             const IOobjectList& objects
-        );
+        ) const;
 };
 
 
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructorReconstructFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructorReconstructFields.C
index d66feb0bb..dd9e65ddb 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructorReconstructFields.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/tetFiniteElement/tetPointFieldReconstructorReconstructFields.C
@@ -35,12 +35,73 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Type>
+void tetPointFieldReconstructor::reconstructTetPointField
+(
+    GeometricField<Type, tetPolyPatchField, tetPointMesh>& reconField,
+    const PtrList<GeometricField<Type, tetPolyPatchField, tetPointMesh> >&
+        procFields
+) const
+{
+    // Get references to internal and boundary field
+    Field<Type>& iField = reconField.internalField();
+
+    typename GeometricField<Type, tetPolyPatchField, tetPointMesh>::
+        GeometricBoundaryField& bouField = reconField.boundaryField();
+
+    forAll (procMeshes_, procI)
+    {
+        if (procFields.set(procI))
+        {
+            const GeometricField<Type, tetPolyPatchField, tetPointMesh>&
+                procField = procFields[procI];
+
+            // Get processor-to-global addressing for use in rmap
+            labelList procToGlobalAddr = procAddressing(procI);
+
+            // Set the cell values in the reconstructed field
+            iField.rmap
+            (
+                procField.internalField(),
+                procToGlobalAddr
+            );
+
+            // Set the boundary patch values in the reconstructed field
+            forAll(boundaryProcAddressing_[procI], patchI)
+            {
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    // If the field stores values, do the rmap
+                    if (bouField[curBPatch].storesFieldData())
+                    {
+                        bouField[curBPatch].rmap
+                        (
+                            procField.boundaryField()[patchI],
+                            procPatchAddressing
+                            (
+                                procToGlobalAddr,
+                                procI,
+                                patchI
+                            )
+                        );
+                    }
+                }
+            }
+        }
+    }
+}
+
+
 template<class Type>
 tmp<GeometricField<Type, tetPolyPatchField, tetPointMesh> >
 tetPointFieldReconstructor::reconstructTetPointField
 (
     const IOobject& fieldIoObject
-)
+) const
 {
     // Read the field for all the processors
     PtrList<GeometricField<Type, tetPolyPatchField, tetPointMesh> > procFields
@@ -50,96 +111,98 @@ tetPointFieldReconstructor::reconstructTetPointField
 
     forAll (procMeshes_, procI)
     {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, tetPolyPatchField, tetPointMesh>
+        if (procMeshes_.set(procI))
+        {
+            procFields.set
             (
-                IOobject
+                procI,
+                new GeometricField<Type, tetPolyPatchField, tetPointMesh>
                 (
-                    fieldIoObject.name(),
-                    procMeshes_[procI]().time().timeName(),
-                    procMeshes_[procI](),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
+                    IOobject
+                    (
+                        fieldIoObject.name(),
+                        procMeshes_[procI]().time().timeName(),
+                        procMeshes_[procI](),
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    procMeshes_[procI]
+                )
+            );
+        }
     }
 
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nPoints());
-
     // Create the patch fields
     PtrList<tetPolyPatchField<Type> > patchFields(mesh_.boundary().size());
 
-
     forAll (procMeshes_, procI)
     {
-        const GeometricField<Type, tetPolyPatchField, tetPointMesh>&
-            procField = procFields[procI];
-
-        // Get processor-to-global addressing for use in rmap
-        labelList procToGlobalAddr = procAddressing(procI);
-
-        // Set the cell values in the reconstructed field
-        internalField.rmap
-        (
-            procField.internalField(),
-            procToGlobalAddr
-        );
-
-        // Set the boundary patch values in the reconstructed field
-        forAll(boundaryProcAddressing_[procI], patchI)
+        if (procMeshes_.set(procI))
         {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
+            // Set the boundary patch values in the reconstructed field
+            forAll(boundaryProcAddressing_[procI], patchI)
             {
-                if (!patchFields(curBPatch))
-                {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        tetPolyPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, tetPointMesh>::null(),
-                            tetPolyPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
 
-                // If the field stores values, do the rmap
-                if (patchFields[curBPatch].storesFieldData())
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
                 {
-                    patchFields[curBPatch].rmap
-                    (
-                        procField.boundaryField()[patchI],
-                        procPatchAddressing
+                    if (!patchFields(curBPatch))
+                    {
+                        patchFields.set
                         (
-                            procToGlobalAddr,
-                            procI,
-                            patchI
-                        )
-                    );
+                            curBPatch,
+                            tetPolyPatchField<Type>::New
+                            (
+                                procFields[procI].boundaryField()[patchI],
+                                mesh_.boundary()[curBPatch],
+                                DimensionedField<Type, tetPointMesh>::null(),
+                                tetPolyPatchFieldReconstructor
+                                (
+                                    mesh_.boundary()[curBPatch].size(),
+                                    procFields[procI].boundaryField()
+                                        [patchI].size()
+                                )
+                            )
+                        );
+                    }
                 }
             }
         }
     }
 
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, tetPolyPatchField, tetPointMesh> >
+    // Add missing patch fields
+    forAll (mesh_.boundary(), patchI)
+    {
+        if (!patchFields(patchI))
+        {
+            patchFields.set
+            (
+                patchI,
+                tetPolyPatchField<Type>::New
+                (
+                    mesh_.boundary()[patchI].type(),
+                    mesh_.boundary()[patchI],
+                    DimensionedField<Type, tetPointMesh>::null()
+                )
+            );
+        }
+    }
+
+    label firstValidMesh = 0;
+
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            firstValidMesh = procI;
+            break;
+        }
+    }
+
+    // Construct the reconstructed field with patches
+    tmp<GeometricField<Type, tetPolyPatchField, tetPointMesh> > treconField
     (
         new GeometricField<Type, tetPolyPatchField, tetPointMesh>
         (
@@ -152,11 +215,93 @@ tetPointFieldReconstructor::reconstructTetPointField
                 IOobject::NO_WRITE
             ),
             mesh_,
-            procFields[0].dimensions(),
-            internalField,
+            procFields[firstValidMesh].dimensions(),
+            Field<Type>(mesh_.nPoints()),
             patchFields
         )
     );
+
+    // Reconstruct field
+    reconstructTetPointField
+    (
+        treconField(),
+        procFields
+    );
+
+    return treconField;
+}
+
+
+template<class Type>
+void tetPointFieldReconstructor::reconstructElementField
+(
+    GeometricField<Type, elementPatchField, elementMesh>& reconField,
+    const PtrList<GeometricField<Type, elementPatchField, elementMesh> >&
+        procFields
+) const
+{
+    // Get references to internal and boundary field
+    Field<Type>& iField = reconField.internalField();
+
+    typename GeometricField<Type, elementPatchField, elementMesh>::
+        GeometricBoundaryField& bouField = reconField.boundaryField();
+
+    forAll (procMeshes_, procI)
+    {
+        if (procFields.set(procI))
+        {
+            const GeometricField<Type, elementPatchField, elementMesh>&
+                procField = procFields[procI];
+
+            // Set the cell values in the reconstructed field
+            iField.rmap
+            (
+                procField.internalField(),
+                cellProcAddressing_[procI]
+            );
+
+            // Set the boundary patch values in the reconstructed field
+            forAll (boundaryProcAddressing_[procI], patchI)
+            {
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // Get addressing slice for this patch
+                const labelList::subList cp =
+                    procMeshes_[procI]().boundaryMesh()[patchI].patchSlice
+                    (
+                        faceProcAddressing_[procI]
+                    );
+
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    // If the field stores values, do the rmap
+                    if (bouField[curBPatch].storesFieldData())
+                    {
+                        const label curPatchStart =
+                            mesh_().boundaryMesh()[curBPatch].start();
+
+                        labelList reverseAddressing(cp.size());
+
+                        forAll (cp, faceI)
+                        {
+                            // Subtract one to take into account offsets for
+                            // face direction.
+                            reverseAddressing[faceI] = cp[faceI] - 1
+                                - curPatchStart;
+                        }
+
+                        bouField[curBPatch].rmap
+                        (
+                            procField.boundaryField()[patchI],
+                            reverseAddressing
+                        );
+                    }
+                }
+            }
+        }
+    }
 }
 
 
@@ -165,7 +310,7 @@ tmp<GeometricField<Type, elementPatchField, elementMesh> >
 tetPointFieldReconstructor::reconstructElementField
 (
     const IOobject& fieldIoObject
-)
+) const
 {
     // Read the field for all the processors
     PtrList<GeometricField<Type, elementPatchField, elementMesh> > procFields
@@ -175,108 +320,99 @@ tetPointFieldReconstructor::reconstructElementField
 
     forAll (procMeshes_, procI)
     {
-        procFields.set
-        (
-            procI,
-            new GeometricField<Type, elementPatchField, elementMesh>
+        if (procMeshes_.set(procI))
+        {
+            procFields.set
             (
-                IOobject
+                procI,
+                new GeometricField<Type, elementPatchField, elementMesh>
                 (
-                    fieldIoObject.name(),
-                    procMeshes_[procI]().time().timeName(),
-                    procMeshes_[procI](),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                procMeshes_[procI]
-            )
-        );
+                    IOobject
+                    (
+                        fieldIoObject.name(),
+                        procMeshes_[procI]().time().timeName(),
+                        procMeshes_[procI](),
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    ),
+                    procMeshes_[procI]
+                )
+            );
+        }
     }
 
-
-    // Create the internalField
-    Field<Type> internalField(mesh_.nCells());
-
     // Create the patch fields
     PtrList<elementPatchField<Type> > patchFields(mesh_.boundary().size());
 
 
     forAll (procMeshes_, procI)
     {
-        const GeometricField<Type, elementPatchField, elementMesh>&
-            procField = procFields[procI];
-
-        // Set the cell values in the reconstructed field
-        internalField.rmap
-        (
-            procField.internalField(),
-            cellProcAddressing_[procI]
-        );
-
-        // Set the boundary patch values in the reconstructed field
-        forAll(boundaryProcAddressing_[procI], patchI)
+        if (procMeshes_.set(procI))
         {
-            // Get patch index of the original patch
-            const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-            // Get addressing slice for this patch
-            const labelList::subList cp =
-                procMeshes_[procI]().boundaryMesh()[patchI].patchSlice
-                (
-                    faceProcAddressing_[procI]
-                );
-
-            // check if the boundary patch is not a processor patch
-            if (curBPatch >= 0)
+            // Set the boundary patch values in the reconstructed field
+            forAll(boundaryProcAddressing_[procI], patchI)
             {
-                if (!patchFields(curBPatch))
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
                 {
-                    patchFields.set
-                    (
-                        curBPatch,
-                        elementPatchField<Type>::New
-                        (
-                            procField.boundaryField()[patchI],
-                            mesh_.boundary()[curBPatch],
-                            DimensionedField<Type, elementMesh>::null(),
-                            tetPolyPatchFieldReconstructor
-                            (
-                                mesh_.boundary()[curBPatch].size(),
-                                procField.boundaryField()[patchI].size()
-                            )
-                        )
-                    );
-                }
-
-                // If the field stores values, do the rmap
-                if (patchFields[curBPatch].storesFieldData())
-                {
-                    const label curPatchStart =
-                        mesh_().boundaryMesh()[curBPatch].start();
-
-                    labelList reverseAddressing(cp.size());
-
-                    forAll(cp, faceI)
+                    if (!patchFields(curBPatch))
                     {
-                        // Subtract one to take into account offsets for
-                        // face direction.
-                        reverseAddressing[faceI] = cp[faceI] - 1
-                            - curPatchStart;
+                        patchFields.set
+                        (
+                            curBPatch,
+                            elementPatchField<Type>::New
+                            (
+                                procFields[procI].boundaryField()[patchI],
+                                mesh_.boundary()[curBPatch],
+                                DimensionedField<Type, elementMesh>::null(),
+                                tetPolyPatchFieldReconstructor
+                                (
+                                    mesh_.boundary()[curBPatch].size(),
+                                    procFields[procI].boundaryField()
+                                        [patchI].size()
+                                )
+                            )
+                        );
                     }
-
-                    patchFields[curBPatch].rmap
-                    (
-                        procField.boundaryField()[patchI],
-                        reverseAddressing
-                    );
                 }
             }
         }
     }
 
-    // Now construct and write the field
-    // setting the internalField and patchFields
-    return tmp<GeometricField<Type, elementPatchField, elementMesh> >
+    // Add missing patch fields
+    forAll (mesh_.boundary(), patchI)
+    {
+        if (!patchFields(patchI))
+        {
+            patchFields.set
+            (
+                patchI,
+                elementPatchField<Type>::New
+                (
+                    mesh_.boundary()[patchI].type(),
+                    mesh_.boundary()[patchI],
+                    DimensionedField<Type, elementMesh>::null()
+                )
+            );
+        }
+    }
+
+    label firstValidMesh = 0;
+
+    forAll (procMeshes_, procI)
+    {
+        if (procMeshes_.set(procI))
+        {
+            firstValidMesh = procI;
+            break;
+        }
+    }
+
+    // Construct the reconstructed field with patches
+    tmp<GeometricField<Type, elementPatchField, elementMesh> > treconField
     (
         new GeometricField<Type, elementPatchField, elementMesh>
         (
@@ -289,11 +425,20 @@ tetPointFieldReconstructor::reconstructElementField
                 IOobject::NO_WRITE
             ),
             mesh_,
-            procFields[0].dimensions(),
-            internalField,
+            procFields[firstValidMesh].dimensions(),
+            Field<Type>(mesh_.nCells()),
             patchFields
         )
     );
+
+    // Reconstruct field
+    reconstructElementField
+    (
+        treconField(),
+        procFields
+    );
+
+    return treconField;
 }
 
 
@@ -301,7 +446,7 @@ template<class Type>
 void tetPointFieldReconstructor::reconstructTetPointFields
 (
     const IOobjectList& objects
-)
+) const
 {
     word fieldClassName
     (
@@ -335,7 +480,7 @@ template<class Type>
 void tetPointFieldReconstructor::reconstructElementFields
 (
     const IOobjectList& objects
-)
+) const
 {
     word fieldClassName
     (

From 1cf1a74fa40371a0b54206810a560c99e1efba2c Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Wed, 28 Feb 2018 18:39:10 +0000
Subject: [PATCH 03/45] Refactor mapping tools for partially filled PtrLists. 
 Consistency changes

---
 .../parallelProcessing/reconstructPar/reconstructPar.C   | 3 ++-
 .../reconstructParMesh/reconstructParMesh.C              | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 51dcb16f8..b7809680b 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -485,7 +485,8 @@ int main(int argc, char *argv[])
 
             faMesh aMesh(mesh);
 
-            processorFaMeshes procFaMeshes(procMeshes.meshes());
+            // Create mesh addressing by reading from files
+            processorFaMeshes procFaMeshes(procMeshes.meshes(), true);
 
             faFieldReconstructor faReconstructor
             (
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index c5a01c0c0..794ee2250 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -136,7 +136,12 @@ int main(int argc, char *argv[])
     }
 
     // Read all meshes and addressing to reconstructed mesh
-    processorMeshesReconstructor procMeshes(databases, regionName);
+    processorMeshesReconstructor procMeshes
+    (
+        databases,
+        regionName,
+        true         // read meshes
+    );
 
     autoPtr<fvMesh> meshPtr = procMeshes.reconstructMesh(runTime);
 
@@ -629,7 +634,7 @@ int main(int argc, char *argv[])
 
             faMesh aMesh(mesh);
 
-            processorFaMeshes procFaMeshes(procMeshes.meshes());
+            processorFaMeshes procFaMeshes(procMeshes.meshes(), true);
 
             faFieldReconstructor faReconstructor
             (

From bd5f2bb4f416a71d0956531455a1fce11740d84e Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 16 Mar 2018 20:43:28 +0000
Subject: [PATCH 04/45] Load balancing development 1

---
 src/decompositionMethods/Allwmake             |   2 +
 src/decompositionMethods/AllwmakeLnInclude    |   2 +
 .../decomposeReconstruct/Make/files           |   1 +
 .../decomposeReconstruct/Make/options         |   2 +-
 .../finiteVolume/distributeCells.C            |   2 -
 .../finiteVolume/domainDecomposition.C        |  16 +-
 .../finiteVolume/domainDecomposition.H        |   5 +-
 .../finiteVolume/processorMeshData.H          | 184 ++++++++
 .../finiteVolume/processorMeshesRebuild.C     |  40 +-
 .../processorMeshesReconstructor.C            |  42 +-
 .../processorMeshesReconstructor.H            |  13 +-
 .../finiteVolume/sharedPoints.C               | 439 ++++++++++++++++++
 .../finiteVolume/sharedPoints.H               | 166 +++++++
 13 files changed, 864 insertions(+), 50 deletions(-)
 create mode 100644 src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/processorMeshData.H
 create mode 100644 src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C
 create mode 100644 src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H

diff --git a/src/decompositionMethods/Allwmake b/src/decompositionMethods/Allwmake
index 5c9055935..673719963 100755
--- a/src/decompositionMethods/Allwmake
+++ b/src/decompositionMethods/Allwmake
@@ -2,6 +2,8 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
+wmake libso decomposeReconstruct
+
 wmakeLnInclude decompositionMethods
 
 wmake libso decompositionMethods
diff --git a/src/decompositionMethods/AllwmakeLnInclude b/src/decompositionMethods/AllwmakeLnInclude
index 0737a7ffd..fa6114ea4 100755
--- a/src/decompositionMethods/AllwmakeLnInclude
+++ b/src/decompositionMethods/AllwmakeLnInclude
@@ -2,6 +2,8 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
+wmakeLnInclude decomposeReconstruct
+
 wmakeLnInclude decompositionMethods
 wmakeLnInclude metisDecomp
 wmakeLnInclude parMetisDecomp
diff --git a/src/decompositionMethods/decomposeReconstruct/Make/files b/src/decompositionMethods/decomposeReconstruct/Make/files
index ed46cfd4f..061c4f182 100644
--- a/src/decompositionMethods/decomposeReconstruct/Make/files
+++ b/src/decompositionMethods/decomposeReconstruct/Make/files
@@ -8,6 +8,7 @@ decomposeTools/point/pointFieldDecomposer.C
 decomposeTools/tetFiniteElement/tetPointFieldDecomposer.C
 decomposeTools/lagrangian/lagrangianFieldDecomposer.C
 
+reconstructTools/finiteVolume/sharedPoints.C
 reconstructTools/finiteVolume/processorMeshesReconstructor.C
 reconstructTools/finiteVolume/processorMeshesRebuild.C
 reconstructTools/finiteVolume/fvFieldReconstructor.C
diff --git a/src/decompositionMethods/decomposeReconstruct/Make/options b/src/decompositionMethods/decomposeReconstruct/Make/options
index ae23f0a53..b3c50eb2e 100644
--- a/src/decompositionMethods/decomposeReconstruct/Make/options
+++ b/src/decompositionMethods/decomposeReconstruct/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -std=c++11 \
     -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C
index 7eb61f42c..4503bcf2b 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C
@@ -107,8 +107,6 @@ void Foam::domainDecomposition::distributeCells()
 
     // Construct decomposition method and either do decomposition on
     // cell centres or on agglomeration
-
-
     autoPtr<decompositionMethod> decomposePtr = decompositionMethod::New
     (
         decompositionDict_,
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
index d90557d20..6dae788ed 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
@@ -83,7 +83,8 @@ Foam::domainDecomposition::~domainDecomposition()
 Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
 (
     const label procI,
-    const Time& processorDb
+    const Time& processorDb,
+    const word& regionName
 ) const
 {
     // Create processor points
@@ -210,7 +211,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
         (
             IOobject
             (
-                mesh_.polyMesh::name(),  // region name of undecomposed mesh
+                regionName,
                 mesh_.pointsInstance(),
                 processorDb
             ),
@@ -283,8 +284,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
         nPatches++;
     }
 
-    // Add boundary patches
-    procMesh.addPatches(procPatches);
+    // Add boundary patches to polyMesh and fvMesh
+    procMesh.addFvPatches(procPatches);
 
     // Create and add zones
 
@@ -531,7 +532,12 @@ bool Foam::domainDecomposition::writeDecomposition()
         // Set the precision of the points data to 10
         IOstream::defaultPrecision(10);
 
-        autoPtr<fvMesh> procMeshPtr = processorMesh(procI, processorDb);
+        autoPtr<fvMesh> procMeshPtr = processorMesh
+        (
+            procI,
+            processorDb,
+            mesh_.polyMesh::name()     // region name of undecomposed mesh
+        );
         fvMesh& procMesh = procMeshPtr();
 
         procMesh.write();
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
index f2c2abf4f..f31e7bc43 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
@@ -177,11 +177,12 @@ public:
 
         // Decomposed mesh and addressing
 
-            //- Decompose mesh for a given processor
+            //- Create a decomposed mesh for a given processor index
             autoPtr<fvMesh> processorMesh
             (
                 const label procI,
-                const Time& procDb
+                const Time& procDb,
+                const word& regionName
             ) const;
 
             //- Return processor point addressing
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/processorMeshData.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/processorMeshData.H
new file mode 100644
index 000000000..7248e09cc
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/processorMeshData.H
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::processorMeshData
+
+Description
+    The class holds mesh data required to assemble a single processor mesh
+    from the decomposition.  The data is raw but can be assembled into
+    a complete mesh
+
+Author
+    Hrvoje Jasak, Wikki Ltd.
+
+SourceFiles
+    processorMeshData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorMeshData_H
+#define processorMeshData_H
+
+#include ".H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class processorMeshData Declaration
+\*---------------------------------------------------------------------------*/
+
+class processorMeshData
+{
+    // Private data
+
+        // Internal mesh data
+    
+            //- Points
+            pointField procPoints_;
+
+            //- Faces
+            faceList procFaces_;
+
+            //- Face owner
+            labelList procOwner_;
+
+            //- Face neighbour
+            labelList procNeighbour_;
+
+
+        // Boundary data, separated into existing and new patches
+    
+            //- Boundary addressing
+            labelList boundaryAddressing_;
+
+            //- Regular patch sizes
+            labelList patchSizes_;
+
+            //- Regular patch starts
+            labelList patchStarts_;
+    
+            //- Processor patch sizes
+            labelList procPatchSizes_;
+    
+            //- Processor patch starts
+            labelList procPatchSizes_;
+
+    
+        // Zones
+
+            //- Point zones
+            labelListList pointZones_;
+    
+            //- Face zones
+            labelListList faceZones_;
+
+            //- Face zone flips
+            labelListList faceZoneFlips_;
+
+            //- Cell zones
+            labelListList cellZones_;
+
+    
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        processorMeshData(const processorMeshData&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const processorMeshData&);
+
+
+public:
+
+    // Static data members
+
+        //- Static data staticData
+        static const dataType staticData;
+
+
+    // Constructors
+
+        //- Construct from components
+        processorMeshData(const dataType& data);
+
+        //- Construct from Istream
+        processorMeshData(Istream&);
+
+        //- Construct as copy
+        processorMeshData(const processorMeshData&);
+
+
+    // Selectors
+
+        //- Select null constructed
+        static autoPtr<processorMeshData> New();
+
+
+    //- Destructor
+    ~processorMeshData();
+
+
+    // Member Functions
+
+        // Access
+
+        // Check
+
+        // Edit
+
+        // Write
+
+
+    // Member Operators
+
+        void operator=(const processorMeshData&);
+
+
+    // Friend Functions
+
+    // Friend Operators
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream&, processorMeshData&);
+        friend Ostream& operator<<(Ostream&, const processorMeshData&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "processorMeshDataI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
index 90556868f..7c3f2942d 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
@@ -25,7 +25,7 @@ License
 
 #include "processorMeshesReconstructor.H"
 #include "processorPolyPatch.H"
-#include "globalMeshData.H"
+#include "sharedPoints.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -494,8 +494,9 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         << "    nPatches = " << nReconPatches << nl
         << "    nPatchFaces = " << reconPatchSizes << endl;
 
-    // Note: for easier debugging, set owner and neighbour to -1
+    // Note: for easier debugging, set mapping, owner and neighbour to -1
     pointField reconPoints(nReconPoints);
+    labelList globalPointMapping(nReconPoints, -1);
     faceList reconFaces(nReconFaces);
     labelList cellOffset(meshes_.size(), 0);
     labelList reconOwner(nReconFaces, -1);
@@ -604,8 +605,10 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
     reconPatchSizes = 0;
 
-    // Prepare handling for globally shared points
-    labelList globalPointMapping;
+    // Prepare handling for globally shared points.  This is equivalent
+    // to parallel processor points, but working on a PtrList of meshes
+    // on the same processor
+    sharedPoints sharedData(meshes_);
 
     // Dump first valid mesh without checking
     {
@@ -619,10 +622,6 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         labelList& cpAddr = cellProcAddressing_[fvmId];
         labelList& bpAddr = boundaryProcAddressing_[fvmId];
 
-        // Prepare handling for global mesh data: set to -1
-        globalPointMapping.setSize(curMesh.globalData().nGlobalPoints());
-        globalPointMapping = -1;
-
         // Dump all points into the global point list
         // Reconstruct only live points.  HJ, 7/Mar/2011
         const pointField& curPoints = curMesh.points();
@@ -636,8 +635,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         }
 
         // Collect globally shared point labels
-        // CHANGE HERE!!!
-        const labelList& curSpl = curMesh.globalData().sharedPointLabels();
+        const labelList& curSpl = sharedData.sharedPointLabels()[fvmId];
 
         forAll (curSpl, splI)
         {
@@ -816,7 +814,8 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
                         forAll (reversedFaces, faceI)
                         {
-                            reversedFaces[faceI] = procPatch[faceI].reverseFace();
+                            reversedFaces[faceI] =
+                                procPatch[faceI].reverseFace();
                         }
 
                         primitiveFacePatch reversedPatch
@@ -828,8 +827,9 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                         // Insert addressing from master side into
                         // local point addressing.  Each face of reversed patch
                         // now matches the master face.
-                        // Note: this is done by visiting faces, since meshPoints
-                        // are ordered in increasing order.  HJ, 10/Mar/2011
+                        // Note: this is done by visiting faces, since
+                        // meshPoints are ordered in increasing order.
+                        // HJ, 10/Mar/2011
 
                         forAll (reversedFaces, faceI)
                         {
@@ -879,7 +879,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
             fpAddr.setSize(curFaces.size());
 
             // Collect globally shared point labels
-            const labelList& curSpl = curMesh.globalData().sharedPointLabels();
+            const labelList& curSpl = sharedData.sharedPointLabels()[procI];
 
             forAll (curSpl, splI)
             {
@@ -893,7 +893,11 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                 else
                 {
                     // Compare.  Is this needed - should always be OK.
-                    if (globalPointMapping[curSpl[splI]] != ppAddr[curSpl[splI]])
+                    if
+                    (
+                        globalPointMapping[curSpl[splI]]
+                     != ppAddr[curSpl[splI]]
+                    )
                     {
                         WarningIn
                         (
@@ -963,7 +967,8 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
                         const label masterProcID = procPatch.neighbProcNo();
 
-                        // Get local face-cell addressing: it will become neighbour
+                        // Get local face-cell addressing: it will become
+                        // a neighbour
                         // addressing for the already inserted faces
                         const labelList procFaceCells = procPatch.faceCells();
 
@@ -1039,7 +1044,8 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                 cpAddr[cellI] = cellI + cellOffset[procI];
             }
 
-            // Sort out boundary addressing: i for live patches, -1 for processor
+            // Sort out boundary addressing: i for live patches,
+            // -1 for processor
             bpAddr = -1;
 
             // Note: loop over mapped patches
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C
index 7a2f06172..567b11a20 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C
@@ -27,9 +27,9 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::processorMeshesReconstructor::readMeshes()
+void Foam::processorMeshesReconstructor::readMeshes(PtrList<Time>& databases)
 {
-    forAll (databases_, procI)
+    forAll (databases, procI)
     {
         Info<< "Reading mesh for processor " << procI << endl;
         meshes_.set
@@ -40,8 +40,8 @@ void Foam::processorMeshesReconstructor::readMeshes()
                 IOobject
                 (
                     meshName_,
-                    databases_[procI].timeName(),
-                    databases_[procI]
+                    databases[procI].timeName(),
+                    databases[procI]
                 )
             )
         );
@@ -66,12 +66,24 @@ void Foam::processorMeshesReconstructor::clearMaps()
 
 Foam::processorMeshesReconstructor::processorMeshesReconstructor
 (
-    PtrList<Time>& databases,
-    const word& meshName,
-    const bool read
+    const word& meshName
+)
+:
+    meshName_(meshName),
+    meshes_(),
+    pointProcAddressing_(),
+    faceProcAddressing_(),
+    cellProcAddressing_(),
+    boundaryProcAddressing_()
+{}
+
+
+Foam::processorMeshesReconstructor::processorMeshesReconstructor
+(
+    PtrList<Time>& databases,
+    const word& meshName
 )
 :
-    databases_(databases),
     meshName_(meshName),
     meshes_(databases.size()),
     pointProcAddressing_(),
@@ -79,10 +91,7 @@ Foam::processorMeshesReconstructor::processorMeshesReconstructor
     cellProcAddressing_(),
     boundaryProcAddressing_()
 {
-    if (read)
-    {
-        readMeshes();
-    }
+    readMeshes(databases);
 }
 
 
@@ -93,10 +102,10 @@ Foam::processorMeshesReconstructor::readUpdate()
 {
     polyMesh::readUpdateState stat = polyMesh::UNCHANGED;
 
-    forAll (databases_, procI)
+    forAll (meshes_, procI)
     {
         // Only do action if database has been set
-        if (databases_.set(procI))
+        if (meshes_.set(procI))
         {
             // Check if any new meshes need to be read.
             polyMesh::readUpdateState procStat = meshes_[procI].readUpdate();
@@ -113,9 +122,10 @@ Foam::processorMeshesReconstructor::readUpdate()
                     FatalErrorIn("processorMeshesReconstructor::readUpdate()")
                         << "Processor " << procI
                         << " has a different polyMesh at time "
-                        << databases_[procI].timeName()
+                        << meshes_[procI].time().timeName()
                         << " compared to any previous processors." << nl
-                        << "Please check time " << databases_[procI].timeName()
+                        << "Please check time "
+                        << meshes_[procI].time().timeName()
                         << " directories on all processors for consistent"
                         << " mesh files."
                         << exit(FatalError);
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
index e715515c7..3e276fbbc 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
@@ -58,9 +58,6 @@ class processorMeshesReconstructor
 {
     // Private data
 
-        //- Processor databases
-        PtrList<Time>& databases_;
-
         //- Name of mesh region to reconstruct
         const word meshName_;
 
@@ -90,7 +87,7 @@ class processorMeshesReconstructor
 
 
         //- Read all meshes
-        void readMeshes();
+        void readMeshes(PtrList<Time>& databases);
 
         //- Attempt to read mapping.  If not available, return false
         bool readMapping();
@@ -118,12 +115,14 @@ public:
 
     // Constructors
 
-        //- Construct reading mesh names
+        //- Construct given name.  Set meshes later
+        processorMeshesReconstructor(const word& meshName);
+
+        //- Construct reading meshes from databases
         processorMeshesReconstructor
         (
             PtrList<Time>& databases,
-            const word& meshName,
-            const bool read
+            const word& meshName
         );
 
 
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C
new file mode 100644
index 000000000..203ec753f
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C
@@ -0,0 +1,439 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "sharedPoints.H"
+#include "processorPolyPatch.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::labelListList Foam::sharedPoints::procPatchPairs() const
+{
+    labelListList patchPairs(meshes_.size());
+
+    // Initialise patch pair indices to -1
+    forAll (meshes_, meshI)
+    {
+        if (meshes_.set(meshI))
+        {
+            patchPairs[meshI].setSize(meshes_[meshI].boundaryMesh().size(), -1);
+        }
+    }
+
+    forAll (meshes_, meshI)
+    {
+        if (meshes_.set(meshI))
+        {
+            const polyMesh& curMesh = meshes_[meshI];
+            const polyBoundaryMesh& curPatches = curMesh.boundaryMesh();
+
+            forAll (curPatches, patchI)
+            {
+                if (isA<processorPolyPatch>(curPatches[patchI]))
+                {
+                    // Found processor patch
+                    if (patchPairs[meshI][patchI] == -1)
+                    {
+                        // Neighbour not found.  Find one
+                        const processorPolyPatch& myProcPatch =
+                            refCast<const processorPolyPatch>
+                            (
+                                curPatches[patchI]
+                            );
+
+                        const int myProcID = meshI;
+                        const int nbrProcID = myProcPatch.neighbProcNo();
+
+                        // Get the other mesh
+                        if (!meshes_.set(nbrProcID))
+                        {
+                            FatalErrorIn
+                            (
+                                "labelListList sharedPoints::procPatchPairs()"
+                            )   << "Neighbour mesh does not exist for proc "
+                                << meshI << " patch " << patchI
+                                << " and neighbour " << nbrProcID
+                                << abort(FatalError);
+                        }
+
+                        const polyMesh& nbrMesh = meshes_[nbrProcID];
+                        const polyBoundaryMesh& nbrPatches =
+                            nbrMesh.boundaryMesh();
+
+                        // Check all neighbour processor patches until a match
+                        // is found
+                        bool found = false;
+
+                        forAll (nbrPatches, nbrPatchI)
+                        {
+                            if (isA<processorPolyPatch>(nbrPatches[nbrPatchI]))
+                            {
+                                const processorPolyPatch& nbrProcPatch =
+                                    refCast<const processorPolyPatch>
+                                    (
+                                        nbrPatches[nbrPatchI]
+                                    );
+
+                                if (nbrProcPatch.neighbProcNo() == myProcID)
+                                {
+                                    // Pair found.  Record it twice
+                                    patchPairs[myProcID][patchI] = nbrPatchI;
+
+                                    patchPairs[nbrProcID][nbrPatchI] = patchI;
+
+                                    found = true;
+                                }
+                            }
+
+                            if (found)
+                            {
+                                break;
+                            }
+                        }
+
+                        if (!found)
+                        {
+                            FatalErrorIn
+                            (
+                                "labelListList sharedPoints::procPatchPairs()"
+                            )   << "Neighbour patch does not exist for proc "
+                                << meshI << " patch " << patchI
+                                << " and neighbour " << nbrProcID
+                                << abort(FatalError);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    Info<< "patch pairs: " << patchPairs << endl;
+    return patchPairs;
+}
+
+
+void Foam::sharedPoints::calcSharedPoints()
+{
+    // Algorithm
+    // Go through all processor patches and mark local points that are used
+    // by more than one processor patch and mark them as globally shared
+    // Pass the data to other processors.  Mark the locally multiply shared
+    // points and pass on the data
+    // Once all the data is passed forwards and back, check all points on
+    // all processors.  Record globally shared point, its local label and its
+    // slot in the globally shared point list
+
+    // Mark-up:
+    // 0 = point does not touch a processor boundary
+    // 1 = point on only one processor boundary: not locally shared
+    // 2 = locally detected global point
+
+    // Mark-up array: procI, procJ,
+    labelListList markedPoints(meshes_.size());
+
+    forAll (meshes_, meshI)
+    {
+        if (meshes_.set(meshI))
+        {
+            markedPoints[meshI].setSize(meshes_[meshI].nPoints(), 0);
+        }
+    }
+
+    // Mark up points for the first time
+    forAll (meshes_, meshI)
+    {
+        if (meshes_.set(meshI))
+        {
+            const polyMesh& curMesh = meshes_[meshI];
+            const polyBoundaryMesh& patches = curMesh.boundaryMesh();
+
+            // Mark points belonging to processor patches.  If the point
+            // is marked more than once, it may be a globally shared point
+            labelList& curMarkedPoints = markedPoints[meshI];
+
+            forAll (patches, patchI)
+            {
+                const polyPatch& pp = patches[patchI];
+
+                if (isA<processorPolyPatch>(pp))
+                {
+                    // Found processor patch
+                    const labelList& patchMeshPoints = pp.meshPoints();
+
+                    forAll (patchMeshPoints, mpI)
+                    {
+                        // Mark the point
+                        curMarkedPoints[patchMeshPoints[mpI]]++;
+                    }
+                }
+            }
+        }
+    }
+
+    // Get processor patch to neighbour processor patch addressing
+    labelListList patchPairs = procPatchPairs();
+
+    // Communicate and count global points
+    labelList nGlobalPointsPerProc(meshes_.size(), 0);
+
+    // Identify, count and communicate points across processor boundaries
+    // Repeat until the number of points per processor stabilises,
+    // ie. no further points are found through communication
+    label oldNTotalPoints, newNTotalPoints;
+    do
+    {
+        oldNTotalPoints = sum(nGlobalPointsPerProc);
+
+        // Reset the list
+        nGlobalPointsPerProc = 0;
+
+        forAll (meshes_, meshI)
+        {
+            if (meshes_.set(meshI))
+            {
+                const polyMesh& curMesh = meshes_[meshI];
+                const polyBoundaryMesh& patches = curMesh.boundaryMesh();
+
+                labelList& curMarkedPoints = markedPoints[meshI];
+
+                // Collect the points that have been addressed multiple times
+                forAll (patches, patchI)
+                {
+                    const polyPatch& pp = patches[patchI];
+
+                    if (isA<processorPolyPatch>(pp))
+                    {
+                        // Found processor patch
+                        const labelList& patchMeshPoints = pp.meshPoints();
+
+                        // My processor patch
+                        const processorPolyPatch& myProcPatch =
+                            refCast<const processorPolyPatch>(pp);
+
+                        // Get neighbour processor ID
+                        const int nbrProcID = myProcPatch.neighbProcNo();
+
+                        // Neighbour patch
+                        const polyPatch& nbrPatch =
+                            meshes_[nbrProcID].boundaryMesh()
+                            [patchPairs[meshI][patchI]];
+
+                        const labelList& nbrMeshPoints = nbrPatch.meshPoints();
+
+                        forAll (patchMeshPoints, mpI)
+                        {
+                            if (curMarkedPoints[patchMeshPoints[mpI]] > 1)
+                            {
+                                // Mark the point on the other processor/side
+                                markedPoints[nbrProcID][nbrMeshPoints[mpI]] =
+                                    curMarkedPoints[patchMeshPoints[mpI]];
+                            }
+                        }
+                    }
+                }
+
+                // Count number of shared points per processor
+                forAll (curMarkedPoints, cpI)
+                {
+                    if (curMarkedPoints[cpI] > 1)
+                    {
+                        nGlobalPointsPerProc[meshI]++;
+                    }
+                }
+            }
+        }
+
+        newNTotalPoints = sum(nGlobalPointsPerProc);
+
+        Info<< "Proc merge pass: " << oldNTotalPoints << " "
+            << newNTotalPoints << endl;
+    } while (oldNTotalPoints != newNTotalPoints);
+
+    Info<< "Number of shared points per processor: " << nGlobalPointsPerProc
+        << endl;
+
+    // Collect points for every processor, in order to re-use the markedPoints
+    // list.  Note: the list of global labels of shared points
+    // will be collected later
+    forAll (meshes_, meshI)
+    {
+        if (meshes_.set(meshI))
+        {
+            labelList& curSharedPoints = sharedPointLabels_[meshI];
+
+            curSharedPoints.setSize(nGlobalPointsPerProc[meshI]);
+
+            // Count inserted points
+            label nShared = 0;
+
+            // Get point marking
+            const labelList& curMarkedPoints = markedPoints[meshI];
+
+            forAll (curMarkedPoints, pointI)
+            {
+                if (curMarkedPoints[pointI] > 1)
+                {
+                    curSharedPoints[nShared] = pointI;
+                    nShared++;
+                }
+            }
+        }
+    }
+
+    // Clear markup list.  It will be used for the global processor point
+    forAll (markedPoints, meshI)
+    {
+        markedPoints[meshI] = -1;
+    }
+
+    // Provide global mark for all processors and communicate it across
+    // processor boundaries
+    forAll (meshes_, meshI)
+    {
+        if (meshes_.set(meshI))
+        {
+            const polyMesh& curMesh = meshes_[meshI];
+            const polyBoundaryMesh& patches = curMesh.boundaryMesh();
+
+            // Get shared points and assign global shared point index
+            const labelList& curSharedPoints = sharedPointLabels_[meshI];
+
+            // Prepare addressing into the global shared point list
+            labelList& curSharedAddr = sharedPointAddr_[meshI];
+            curSharedAddr.setSize(curSharedPoints.size());
+
+            labelList& curMarkedPoints = markedPoints[meshI];
+
+            forAll (curSharedPoints, spI)
+            {
+                if (curMarkedPoints[curSharedPoints[spI]] == -1)
+                {
+                    // Found new point.  Mark it and collect addressing
+                    curMarkedPoints[curSharedPoints[spI]] = nGlobalPoints_;
+
+                    // Collect addressing
+                    curSharedAddr[spI] = nGlobalPoints_;
+
+                    nGlobalPoints_++;
+                }
+                else
+                {
+                    // Point already marked.  Collect addressing
+                    curSharedAddr[spI] = curMarkedPoints[curSharedPoints[spI]];
+                }
+            }
+
+            // Communicate labels accross the boundary using processor patches
+            forAll (patches, patchI)
+            {
+                const polyMesh& curMesh = meshes_[meshI];
+                const polyBoundaryMesh& patches = curMesh.boundaryMesh();
+
+                // Get point marking
+                const labelList& curMarkedPoints = markedPoints[meshI];
+
+                const polyPatch& pp = patches[patchI];
+
+                if (isA<processorPolyPatch>(pp))
+                {
+                    // Found processor patch
+
+                    // My processor patch
+                    const processorPolyPatch& myProcPatch =
+                        refCast<const processorPolyPatch>(pp);
+
+                    const labelList& patchMeshPoints = pp.meshPoints();
+
+                    // Get neighbour processor ID
+                    const int nbrProcID = myProcPatch.neighbProcNo();
+
+                    // Neighbour patch
+                    const polyPatch& nbrPatch =
+                        meshes_[nbrProcID].boundaryMesh()
+                        [patchPairs[meshI][patchI]];
+
+                    const labelList& nbrMeshPoints = nbrPatch.meshPoints();
+
+                    forAll (patchMeshPoints, mpI)
+                    {
+                        if (curMarkedPoints[patchMeshPoints[mpI]] > -1)
+                        {
+                            // Mark opposite side
+                            markedPoints[nbrProcID][nbrMeshPoints[mpI]] =
+                                curMarkedPoints[patchMeshPoints[mpI]];
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Info<< "nGlobalPoints_: " << nGlobalPoints_ << nl
+        << "sharedPointLabels_: " << sharedPointLabels_ << nl
+        << "sharedPointAddr_: " << sharedPointAddr_ << endl;
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::sharedPoints::sharedPoints(const PtrList<fvMesh>& meshes)
+:
+    meshes_(meshes),
+    sharedPointAddr_(meshes_.size()),
+    sharedPointLabels_(meshes_.size()),
+    nGlobalPoints_(0)
+{
+    calcSharedPoints();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+// Foam::sharedPoints::~sharedPoints()
+// {}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+// void Foam::sharedPoints::operator=(const sharedPoints& rhs)
+// {
+//     // Check for assignment to self
+//     if (this == &rhs)
+//     {
+//         FatalErrorIn("Foam::sharedPoints::operator=(const Foam::sharedPoints&)")
+//             << "Attempted assignment to self"
+//             << abort(FatalError);
+//     }
+// }
+
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H
new file mode 100644
index 000000000..16c595da6
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H
@@ -0,0 +1,166 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::sharedPoints
+
+Description
+    Calculates points shared by more than two processor patches from a list
+    of meshes.
+
+    Works purely on topology.
+    Needs:
+      - domain to be one single domain (i.e. all faces can be reached through
+        face-cell walk).
+      - patch face ordering to be ok
+      - f[0] ordering on patch faces to be ok.
+
+    Works by constructing equivalence lists for all the points on processor
+    patches. These list are procPointList and give processor and meshPoint
+    label on that processor.
+    E.g.
+    @verbatim
+          ((7 93)(4 731)(3 114))
+    @endverbatim
+
+    means point 93 on proc7 is connected to point 731 on proc4 and 114 on proc3.
+    It then gets the lowest numbered processor (the 'master') to request a
+    sharedPoint label from processor0 and it redistributes this label back to
+    the other processors in the equivalence list.
+
+Note
+    Currently operating with a PtrList<fvMesh>, whereas the operation actually
+    works on PtrList<polyMesh> as well, due to the calling side
+
+Author
+    Hrvoje Jasak, Wikki Ltd.  All rights reserved
+
+SourceFiles
+    sharedPoints.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef sharedPoints_H
+#define sharedPoints_H
+
+#include "PtrList.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class sharedPoints Declaration
+\*---------------------------------------------------------------------------*/
+
+class sharedPoints
+{
+    // Private typedefs
+
+        //- Define procPointList as holding a list of meshPoint/processor labels
+        typedef FixedList<label, 2> procPoint;
+        typedef List<procPoint> procPointList;
+
+
+    // Private data
+
+        //- List of meshes
+        const PtrList<fvMesh>& meshes_;
+
+        //- Shared points used by this processor (= global point number)
+        labelListList sharedPointAddr_;
+
+        //- My mesh points corresponding to the shared points
+        labelListList sharedPointLabels_;
+
+        //- Total number of shared points.
+        label nGlobalPoints_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        sharedPoints(const sharedPoints&) = delete;
+
+        //- Disallow default bitwise assignment
+        void operator=(const sharedPoints&) = delete;
+
+
+        //- Calculate processor patch pairs
+        //  For each processor patch, find equivalent patch on other mesh
+        labelListList procPatchPairs() const;
+
+        //- Calculate shared points
+        void calcSharedPoints();
+
+
+public:
+
+    // Static data members
+
+
+    // Constructors
+
+        //- Construct from the list of meshes
+        sharedPoints(const PtrList<fvMesh>& meshes);
+
+
+    //- Destructor
+    ~sharedPoints() = default;
+
+
+    // Member Functions
+
+        // Access
+
+            //- Shared points used by this processor (= global point number)
+            inline const labelListList& sharedPointAddr() const
+            {
+                return sharedPointAddr_;
+            }
+
+            //- Local mesh points corresponding to the shared points
+            inline const labelListList& sharedPointLabels() const
+            {
+                return sharedPointLabels_;
+            }
+
+            //- Number of globally shared points
+            inline label nGlobalPoints() const
+            {
+                return nGlobalPoints_;
+            }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From ebfa7840c285cb4f856e80eb8ad98ea2b732cf72 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 16 Mar 2018 20:44:06 +0000
Subject: [PATCH 05/45] Load balancing development 2

---
 .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.C    | 30 ++++++----------
 .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.H    | 20 +++--------
 src/finiteVolume/fvMesh/fvMesh.C              | 36 ++++++++++++++++---
 src/finiteVolume/fvMesh/fvMesh.H              | 10 ++++++
 4 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
index fb4026f61..264a8620d 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
@@ -34,16 +34,19 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
+void fvBoundaryMesh::addFvPatches()
 {
-    setSize(basicBdry.size());
+    const polyBoundaryMesh& bMesh = mesh_.boundaryMesh();
+    
+    setSize(bMesh.size());
 
-    // Set boundary patches
+    // Set boundary patches, using the patches added to the polyMesh
+    // Bug fix.  HJ, 1/Mar/2018
     fvPatchList& Patches = *this;
 
     forAll(Patches, patchI)
     {
-        Patches.set(patchI, fvPatch::New(basicBdry[patchI], *this));
+        Patches.set(patchI, fvPatch::New(bMesh[patchI], *this));
     }
 }
 
@@ -55,21 +58,10 @@ fvBoundaryMesh::fvBoundaryMesh
     const fvMesh& m
 )
 :
-    fvPatchList(0),
-    mesh_(m)
-{}
-
-
-fvBoundaryMesh::fvBoundaryMesh
-(
-    const fvMesh& m,
-    const polyBoundaryMesh& basicBdry
-)
-:
-    fvPatchList(basicBdry.size()),
+    fvPatchList(m.boundaryMesh().size()),
     mesh_(m)
 {
-    addPatches(basicBdry);
+    addFvPatches();
 }
 
 
@@ -109,10 +101,10 @@ lduInterfacePtrsList fvBoundaryMesh::interfaces() const
 }
 
 
-void fvBoundaryMesh::readUpdate(const polyBoundaryMesh& basicBdry)
+void fvBoundaryMesh::readUpdate()
 {
     clear();
-    addPatches(basicBdry);
+    addFvPatches();
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
index 4fbf36543..e9e5d55f4 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
@@ -47,7 +47,7 @@ class fvMesh;
 class polyBoundaryMesh;
 
 /*---------------------------------------------------------------------------*\
-                           Class fvBoundaryMesh Declaration
+                       Class fvBoundaryMesh Declaration
 \*---------------------------------------------------------------------------*/
 
 class fvBoundaryMesh
@@ -70,14 +70,14 @@ private:
         //- Disallow assignment
         void operator=(const fvBoundaryMesh&);
 
-        //- Add fvPatches corresponding to the given polyBoundaryMesh
-        void addPatches(const polyBoundaryMesh&);
+        //- Add fvPatches corresponding to the polyBoundaryMesh
+        void addFvPatches();
 
 
 protected:
 
         //- Update boundary based on new polyBoundaryMesh
-        void readUpdate(const polyBoundaryMesh&);
+        void readUpdate();
 
 
 public:
@@ -87,18 +87,8 @@ public:
 
     // Constructors
 
-        //- Construct with zero size
-        fvBoundaryMesh
-        (
-            const fvMesh&
-        );
-
         //- Construct from polyBoundaryMesh
-        fvBoundaryMesh
-        (
-            const fvMesh&,
-            const polyBoundaryMesh&
-        );
+        fvBoundaryMesh(const fvMesh&);
 
 
     // Destructor - default
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 948e58d03..f5b87e4b1 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -124,7 +124,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
 :
     polyMesh(io),
     surfaceInterpolation(*this),
-    boundary_(*this, boundaryMesh()),
+    boundary_(*this),
     lduPtr_(NULL),
     curTimeIndex_(time().timeIndex()),
     VPtr_(NULL),
@@ -245,6 +245,34 @@ Foam::fvMesh::fvMesh
 }
 
 
+Foam::fvMesh::fvMesh
+(
+    const IOobject& io,
+    Istream& is,
+    const bool syncPar
+)
+:
+    polyMesh(io, is, syncPar),
+    surfaceInterpolation(*this),
+    boundary_(*this),
+    lduPtr_(NULL),
+    curTimeIndex_(time().timeIndex()),
+    VPtr_(NULL),
+    V0Ptr_(NULL),
+    V00Ptr_(NULL),
+    SfPtr_(NULL),
+    magSfPtr_(NULL),
+    CPtr_(NULL),
+    CfPtr_(NULL),
+    phiPtr_(NULL)
+{
+    if (debug)
+    {
+        Info<< "Constructing fvMesh from Istream" << endl;
+    }
+}
+
+
 Foam::fvMesh::fvMesh
 (
     const IOobject& io,
@@ -347,9 +375,9 @@ void Foam::fvMesh::addFvPatches
             << abort(FatalError);
     }
 
-    // first add polyPatches
+    // First add polyPatches
     addPatches(p, validBoundary);
-    boundary_.addPatches(boundaryMesh());
+    boundary_.addFvPatches();
 }
 
 
@@ -390,7 +418,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
             Info << "Boundary and topological update" << endl;
         }
 
-        boundary_.readUpdate(boundaryMesh());
+        boundary_.readUpdate();
 
         clearOut();
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 5edf00dda..22f973efc 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -178,6 +178,14 @@ public:
         //- Construct from IOobject
         explicit fvMesh(const IOobject& io);
 
+        //- Construct from Istream
+        fvMesh
+        (
+            const IOobject& io,
+            Istream& is,
+            const bool syncPar = true
+        );
+
         //- Construct from components without boundary.
         //  Boundary is added using addFvPatches() member function
         fvMesh
@@ -226,6 +234,8 @@ public:
         // Helpers
 
             //- Add boundary patches. Constructor helper
+            //  Note: adding polyPatches to polyMesh patches and
+            //  fvPatches to fvMesh
             void addFvPatches
             (
                 const List<polyPatch*>&,

From 06b5b787b8ce226fe3306dbcd7aabbe3a4411fb0 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 16 Mar 2018 20:45:02 +0000
Subject: [PATCH 06/45] Load balancing development 3

---
 .../derived/global/globalPointPatch.C         |   2 -
 .../derived/global/globalPointPatch.H         |   4 +-
 .../polyMesh/globalMeshData/globalMeshData.C  |   1 -
 .../polyMesh/globalMeshData/globalMeshData.H  |  12 +-
 .../polyMesh/globalMeshData/globalPoints.H    |   4 +-
 .../polyBoundaryMesh/polyBoundaryMesh.C       |  37 +++-
 .../polyBoundaryMesh/polyBoundaryMesh.H       |  12 +-
 src/foam/meshes/polyMesh/polyMesh.H           |  19 +-
 src/foam/meshes/polyMesh/polyMeshIO.C         | 181 ++++++++++++++++++
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C |  36 ++++
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H |  12 +-
 11 files changed, 298 insertions(+), 22 deletions(-)

diff --git a/src/foam/meshes/pointMesh/pointPatches/derived/global/globalPointPatch.C b/src/foam/meshes/pointMesh/pointPatches/derived/global/globalPointPatch.C
index 91ee1a950..5bbb2a0aa 100644
--- a/src/foam/meshes/pointMesh/pointPatches/derived/global/globalPointPatch.C
+++ b/src/foam/meshes/pointMesh/pointPatches/derived/global/globalPointPatch.C
@@ -168,6 +168,4 @@ const Foam::scalarField& Foam::globalPointPatch::ownNeiDoubleMask() const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/foam/meshes/pointMesh/pointPatches/derived/global/globalPointPatch.H b/src/foam/meshes/pointMesh/pointPatches/derived/global/globalPointPatch.H
index adec71633..3cfd241da 100644
--- a/src/foam/meshes/pointMesh/pointPatches/derived/global/globalPointPatch.H
+++ b/src/foam/meshes/pointMesh/pointPatches/derived/global/globalPointPatch.H
@@ -56,9 +56,6 @@ class globalPointPatch
 {
     // Private data
 
-        // //- Reference to the basic globalMeshData
-        // const globalMeshData& globalMeshData_;
-
         //- Index in the boundary mesh
         label index_;
 
@@ -109,6 +106,7 @@ public:
     //- Runtime type information
     TypeName("global");
 
+
     // Constructors
 
         //- Construct from components
diff --git a/src/foam/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/foam/meshes/polyMesh/globalMeshData/globalMeshData.C
index cd64a69a7..ae1c35895 100644
--- a/src/foam/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/foam/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -30,7 +30,6 @@ License
 #include "processorPolyPatch.H"
 #include "demandDrivenData.H"
 #include "globalPoints.H"
-//#include "geomGlobalPoints.H"
 #include "labelIOList.H"
 #include "PackedList.H"
 #include "mergePoints.H"
diff --git a/src/foam/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/foam/meshes/polyMesh/globalMeshData/globalMeshData.H
index 785229132..e2c526e5d 100644
--- a/src/foam/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/foam/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -241,12 +241,8 @@ public:
         globalMeshData(const IOobject& io, const polyMesh& mesh);
 
 
-    // Destructor
-
-        ~globalMeshData();
-
-        //- Remove all demand driven data
-        void clearOut();
+    //- Destructor
+    ~globalMeshData();
 
 
     // Member Functions
@@ -360,7 +356,6 @@ public:
             pointField geometricSharedPoints() const;
 
 
-
         // Globally shared edge addressing
 
             //- Return number of globally shared edges. Demand-driven
@@ -393,6 +388,9 @@ public:
             //  boundaries.
             void updateMesh();
 
+        //- Remove all demand driven data
+        void clearOut();
+
 
         // Write
 
diff --git a/src/foam/meshes/polyMesh/globalMeshData/globalPoints.H b/src/foam/meshes/polyMesh/globalMeshData/globalPoints.H
index f7931ea1e..adbbce91a 100644
--- a/src/foam/meshes/polyMesh/globalMeshData/globalPoints.H
+++ b/src/foam/meshes/polyMesh/globalMeshData/globalPoints.H
@@ -116,12 +116,13 @@ class cyclicPolyPatch;
 
 class globalPoints
 {
-    // Private classes
+    // Private typedefs
 
         //- Define procPointList as holding a list of meshPoint/processor labels
         typedef FixedList<label, 2> procPoint;
         typedef List<procPoint> procPointList;
 
+
     // Private data
 
         //- Mesh reference
@@ -253,7 +254,6 @@ public:
             {
                 return nGlobalPoints_;
             }
-
 };
 
 
diff --git a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 85cbf4e36..e1d3cf76b 100644
--- a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -111,6 +111,41 @@ Foam::polyBoundaryMesh::polyBoundaryMesh
 {}
 
 
+Foam::polyBoundaryMesh::polyBoundaryMesh
+(
+    const IOobject& io,
+    const polyMesh& mesh,
+    Istream& is
+)
+:
+    polyPatchList(),
+    regIOobject(io),
+    mesh_(mesh),
+    neighbourEdgesPtr_(NULL)
+{
+    polyPatchList& patches = *this;
+    token firstToken(is);
+    Pout<< "firstToken: " << firstToken << endl;
+    PtrList<entry> patchEntries(is);
+    patches.setSize(patchEntries.size());
+
+    forAll (patches, patchI)
+    {
+        patches.set
+        (
+            patchI,
+            polyPatch::New
+            (
+                patchEntries[patchI].keyword(),
+                patchEntries[patchI].dict(),
+                patchI,
+                *this
+            )
+        );
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::polyBoundaryMesh::~polyBoundaryMesh()
@@ -672,7 +707,7 @@ bool Foam::polyBoundaryMesh::writeData(Ostream& os) const
 
     os  << patches.size() << nl << token::BEGIN_LIST << incrIndent << nl;
 
-    forAll(patches, patchi)
+    forAll (patches, patchi)
     {
         os  << indent << patches[patchi].name() << nl
             << indent << token::BEGIN_BLOCK << nl
diff --git a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 88d1f7417..d6923c4b2 100644
--- a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -62,7 +62,7 @@ class polyBoundaryMesh
     public polyPatchList,
     public regIOobject
 {
-    // private data
+    // Private data
 
         //- Reference to mesh
         const polyMesh& mesh_;
@@ -117,9 +117,17 @@ public:
             const label size
         );
 
+        //- Construct from Istream
+        polyBoundaryMesh
+        (
+            const IOobject&,
+            const polyMesh&,
+            Istream&
+        );
+
 
     //- Destructor
-    ~polyBoundaryMesh();
+    virtual ~polyBoundaryMesh();
 
 
         //- Clear geometry at this level and at patches
diff --git a/src/foam/meshes/polyMesh/polyMesh.H b/src/foam/meshes/polyMesh/polyMesh.H
index 88128cbb8..d1d64d2cb 100644
--- a/src/foam/meshes/polyMesh/polyMesh.H
+++ b/src/foam/meshes/polyMesh/polyMesh.H
@@ -64,7 +64,10 @@ namespace Foam
 class globalMeshData;
 class mapPolyMesh;
 
-/*---------------------------------------------------------------------------*\
+class polyMesh;
+Ostream& operator<<(Ostream&, const polyMesh&);
+
+/*---------------------------------------------------------------------------* \
                           Class polyMesh Declaration
 \*---------------------------------------------------------------------------*/
 
@@ -73,7 +76,6 @@ class polyMesh
     public objectRegistry,
     public primitiveMesh
 {
-
 public:
 
     // Public data types
@@ -242,6 +244,14 @@ public:
         //- Construct from IOobject
         explicit polyMesh(const IOobject& io);
 
+        //- Construct from Istream
+        polyMesh
+        (
+            const IOobject& io,
+            Istream& is,
+            const bool syncPar = true
+        );
+
         //- Construct from components without boundary.
         //  Boundary is added using addPatches() member function
         polyMesh
@@ -570,6 +580,11 @@ public:
 
             //- Find cell enclosing this location (-1 if not in mesh)
             label findCell(const point&) const;
+
+
+        // IOstream Operators
+
+            friend Ostream& operator<<(Ostream&, const polyMesh&);
 };
 
 
diff --git a/src/foam/meshes/polyMesh/polyMeshIO.C b/src/foam/meshes/polyMesh/polyMeshIO.C
index 419f7c65f..20a0bfdba 100644
--- a/src/foam/meshes/polyMesh/polyMeshIO.C
+++ b/src/foam/meshes/polyMesh/polyMeshIO.C
@@ -25,10 +25,174 @@ License
 
 #include "polyMesh.H"
 #include "foamTime.H"
+#include "IOstream.H"
 #include "cellIOList.H"
 #include "meshObjectBase.H"
 #include "mapPolyMesh.H"
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::polyMesh::polyMesh
+(
+    const IOobject& io,
+    Istream& is,
+    const bool syncPar
+)
+:
+    objectRegistry(io),
+    primitiveMesh(),
+    allPoints_
+    (
+        IOobject
+        (
+            "points",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        pointField(is)
+    ),
+    // To be re-sliced later.  HJ, 19/Oct/2008
+    points_(allPoints_, allPoints_.size()),
+    allFaces_
+    (
+        IOobject
+        (
+            "faces",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        faceList(is)
+    ),
+    // To be re-sliced later.  HJ, 19/Oct/2008
+    faces_(allFaces_, allFaces_.size()),
+    owner_
+    (
+        IOobject
+        (
+            "owner",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        labelList(is)
+    ),
+    neighbour_
+    (
+        IOobject
+        (
+            "neighbour",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        labelList(is)
+    ),
+    clearedPrimitives_(false),
+    boundary_
+    (
+        IOobject
+        (
+            "boundary",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        *this,
+        is
+    ),
+    bounds_(allPoints_, syncPar),
+    geometricD_(Vector<label>::zero),
+    solutionD_(Vector<label>::zero),
+    comm_(Pstream::worldComm),
+    pointZones_
+    (
+        IOobject
+        (
+            "pointZones",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        *this,
+        is
+    ),
+    faceZones_
+    (
+        IOobject
+        (
+            "faceZones",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        *this,
+        is
+    ),
+    cellZones_
+    (
+        IOobject
+        (
+            "cellZones",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        *this,
+        is
+    ),
+    globalMeshDataPtr_(NULL),
+    moving_(false),
+    changing_(false),
+    curMotionTimeIndex_(time().timeIndex()),
+    oldAllPointsPtr_(NULL),
+    oldPointsPtr_(NULL)
+{
+    // Check if the faces and cells are valid
+    forAll (allFaces_, faceI)
+    {
+        const face& curFace = allFaces_[faceI];
+
+        if (min(curFace) < 0 || max(curFace) > allPoints_.size())
+        {
+            FatalErrorIn
+            (
+                "polyMesh::polyMesh\n"
+                "(\n"
+                "    const IOobject& io,\n"
+                "    const pointField& points,\n"
+                "    const faceList& faces,\n"
+                "    const cellList& cells\n"
+                ")\n"
+            )   << "Face " << faceI << "contains vertex labels out of range: "
+                << curFace << " Max point index = " << allPoints_.size()
+                << abort(FatalError);
+        }
+    }
+
+    // Set the primitive mesh
+    initMesh();
+}
+
+
+    
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::polyMesh::setInstance(const fileName& inst)
@@ -482,4 +646,21 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
 }
 
 
+// * * * * * * * * * * * * IOstream operators  * * * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const polyMesh& m)
+{
+    os  << m.allPoints() << nl
+        << m.allFaces() << nl
+        << m.faceOwner() << nl
+        << m.faceNeighbour() << nl
+        << m.boundaryMesh() << nl
+        << m.pointZones() << nl
+        << m.faceZones() << nl
+        << m.cellZones();
+
+    return os;
+}
+
+
 // ************************************************************************* //
diff --git a/src/foam/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/foam/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index 64354ab4e..57a947de6 100644
--- a/src/foam/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/foam/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -150,6 +150,42 @@ ZoneMesh<ZoneType, MeshType>::ZoneMesh
 {}
 
 
+// Read constructor given IOobject, a MeshType reference and Istream
+template<class ZoneType, class MeshType>
+ZoneMesh<ZoneType, MeshType>::ZoneMesh
+(
+    const IOobject& io,
+    const MeshType& mesh,
+    Istream& is
+)
+:
+    PtrList<ZoneType>(),
+    regIOobject(io),
+    mesh_(mesh),
+    zoneMapPtr_(NULL)
+{
+    PtrList<ZoneType>& zones = *this;
+
+    PtrList<entry> zoneEntries(is);
+    zones.setSize(zoneEntries.size());
+
+    forAll(zones, zoneI)
+    {
+        zones.set
+        (
+            zoneI,
+            ZoneType::New
+            (
+                zoneEntries[zoneI].keyword(),
+                zoneEntries[zoneI].dict(),
+                zoneI,
+                *this
+            )
+        );
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class ZoneType, class MeshType>
diff --git a/src/foam/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/foam/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
index ae4a89b49..170023e72 100644
--- a/src/foam/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
+++ b/src/foam/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
@@ -108,9 +108,17 @@ public:
             const label size
         );
 
-    // Destructor
+        //- Construct from Istream
+        ZoneMesh
+        (
+            const IOobject&,
+            const MeshType&,
+            Istream&
+        );
 
-        ~ZoneMesh();
+
+    //- Destructor
+    ~ZoneMesh();
 
 
     // Member functions

From f77f4991e6b19f1e3a906797726ab3bfd1c29cf1 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 16 Mar 2018 20:45:18 +0000
Subject: [PATCH 07/45] Bugfix: boundary condition update

---
 .../basic/basicSymmetry/BasicSymmetryPointPatchField.C        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/foam/fields/PointPatchFieldTemplates/basic/basicSymmetry/BasicSymmetryPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/basic/basicSymmetry/BasicSymmetryPointPatchField.C
index 6c536e7bb..a9ddc6652 100644
--- a/src/foam/fields/PointPatchFieldTemplates/basic/basicSymmetry/BasicSymmetryPointPatchField.C
+++ b/src/foam/fields/PointPatchFieldTemplates/basic/basicSymmetry/BasicSymmetryPointPatchField.C
@@ -133,7 +133,7 @@ BasicSymmetryPointPatchField
 :
     ValuePointPatchField<PatchField, Mesh, PointPatch, MatrixType, Type>(p, iF)
 {
-    updateBoundaryField();
+    // Cannot update boundary: internal field not set.  HJ, 28/Feb/2018
 }
 
 
@@ -178,7 +178,7 @@ BasicSymmetryPointPatchField
     ValuePointPatchField
         <PatchField, Mesh, PointPatch, MatrixType, Type>(ptf, iF)
 {
-    updateBoundaryField();
+    // Cannot update boundary: internal field not set.  HJ, 28/Feb/2018
 }
 
 

From 40e5a3d38c560b517dd8e67fd0f737629be7f36b Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Sun, 18 Mar 2018 12:42:11 +0000
Subject: [PATCH 08/45] Load-balancing fvMesh, initial version

---
 .../dynamicFvMesh/dynamicFvMesh.H             |   5 +-
 .../solidBodyMotionFvMesh.H                   |   5 +-
 .../attachDetach/attachDetach.H               |   5 +-
 src/dynamicMesh/loadBalanceFvMesh/Make/files  |   4 +
 .../loadBalanceFvMesh/Make/options            |  11 +
 .../dynamicMeshLoadBalance.C                  | 288 +++++++++++++++
 .../dynamicMeshLoadBalance.H                  | 145 ++++++++
 .../loadBalanceFvMesh/loadBalanceFvMesh.C     | 338 ++++++++++++++++++
 .../loadBalanceFvMesh/loadBalanceFvMesh.H     | 106 ++++++
 9 files changed, 898 insertions(+), 9 deletions(-)
 create mode 100644 src/dynamicMesh/loadBalanceFvMesh/Make/files
 create mode 100644 src/dynamicMesh/loadBalanceFvMesh/Make/options
 create mode 100644 src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.C
 create mode 100644 src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.H
 create mode 100644 src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
 create mode 100644 src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H

diff --git a/src/dynamicMesh/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H b/src/dynamicMesh/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
index 2c668b754..89e1fdd92 100644
--- a/src/dynamicMesh/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
+++ b/src/dynamicMesh/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
@@ -120,9 +120,8 @@ public:
         static autoPtr<dynamicFvMesh> New(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~dynamicFvMesh();
+    //- Destructor
+    virtual ~dynamicFvMesh();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H b/src/dynamicMesh/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H
index be387c6dc..2eec1cbfc 100644
--- a/src/dynamicMesh/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H
+++ b/src/dynamicMesh/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H
@@ -87,9 +87,8 @@ public:
         explicit solidBodyMotionFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~solidBodyMotionFvMesh();
+    //- Destructor
+    virtual ~solidBodyMotionFvMesh();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachDetach.H b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachDetach.H
index 514e15e24..790aca705 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachDetach.H
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachDetach.H
@@ -171,9 +171,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~attachDetach();
+    //- Destructor
+    virtual ~attachDetach();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/loadBalanceFvMesh/Make/files b/src/dynamicMesh/loadBalanceFvMesh/Make/files
new file mode 100644
index 000000000..c894e9601
--- /dev/null
+++ b/src/dynamicMesh/loadBalanceFvMesh/Make/files
@@ -0,0 +1,4 @@
+dynamicMeshLoadBalance/dynamicMeshLoadBalance.C
+loadBalanceFvMesh/loadBalanceFvMesh.C
+
+LIB = $(FOAM_LIBBIN)/libloadBalanceFvMesh
diff --git a/src/dynamicMesh/loadBalanceFvMesh/Make/options b/src/dynamicMesh/loadBalanceFvMesh/Make/options
new file mode 100644
index 000000000..f0e511327
--- /dev/null
+++ b/src/dynamicMesh/loadBalanceFvMesh/Make/options
@@ -0,0 +1,11 @@
+EXE_INC = \
+    -I$(LIB_SRC)/decompositionMethods/decomposeReconstruct/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude
+
+LIB_LIBS =  \
+    -ldecomposeReconstruct\
+    -lfiniteVolume \
+    -ldynamicMesh \
+    -ldynamicFvMesh
diff --git a/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.C b/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.C
new file mode 100644
index 000000000..8ce1a1500
--- /dev/null
+++ b/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.C
@@ -0,0 +1,288 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "dynamicMeshLoadBalance.H"
+#include "volFields.H"
+
+#include "domainDecomposition.H"
+#include "fvFieldDecomposer.H"
+
+#include "processorMeshesReconstructor.H"
+#include "fvFieldReconstructor.H"
+#include "mapPolyMesh.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+// namespace Foam
+// {
+//     defineTypeNameAndDebug(dynamicMeshLoadBalance, 0);
+
+//     addToRunTimeSelectionTable
+//     (
+//         topoChangerFvMesh,
+//         dynamicFvMesh,
+//         IOobject
+//     );
+// }
+
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::dynamicMeshLoadBalance::dynamicMeshLoadBalance(dynamicFvMesh& mesh)
+:
+    mesh_(mesh),
+    dict_
+    (
+        IOdictionary
+        (
+            IOobject
+            (
+                "decomposeParDict",
+                mesh_.time().system(),
+                mesh_,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE,
+                false
+            )
+        )
+    ),
+    imbalanceTrigger_(readScalar(dict_.lookup("imbalanceTrigger")))
+{
+    // Check imbalance trigger
+    if (imbalanceTrigger_ < SMALL || imbalanceTrigger_ > 1)
+    {
+        WarningIn
+        (
+            "dynamicMeshLoadBalance::"
+            "dynamicMeshLoadBalance(dynamicFvMesh& mesh)"
+        )   << "Invalid imbalance trigger " << imbalanceTrigger_
+            << " Should be between 0 and 1.  Resetting to 0.8"
+            << endl;
+
+        imbalanceTrigger_ = 0.8;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::dynamicMeshLoadBalance::~dynamicMeshLoadBalance()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::mapPolyMesh>
+Foam::dynamicMeshLoadBalance::updateMesh() const
+{
+    Info<< "Hello from dynamicMeshLoadBalance::updateMesh()" << endl;
+    
+    // Create a parallel decomposition
+    domainDecomposition meshDecomp
+    (
+        mesh_,
+        dict_
+    );
+
+    // Decompose the mesh based on processor data
+    meshDecomp.decomposeMesh(false);
+
+    // Analyse mesh decomposition to see how many cells are passed to which processor
+    labelListList migratedCells(meshDecomp.nProcs());
+
+    // Fill local list with number of local cells to be sent to each processor
+    // First index = my processor.  Second index = processor to send to
+    labelList& curMigratedCells = migratedCells[Pstream::myProcNo()];
+
+    curMigratedCells.setSize(Pstream::myProcNo(), 0);
+
+    const labelList& cellToProc = meshDecomp.cellToProc();
+
+    forAll (cellToProc, cellI)
+    {
+        curMigratedCells[cellToProc[cellI]]++;
+    }
+
+    // Now that each processor has filled in its own part, combine the data
+    Pstream::gatherList(migratedCells);
+    Pstream::scatterList(migratedCells);
+
+    // Reading through second index now tells how many cells will arrive
+    // from which processor
+
+
+    // Split the mesh and fields over processors and send
+    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            Info<< "Processor " << procI << ": send mesh and fields"
+                << endl;
+
+            // Check if there is a mesh to send
+            if (curMigratedCells[procI] > 0)
+            {
+                // Send mesh and field to processor procI
+
+                // Get mesh from decomposition
+                autoPtr<fvMesh> procMeshPtr = meshDecomp.processorMesh
+                (
+                    procI,
+                    mesh_.time(),
+                    "processorPart" + name(procI)
+                );
+                fvMesh& procMesh = procMeshPtr();
+
+                // Create a field decomposer
+                fvFieldDecomposer fieldDecomposer
+                (
+                    mesh_,
+                    procMesh,
+                    meshDecomp.procFaceAddressing()[procI],
+                    meshDecomp.procCellAddressing()[procI],
+                    meshDecomp.procBoundaryAddressing()[procI]
+                );
+/*
+                // Simple test only: rebalance volScalarFields
+                HashTable<const volScalarField*> volScalarFields =
+                    mesh_.thisDb().lookupClass<volScalarField>();
+
+                for
+                (
+                    HashTable<const volScalarField*>::const_iterator iter =
+                        volScalarFields.begin();
+                    iter != volScalarFields.end();
+                    ++iter
+                )
+                {
+                    fieldDecomposer.decomposeField(*(iter()));
+                }
+*/
+
+                // Note: communication can be optimised.  HJ, 27/Feb/2018
+                OPstream toProc
+                (
+                    Pstream::nonBlocking,
+                    procI
+                );
+
+                // Send the mesh and fields to target processor
+                toProc << procMesh;
+            }
+        }
+    }
+
+
+    // Collect pieces of mesh and fields from other processors
+
+    // Create a list of processor meshes
+    // Create the reconstructor
+    processorMeshesReconstructor meshRecon("reconstructed");
+
+    PtrList<fvMesh>& procMeshes = meshRecon.meshes();
+    procMeshes.setSize(meshDecomp.nProcs());
+
+    List<PtrList<volScalarField*> > receiveVolScalarFields
+    (
+        meshDecomp.nProcs()
+    );
+
+    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            // Check if there is a mesh to send
+            if (migratedCells[procI][Pstream::myProcNo()] > 0)
+            {
+                Info<< "Processor " << procI << ": receive mesh and fields"
+                    << endl;
+
+                // Note: communication can be optimised.  HJ, 27/Feb/2018
+                IPstream fromProc
+                (
+                    Pstream::nonBlocking,
+                    procI
+                );
+
+                // Receive the mesh
+                procMeshes.set
+                (
+                    procI,
+                    new fvMesh
+                    (
+                        IOobject
+                        (
+                            "processorPart" + name(procI),
+                            mesh_.time().timeName(),
+                            mesh_.time(),
+                            IOobject::NO_READ,
+                            IOobject::NO_WRITE
+                        ),
+                        fromProc,
+                        false             // Do not sync
+                    )
+                );
+
+                // Receive the fields
+            }
+        }
+        else
+        {
+            // Insert own mesh
+        }
+    }
+
+    // Create the reconstructed mesh
+    autoPtr<fvMesh> reconstructedMeshPtr =
+        meshRecon.reconstructMesh(mesh_.time());
+    const fvMesh& reconstructedMesh = reconstructedMeshPtr();
+
+    // Create field reconstructor
+    fvFieldReconstructor fieldReconstructor
+    (
+        mesh_,
+        procMeshes,
+        meshRecon.faceProcAddressing(),
+        meshRecon.cellProcAddressing(),
+        meshRecon.boundaryProcAddressing()
+    );
+
+    // Create mapPolyMesh
+
+    // DUMMY!!!
+    autoPtr<mapPolyMesh> tmpm(new mapPolyMesh(mesh_));
+
+    return tmpm;
+}
+
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.H b/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.H
new file mode 100644
index 000000000..8c746709c
--- /dev/null
+++ b/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.H
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::dynamicMeshLoadBalance
+
+Description
+    Dynamic mesh load balance class.
+    The modifier will examine the weighted imbalance in the mesh to determine
+    when the load distribution is no longer satisfactory.
+    Imbalance is measured as a weighted field over all cells and is checked over
+    a parallel decomposition
+    When load balance is detected:
+    - parallel-aware decompositionMethod to receive the cell-to-processor
+    assignment on each processor
+    - polyMesh is split into parts and point, face, cell, boundary addressing
+    objects are created
+    - tools equivalent to decomposePar are used to split up the original mesh
+    into processor parts
+    - for each processor piece:
+        - the new mesh is built, ready to be transferred to a processor
+        - fields are subset onto each processor mesh
+        - mesh and fields are passed onto the target processor
+    - ALL DECOMPOSITION PIECES ARE CLEARED AFTER SEND, AND RE-USED ONTO RECEIVE
+    - processor pieces are received from all components
+    - new mesh is built by inserting processor pieces in order of processors
+    - for each processor piece:
+        - if different from myProcNo, point, face, cell, boundary addressing
+        objects are created
+        - if equal to myProcNo, a mapPolyMesh object is assembled
+    - once the complete mesh is built, updateMesh is called on the local
+    processor.  This will re-map local data and re-size the fields
+    - when completed, tools equivalent to reconstructPar are used to rebuild
+    the parts of fields from other processors
+
+SourceFiles
+    dynamicMeshLoadBalance.C
+    dynamicMeshLoadBalanceIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef dynamicMeshLoadBalance_H
+#define dynamicMeshLoadBalance_H
+
+#include "dynamicFvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+
+/*---------------------------------------------------------------------------*\
+                     Class dynamicMeshLoadBalance Declaration
+\*---------------------------------------------------------------------------*/
+
+class dynamicMeshLoadBalance
+{
+    // Private data
+
+        //- Dynamic mesh reference
+        dynamicFvMesh& mesh_;
+
+        //- Decomposition dictionary
+        IOdictionary dict_;
+
+        //- Imbalance trigger 0 < imbalance < 1
+        scalar imbalanceTrigger_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        dynamicMeshLoadBalance(const dynamicMeshLoadBalance&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const dynamicMeshLoadBalance&);
+
+
+        //- Send mesh to other processor
+            static void sendMesh
+            (
+                const fvMesh& mesh,
+                Ostream& os
+            );
+    
+public:
+
+    // //- Runtime type information
+    // TypeName("testLoadBalanceFvMesh");
+
+
+    // Constructors
+
+        //- Construct from dynamic mesh
+        dynamicMeshLoadBalance(dynamicFvMesh&);
+
+
+    //- Destructor
+    ~dynamicMeshLoadBalance();
+
+
+    // Member Functions
+
+        //- Check balance.  Return true if re-balancing is required
+        bool checkLoadBalance(const scalarField& weights) const;
+
+        //- Update mesh
+        autoPtr<mapPolyMesh> updateMesh() const;
+
+        //- Update fields
+        void updateFields() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
new file mode 100644
index 000000000..17c8c619f
--- /dev/null
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
@@ -0,0 +1,338 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "loadBalanceFvMesh.H"
+#include "domainDecomposition.H"
+#include "fvFieldDecomposer.H"
+
+#include "processorMeshesReconstructor.H"
+#include "fvFieldReconstructor.H"
+#include "mapPolyMesh.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(loadBalanceFvMesh, 0);
+    addToRunTimeSelectionTable(dynamicFvMesh, loadBalanceFvMesh, IOobject);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::loadBalanceFvMesh::checkLoadBalance
+(
+    const scalarField& weights
+) const
+{
+    if (Pstream::parRun())
+    {
+        // Calculate local and global load
+        scalar localLoad = sum(weights);
+
+        scalar globalLoad = localLoad;
+
+        reduce(globalLoad, sumOp<scalar>());
+
+        globalLoad /= Pstream::nProcs();
+
+        // Calculate imbalance as min of localLoad/globalLoad
+        scalar imbalance = mag(1 - localLoad/globalLoad);
+
+        reduce(imbalance, minOp<scalar>());
+
+        Info<< "Global imbalance: " << imbalance << endl;
+
+        if (imbalance < imbalanceTrigger_)
+        {
+            return true;
+        }
+    }
+
+    // Serial run or low imbalance: no balancing possible
+    return false;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::loadBalanceFvMesh::loadBalanceFvMesh(const IOobject& io)
+:
+    dynamicFvMesh(io),
+    dynamicMeshCoeffs_
+    (
+        IOdictionary
+        (
+            IOobject
+            (
+                "dynamicMeshDict",
+                time().constant(),
+                *this,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        ).subDict(typeName + "Coeffs")
+    ),
+    imbalanceTrigger_
+    (
+        readScalar(dynamicMeshCoeffs_.lookup("imbalanceTrigger"))
+    )
+{
+    // Check imbalance trigger
+    if (imbalanceTrigger_ < SMALL || imbalanceTrigger_ > 1)
+    {
+        WarningIn
+        (
+            "loadBalanceFvMesh::"
+            "loadBalanceFvMesh(const IOobject& io)"
+        )   << "Invalid imbalance trigger " << imbalanceTrigger_
+            << " Should be between 0 and 1.  Resetting to 0.8"
+            << endl;
+
+        imbalanceTrigger_ = 0.8;
+    }
+
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::loadBalanceFvMesh::~loadBalanceFvMesh()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::loadBalanceFvMesh::update()
+{
+    if (!Pstream::parRun())
+    {
+        InfoIn("bool loadBalanceFvMesh::update()")
+            << "Load balancing a serial run.  Skipping."
+            << endl;
+
+        return false;
+    }
+            
+    Info<< "Hello from loadBalanceFvMesh::update()" << endl;
+
+    // Check imbalance.  Note: add run-time selection for the imbalance
+    // weights criterion
+    
+    // Create a parallel decomposition
+    domainDecomposition meshDecomp
+    (
+        *this,
+        dynamicMeshCoeffs_
+    );
+
+    // Decompose the mesh based on processor data
+    meshDecomp.decomposeMesh(false);
+
+    // Analyse mesh decomposition to see how many cells are passed to which processor
+    labelListList migratedCells(meshDecomp.nProcs());
+
+    // Fill local list with number of local cells to be sent to each processor
+    // First index = my processor.  Second index = processor to send to
+    labelList& curMigratedCells = migratedCells[Pstream::myProcNo()];
+
+    curMigratedCells.setSize(Pstream::nProcs(), 0);
+
+    const labelList& cellToProc = meshDecomp.cellToProc();
+
+    forAll (cellToProc, cellI)
+    {
+        curMigratedCells[cellToProc[cellI]]++;
+    }
+
+    // Now that each processor has filled in its own part, combine the data
+    Pstream::gatherList(migratedCells);
+    Pstream::scatterList(migratedCells);
+    Pout<< "migratedCells: " << migratedCells << endl;
+    // Reading through second index now tells how many cells will arrive
+    // from which processor
+
+
+    // Split the mesh and fields over processors and send
+    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            Pout<< "Send mesh and fields to processor " << procI << endl;
+
+            // Check if there is a mesh to send
+            if (curMigratedCells[procI] > 0)
+            {
+                // Send mesh and field to processor procI
+
+                // Get mesh from decomposition
+                autoPtr<fvMesh> procMeshPtr = meshDecomp.processorMesh
+                (
+                    procI,
+                    time(),
+                    "processorPart" + Foam::name(procI)
+                );
+                fvMesh& procMesh = procMeshPtr();
+
+                // Create a field decomposer
+                fvFieldDecomposer fieldDecomposer
+                (
+                    *this,
+                    procMesh,
+                    meshDecomp.procFaceAddressing()[procI],
+                    meshDecomp.procCellAddressing()[procI],
+                    meshDecomp.procBoundaryAddressing()[procI]
+                );
+/*
+                // Simple test only: rebalance volScalarFields
+                HashTable<const volScalarField*> volScalarFields =
+                    thisDb().lookupClass<volScalarField>();
+
+                for
+                (
+                    HashTable<const volScalarField*>::const_iterator iter =
+                        volScalarFields.begin();
+                    iter != volScalarFields.end();
+                    ++iter
+                )
+                {
+                    fieldDecomposer.decomposeField(*(iter()));
+                }
+*/
+
+                OPstream toProc
+                (
+                    Pstream::blocking,
+                    procI
+                );
+
+                // Send the mesh and fields to target processor
+                toProc << procMesh;
+            }
+        }
+    }
+
+
+    // Collect pieces of mesh and fields from other processors
+
+    // Create a list of processor meshes
+    // Create the reconstructor
+    processorMeshesReconstructor meshRecon("reconstructed");
+
+    PtrList<fvMesh>& procMeshes = meshRecon.meshes();
+    procMeshes.setSize(meshDecomp.nProcs());
+
+    List<PtrList<volScalarField*> > receiveVolScalarFields
+    (
+        meshDecomp.nProcs()
+    );
+
+    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            // Check if there is a mesh to send
+            if (migratedCells[procI][Pstream::myProcNo()] > 0)
+            {
+                Info<< "Processor " << procI << ": receive mesh and fields"
+                    << endl;
+
+                // Note: communication can be optimised.  HJ, 27/Feb/2018
+                IPstream fromProc
+                (
+                    Pstream::blocking,
+                    procI
+                );
+
+                // Receive the mesh
+                procMeshes.set
+                (
+                    procI,
+                    new fvMesh
+                    (
+                        IOobject
+                        (
+                            "processorPart" + Foam::name(procI),
+                            time().timeName(),
+                            time(),
+                            IOobject::NO_READ,
+                            IOobject::NO_WRITE
+                        ),
+                        fromProc,
+                        false             // Do not sync
+                    )
+                );
+                Pout<< "Received " << procI << " mesh stats: "
+                    << " polyPatches: "
+                    << procMeshes[procI].boundaryMesh().size()
+                    << " patches: "
+                    << procMeshes[procI].boundary().size()
+                    << endl;
+                // Receive the fields
+            }
+        }
+        else
+        {
+            // Insert own mesh
+            procMeshes.set(procI, this);
+        }
+    }
+
+    // Create the reconstructed mesh
+    autoPtr<fvMesh> reconstructedMeshPtr =
+        meshRecon.reconstructMesh(time());
+    fvMesh& reconMesh = reconstructedMeshPtr();
+
+    Pout<< "Reconstructed mesh stats: "
+        << " nCells: " << reconMesh.nCells()
+        << " polyPatches: "
+        << reconMesh.boundaryMesh().size()
+        << " patches: "
+        << reconMesh.boundary().size()
+        << endl;
+
+    // Create field reconstructor
+    // fvFieldReconstructor fieldReconstructor
+    // (
+    //     *this,
+    //     procMeshes,
+    //     meshRecon.faceProcAddressing(),
+    //     meshRecon.cellProcAddressing(),
+    //     meshRecon.boundaryProcAddressing()
+    // );
+
+
+    // Note: Local mesh and fields need to be removed from the PtrList
+    // before the destruction and from autoPtr.
+    // Otherwise, they will be deleted.  HJ, 5/Mar/2018
+    autoPtr<fvMesh> curMesh = procMeshes.set(Pstream::myProcNo(), NULL);
+    curMesh.ptr();
+    
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H
new file mode 100644
index 000000000..edda17a1a
--- /dev/null
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::loadBalanceFvMesh
+
+Description
+    Load balancing fvMesh
+
+SourceFiles
+    loadBalanceFvMesh.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef loadBalanceFvMesh_H
+#define loadBalanceFvMesh_H
+
+#include "dynamicFvMesh.H"
+#include "dictionary.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class loadBalanceFvMesh Declaration
+\*---------------------------------------------------------------------------*/
+
+class loadBalanceFvMesh
+:
+    public dynamicFvMesh
+{
+    // Private data
+
+        //- Dictionary of motion control parameters
+        dictionary dynamicMeshCoeffs_;
+
+        //- Imbalance trigger 0 < imbalance < 1
+        scalar imbalanceTrigger_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        loadBalanceFvMesh(const loadBalanceFvMesh&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const loadBalanceFvMesh&);
+
+        //- Check balance.  Return true if re-balancing is required
+        bool checkLoadBalance(const scalarField& weights) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("loadBalanceFvMesh");
+
+
+    // Constructors
+
+        //- Construct from IOobject
+        explicit loadBalanceFvMesh(const IOobject& io);
+
+
+    //- Destructor
+    virtual ~loadBalanceFvMesh();
+
+
+    // Member Functions
+
+        //- Update the mesh for both mesh motion and topology change
+        virtual bool update();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 87d9e2f39652efb7666df043497144ec6eac6d16 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Sun, 18 Mar 2018 12:43:04 +0000
Subject: [PATCH 09/45] Load balancing development

---
 src/finiteArea/faMesh/faMesh.C                  |  8 ++++++--
 src/finiteArea/faMesh/faMeshDemandDrivenData.C  | 10 ++++------
 .../faPatches/constraint/cyclic/cyclicFaPatch.C |  6 ------
 .../faPatches/constraint/cyclic/cyclicFaPatch.H |  7 -------
 .../constraint/processor/processorFaPatch.C     | 17 +++++++++++++----
 .../faMesh/faPatches/faPatch/faPatch.C          |  7 +++++++
 .../faMesh/faPatches/faPatch/faPatch.H          | 10 ++++++++++
 .../immersedBoundaryDynamicMesh/Make/files      |  3 +--
 .../immersedBoundaryDynamicMesh/Make/options    |  2 +-
 9 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index bb9d84f8e..677199a92 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -1270,6 +1270,12 @@ const Foam::lduAddressing& Foam::faMesh::lduAddr() const
 
 bool Foam::faMesh::movePoints() const
 {
+    if (debug)
+    {
+        InfoIn("bool faMesh::movePoints() const")
+            << "Moving points" << endl;
+    }
+
     // Grab point motion from polyMesh
     const vectorField& newPoints = mesh().allPoints();
 
@@ -1278,13 +1284,11 @@ bool Foam::faMesh::movePoints() const
     {
         if (S00Ptr_ && S0Ptr_)
         {
-            Info<< "Copy old-old S" << endl;
             *S00Ptr_ = *S0Ptr_;
         }
 
         if (S0Ptr_)
         {
-            Info<< "Copy old S" << endl;
             *S0Ptr_ = S();
         }
         else
diff --git a/src/finiteArea/faMesh/faMeshDemandDrivenData.C b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
index 07862c40b..188d7e131 100644
--- a/src/finiteArea/faMesh/faMeshDemandDrivenData.C
+++ b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
@@ -128,10 +128,8 @@ void faMesh::calcLe() const
             *this,
             dimLength
         );
-
     edgeVectorField& Le = *LePtr_;
 
-
     const pointField& pPoints = points();
     const edgeList& pEdges = edges();
 
@@ -187,16 +185,16 @@ void faMesh::calcLe() const
             patchLe[edgeI] *=
               - sign
                 (
-                    patchLe[edgeI]&
-                    (
+                    patchLe[edgeI]
+                  & (
                         fCentresInternal[bndEdgeFaces[edgeI]]
                       - patchECentres[edgeI]
                     )
                 );
 
             patchLe[edgeI] *=
-                magLe().boundaryField()[patchI][edgeI]
-                /mag(patchLe[edgeI]);
+                magLe().boundaryField()[patchI][edgeI]/
+                mag(patchLe[edgeI]);
         }
     }
 }
diff --git a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
index b151d3f93..1ef8ee838 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
@@ -38,12 +38,6 @@ namespace Foam
 defineTypeNameAndDebug(cyclicFaPatch, 0);
 addToRunTimeSelectionTable(faPatch, cyclicFaPatch, dictionary);
 
-const Foam::debug::tolerancesSwitch cyclicFaPatch::matchTol_
-(
-    "patchFaceMatchTol",
-    1e-3
-);
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::cyclicFaPatch::calcTransforms()
diff --git a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.H b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.H
index d81481e94..1685efcd9 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.H
+++ b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.H
@@ -38,7 +38,6 @@ SourceFiles
 #include "coupledFaPatch.H"
 #include "cyclicLduInterface.H"
 #include "cyclicPolyPatch.H"
-#include "tolerancesSwitch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,12 +61,6 @@ class cyclicFaPatch
 
 protected:
 
-    // Protected static data
-
-        //- Relative tolerance (for geometric matching). Is factor of
-        //  maximum edge length per face.
-        static const debug::tolerancesSwitch matchTol_;
-
     // Protected Member functions
 
         //- Make patch weighting factors
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
index 42c833f55..ce563a6b0 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
@@ -29,6 +29,7 @@ Description
 #include "addToRunTimeSelectionTable.H"
 #include "IPstream.H"
 #include "OPstream.H"
+#include "IOmanip.H"
 #include "transformField.H"
 #include "faBoundaryMesh.H"
 #include "faMesh.H"
@@ -209,17 +210,25 @@ void processorFaPatch::calcGeometry()
         forAll(magEl, edgei)
         {
             scalar nmagEl = mag(neighbEdgeLengths_[edgei]);
-            scalar avEl = (magEl[edgei] + nmagEl)/2.0;
+            scalar maxEl = Foam::max(magEl[edgei], nmagEl);
 
-            if (mag(magEl[edgei] - nmagEl)/avEl > 1e-6)
+            if (mag(magEl[edgei] - nmagEl) > faPatch::matchTol_()*maxEl)
             {
                 FatalErrorIn
                 (
                     "processorFaPatch::makeWeights(scalarField& w) const"
                 )   << "edge " << edgei
                     << " length does not match neighbour by "
-                    << 100*mag(magEl[edgei] - nmagEl)/avEl
-                    << "% -- possible edge ordering problem"
+                    << 100*mag(magEl[edgei] - nmagEl)/maxEl
+                    << "% -- possible edge ordering problem." << nl
+                    << "Local: " << magEl[edgei]
+                    << " Remote: " << nmagEl
+                    << " diff: " << magEl[edgei] - nmagEl << nl
+                    << "Edge: "
+                    << boundaryMesh().mesh().edges()[start() + edgei]
+                    << " points: "
+                    << boundaryMesh().mesh().edges()[start() + edgei]
+                           .line(boundaryMesh().mesh().points())
                     << exit(FatalError);
             }
         }
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
index ee366c1ff..38a3fa215 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
@@ -41,6 +41,13 @@ namespace Foam
 }
 
 
+const Foam::debug::tolerancesSwitch Foam::faPatch::matchTol_
+(
+    "faPatchFaceMatchTol",
+    1e-5
+);
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::faPatch::clearOut()
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
index 33e534f27..122f3d573 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
@@ -43,6 +43,7 @@ SourceFiles
 #include "faPatchFieldsFwd.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
+#include "tolerancesSwitch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -98,6 +99,15 @@ private:
 
 protected:
 
+    // Protected static data
+
+        //- Relative tolerance (for geometric matching). Is factor of
+        //  maximum edge length per face.
+        static const debug::tolerancesSwitch matchTol_;
+
+
+    // Protected Member functions
+
         // The faPatch geometry initialisation is called by faBoundaryMesh
         friend class faBoundaryMesh;
 
diff --git a/src/immersedBoundary/immersedBoundaryDynamicMesh/Make/files b/src/immersedBoundary/immersedBoundaryDynamicMesh/Make/files
index 22e685bb0..a090e5ac8 100644
--- a/src/immersedBoundary/immersedBoundaryDynamicMesh/Make/files
+++ b/src/immersedBoundary/immersedBoundaryDynamicMesh/Make/files
@@ -1,8 +1,7 @@
+movingImmersedBoundary/movingImmersedBoundary.C
 refineImmersedBoundaryMesh/refineImmersedBoundaryMesh.C
 
-movingImmersedBoundary/movingImmersedBoundary.C
 immersedBoundarySolidBodyMotionFvMesh/immersedBoundarySolidBodyMotionFvMesh.C
-
 immersedBoundaryDynamicRefineSolidBodyMotionFvMesh/immersedBoundaryDynamicRefineSolidBodyMotionFvMesh.C
 
 LIB = $(FOAM_LIBBIN)/libimmersedBoundaryDynamicMesh
diff --git a/src/immersedBoundary/immersedBoundaryDynamicMesh/Make/options b/src/immersedBoundary/immersedBoundaryDynamicMesh/Make/options
index dfa1b86a4..3fd50b686 100644
--- a/src/immersedBoundary/immersedBoundaryDynamicMesh/Make/options
+++ b/src/immersedBoundary/immersedBoundaryDynamicMesh/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/meshMotion/solidBodyMotion/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/meshMotion/solidBodyMotion/lnInclude
 
 LIB_LIBS = \
     -limmersedBoundary \

From 0593acefebc1a9dfa80716a0a17257f508eedf18 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 19 Mar 2018 07:44:16 +0000
Subject: [PATCH 10/45] DecomposeReconstruct rewrite

---
 .../parallelProcessing/reconstructParMesh/reconstructParMesh.C | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 794ee2250..cb931aed1 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -139,8 +139,7 @@ int main(int argc, char *argv[])
     processorMeshesReconstructor procMeshes
     (
         databases,
-        regionName,
-        true         // read meshes
+        regionName
     );
 
     autoPtr<fvMesh> meshPtr = procMeshes.reconstructMesh(runTime);

From 8ca9d01c74aadc8cb5196ce385d44ebff8bdfc94 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 12 Apr 2018 17:47:18 +0100
Subject: [PATCH 11/45] Modified decomposition tools: passive patches

---
 .../decomposeReconstruct/Make/files           |   3 +
 .../finiteVolume/decomposeMesh.C              | 359 ++++++++++++++----
 .../finiteVolume/distributeCells.C            |  43 ++-
 .../finiteVolume/domainDecomposition.C        |  72 ++--
 .../finiteVolume/domainDecomposition.H        |  27 +-
 5 files changed, 392 insertions(+), 112 deletions(-)

diff --git a/src/decompositionMethods/decomposeReconstruct/Make/files b/src/decompositionMethods/decomposeReconstruct/Make/files
index 061c4f182..0d3f4f821 100644
--- a/src/decompositionMethods/decomposeReconstruct/Make/files
+++ b/src/decompositionMethods/decomposeReconstruct/Make/files
@@ -1,3 +1,6 @@
+passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.C
+passivePatches/passiveProcessorFvPatch/passiveProcessorFvPatch.C
+
 decomposeTools/finiteVolume/domainDecomposition.C
 decomposeTools/finiteVolume/distributeCells.C
 decomposeTools/finiteVolume/decomposeMesh.C
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
index 189c8c558..56bbea30d 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
@@ -36,7 +36,8 @@ Description
 #include "boolList.H"
 #include "cellList.H"
 #include "primitiveMesh.H"
-#include "cyclicPolyPatch.H"
+#include "processorFvPatch.H"
+#include "cyclicFvPatch.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -50,11 +51,11 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
     // calculate the addressing information for the original mesh
     Info<< "\nCalculating original mesh data" << endl;
 
-    // set references to the original mesh
-    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+    // Set references to the original mesh
+    const fvBoundaryMesh& patches = mesh_.boundary();
 
     // Access all faces to grab the zones
-    const faceList& fcs = mesh_.allFaces();
+    const faceList& allFaces = mesh_.allFaces();
     const labelList& owner = mesh_.faceOwner();
     const labelList& neighbour = mesh_.faceNeighbour();
 
@@ -100,12 +101,12 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
     {
         List<SLList<label> > procFaceList(nProcs_);
 
-        forAll (neighbour, facei)
+        forAll (neighbour, faceI)
         {
-            if (cellToProc_[owner[facei]] == cellToProc_[neighbour[facei]])
+            if (cellToProc_[owner[faceI]] == cellToProc_[neighbour[faceI]])
             {
                 // Face internal to processor
-                procFaceList[cellToProc_[owner[facei]]].append(facei);
+                procFaceList[cellToProc_[owner[faceI]]].append(faceI);
             }
         }
 
@@ -125,17 +126,19 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 
         List<SLList<label> > procPatchIndex(nProcs_);
 
-        forAll (neighbour, facei)
+        forAll (neighbour, faceI)
         {
-            if (cellToProc_[owner[facei]] != cellToProc_[neighbour[facei]])
+            if (cellToProc_[owner[faceI]] != cellToProc_[neighbour[faceI]])
             {
-                // inter - processor patch face found. Go through the list of
+                // Inter - processor patch face found. Go through the list of
                 // inside boundaries for the owner processor and try to find
                 // this inter-processor patch.
 
-                label ownerProc = cellToProc_[owner[facei]];
-                label neighbourProc = cellToProc_[neighbour[facei]];
+                const label ownerProc = cellToProc_[owner[faceI]];
+                const label neighbourProc = cellToProc_[neighbour[faceI]];
 
+                // Search algorithm repeated in processor patches.  Reconsider
+                // HJ, 11/Apr/2018
                 SLList<label>::iterator curInterProcBdrsOwnIter =
                     interProcBoundaries[ownerProc].begin();
 
@@ -158,10 +161,10 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                 {
                     if (curInterProcBdrsOwnIter() == neighbourProc)
                     {
-                        // the inter - processor boundary exists. Add the face
+                        // Inter - processor boundary exists. Add the face
                         interProcBouFound = true;
 
-                        curInterProcBFacesOwnIter().append(facei);
+                        curInterProcBFacesOwnIter().append(faceI);
 
                         SLList<label>::iterator curInterProcBdrsNeiIter =
                             interProcBoundaries[neighbourProc].begin();
@@ -190,7 +193,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                                 // boundary found. Add the face
                                 neighbourFound = true;
 
-                                curInterProcBFacesNeiIter().append(facei);
+                                curInterProcBFacesNeiIter().append(faceI);
                             }
 
                             if (neighbourFound) break;
@@ -220,66 +223,264 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 
                     // owner
                     interProcBoundaries[ownerProc].append(neighbourProc);
-                    interProcBFaces[ownerProc].append(SLList<label>(facei));
+                    interProcBFaces[ownerProc].append(SLList<label>(faceI));
 
                     // neighbour
                     interProcBoundaries[neighbourProc].append(ownerProc);
                     interProcBFaces[neighbourProc].append
                     (
-                        SLList<label>(facei)
+                        SLList<label>(faceI)
                     );
                 }
             }
         }
 
+        // Rewrite:
+        // Handling of coupled patches is changed.  HJ, 11/Apr/2018
+
+        // Prepare collection of patch faces
+
+        // For all processors, set the size of start index and patch size
+        // lists to the number of patches in the mesh
+        forAll (procPatchSize_, procI)
+        {
+            procPatchSize_[procI].setSize(patches.size());
+            procPatchStartIndex_[procI].setSize(patches.size());
+        }
+
+        forAll (patches, patchI)
+        {
+            // Reset size and start index for all processors
+            forAll (procPatchSize_, procI)
+            {
+                procPatchSize_[procI][patchI] = 0;
+                procPatchStartIndex_[procI][patchI] =
+                    procFaceList[procI].size();
+            }
+        }
+
+
+        // Algorithm:
+        // When running the decomposition in parallel, it is assumed that
+        // the result will be used in dynamic load balancing
+        // For load balancing, the processor patches need to match in order for
+        // the patch-to-patch matching to work propely on mesh reconstruction
+        // Therefore, all processor patches need to be split into the matching
+        // and non-matching part be examining the cellToProc_ data on
+        // the neighbour side.  This has been prepared in patchNbrCellToProc_
+        // HJ, 11/Apr/2018
+
+        forAll (patches, patchI)
+        {
+            // Check the processor patch for which neighbour data exists
+            if
+            (
+                isA<processorFvPatch>(patches[patchI])
+             && !patchNbrCellToProc_[patchI].empty()
+            )
+            {
+                // Get patch start
+                const label patchStart = patches[patchI].patch().start();
+
+                // Get faceCells
+                const labelList& fc = patches[patchI].faceCells();
+
+                // Get neighbour cellToProc addressing across the interface
+                const labelList& curNbrPtc = patchNbrCellToProc_[patchI];
+
+                forAll (fc, patchFaceI)
+                {
+                    // Local owner proc is looked up using faceCells
+                    const label ownerProc = cellToProc_[fc[patchFaceI]];
+
+                    // Neighbour proc is looked up directly
+                    const label neighbourProc = curNbrPtc[patchFaceI];
+
+                    // Check change in processor type across the processor
+                    // boundary
+                    // If ownerProc and neighbourProc are the same, the
+                    // processor face will be merged, meaning that it remains
+                    // in the (old) processor patch
+                    // If ownerProc and neighbourProc are different, this will
+                    // be a new processor boundary created from the existing
+                    // processor face and added afterwards
+                    if (ownerProc != neighbourProc)
+                    {
+                        Pout<< "New proc from old proc[" << patchFaceI << "]: "
+                            << ownerProc << " " << neighbourProc << endl;
+                        // Search algorithm repeated in processor patches.
+                        // HJ, 11/Apr/2018
+                        SLList<label>::iterator curInterProcBdrsOwnIter =
+                            interProcBoundaries[ownerProc].begin();
+
+                        SLList<SLList<label> >::iterator
+                            curInterProcBFacesOwnIter =
+                            interProcBFaces[ownerProc].begin();
+
+                        bool interProcBouFound = false;
+
+                        // WARNING: Synchronous SLList iterators
+
+                        for
+                        (
+                            ;
+                            curInterProcBdrsOwnIter
+                         != interProcBoundaries[ownerProc].end()
+                         && curInterProcBFacesOwnIter
+                         != interProcBFaces[ownerProc].end();
+                            ++curInterProcBdrsOwnIter,
+                            ++curInterProcBFacesOwnIter
+                        )
+                        {
+                            if (curInterProcBdrsOwnIter() == neighbourProc)
+                            {
+                                // Inter - processor boundary exists.
+                                // Add the face
+                                interProcBouFound = true;
+
+                                curInterProcBFacesOwnIter().append(patchStart + patchFaceI);
+
+                                SLList<label>::iterator
+                                    curInterProcBdrsNeiIter =
+                                    interProcBoundaries[neighbourProc].begin();
+
+                                SLList<SLList<label> >::iterator
+                                    curInterProcBFacesNeiIter =
+                                    interProcBFaces[neighbourProc].begin();
+
+                                bool neighbourFound = false;
+
+                                // WARNING: Synchronous SLList iterators
+
+                                for
+                                (
+                                    ;
+                                    curInterProcBdrsNeiIter !=
+                                    interProcBoundaries[neighbourProc].end()
+                                 && curInterProcBFacesNeiIter !=
+                                    interProcBFaces[neighbourProc].end();
+                                    ++curInterProcBdrsNeiIter,
+                                    ++curInterProcBFacesNeiIter
+                                )
+                                {
+                                    if (curInterProcBdrsNeiIter() == ownerProc)
+                                    {
+                                        // Boundary found. Add the face
+                                        neighbourFound = true;
+
+                                        curInterProcBFacesNeiIter().append
+                                        (
+                                            patchStart + patchFaceI
+                                        );
+                                    }
+
+                                    if (neighbourFound) break;
+                                }
+
+                                if (interProcBouFound && !neighbourFound)
+                                {
+                                    FatalErrorIn
+                                    (
+                                        "domainDecomposition::decomposeMesh()"
+                                    )   << "Inconsistency in inter - "
+                                        << "processor boundary lists for "
+                                        << "processors "
+                                        << ownerProc << " and "
+                                        << neighbourProc
+                                        << abort(FatalError);
+                                }
+                            }
+
+                            if (interProcBouFound) break;
+                        }
+
+                        if (!interProcBouFound)
+                        {
+                            // inter - processor boundaries do not exist and
+                            // need to be created
+
+                            // set the new addressing information
+
+                            // owner
+                            interProcBoundaries[ownerProc].append
+                            (
+                                neighbourProc
+                            );
+                            interProcBFaces[ownerProc].append
+                            (
+                                SLList<label>(patchStart + patchFaceI)
+                            );
+
+                            // neighbour
+                            interProcBoundaries[neighbourProc].append
+                            (
+                                ownerProc
+                            );
+                            interProcBFaces[neighbourProc].append
+                            (
+                                SLList<label>(patchStart + patchFaceI)
+                            );
+                        }
+                    }
+                    else
+                    {
+                        // Owner and neighbour processor index are the same
+                        // across the processor boundary.  This face will be
+                        // re-merged into internal faces in load balancing
+                        // and therefore remains in the processor patch
+                        Pout<< "Preserved proc[" << patchFaceI << "]: "
+                            << ownerProc << " " << neighbourProc << endl;
+
+                        // add the face
+                        procFaceList[ownerProc].append(patchStart + patchFaceI);
+
+                        // increment the number of faces for this patch
+                        procPatchSize_[ownerProc][patchI]++;
+                    }
+                }
+            }
+        }
+
         // Loop through patches. For cyclic boundaries detect inter-processor
         // faces; for all other, add faces to the face list and remember start
         // and size of all patches.
 
-        // for all processors, set the size of start index and patch size
-        // lists to the number of patches in the mesh
-        forAll (procPatchSize_, procI)
+        forAll (patches, patchI)
         {
-            procPatchSize_[procI].setSize(patches.size());
-            procPatchStartIndex_[procI].setSize(patches.size());
-        }
+            const label patchStart = patches[patchI].patch().start();
 
-        forAll (patches, patchi)
-        {
-            // Reset size and start index for all processors
-            forAll (procPatchSize_, procI)
-            {
-                procPatchSize_[procI][patchi] = 0;
-                procPatchStartIndex_[procI][patchi] =
-                    procFaceList[procI].size();
-            }
-
-            const label patchStart = patches[patchi].start();
-
-            if (!isA<cyclicPolyPatch>(patches[patchi]))
+            // Do normal patches.  Note that processor patches
+            // have already been done and need to be skipped
+            // For all other patches patchNbrCellToProc_ will be empty
+            if
+            (
+                !isA<cyclicFvPatch>(patches[patchI])
+             && patchNbrCellToProc_[patchI].empty()
+            )
             {
                 // Normal patch. Add faces to processor where the cell
                 // next to the face lives
 
                 const unallocLabelList& patchFaceCells =
-                    patches[patchi].faceCells();
+                    patches[patchI].faceCells();
 
-                forAll (patchFaceCells, facei)
+                forAll (patchFaceCells, patchFaceI)
                 {
-                    const label curProc = cellToProc_[patchFaceCells[facei]];
+                    const label curProc =
+                        cellToProc_[patchFaceCells[patchFaceI]];
 
                     // add the face
-                    procFaceList[curProc].append(patchStart + facei);
+                    procFaceList[curProc].append(patchStart + patchFaceI);
 
                     // increment the number of faces for this patch
-                    procPatchSize_[curProc][patchi]++;
+                    procPatchSize_[curProc][patchI]++;
                 }
             }
             else
             {
                 // Cyclic patch special treatment
 
-                const polyPatch& cPatch = patches[patchi];
+                const fvPatch& cPatch = patches[patchI];
 
                 const label cycOffset = cPatch.size()/2;
 
@@ -297,12 +498,12 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                     cycOffset
                 );
 
-                forAll (firstFaceCells, facei)
+                forAll (firstFaceCells, patchFaceI)
                 {
                     if
                     (
-                        cellToProc_[firstFaceCells[facei]]
-                     != cellToProc_[secondFaceCells[facei]]
+                        cellToProc_[firstFaceCells[patchFaceI]]
+                     != cellToProc_[secondFaceCells[patchFaceI]]
                     )
                     {
                         // This face becomes an inter-processor boundary face
@@ -313,9 +514,11 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 
                         cyclicParallel_ = true;
 
-                        label ownerProc = cellToProc_[firstFaceCells[facei]];
+                        label ownerProc =
+                            cellToProc_[firstFaceCells[patchFaceI]];
+
                         label neighbourProc =
-                            cellToProc_[secondFaceCells[facei]];
+                            cellToProc_[secondFaceCells[patchFaceI]];
 
                         SLList<label>::iterator curInterProcBdrsOwnIter =
                             interProcBoundaries[ownerProc].begin();
@@ -346,7 +549,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                                 interProcBouFound = true;
 
                                 curInterProcBFacesOwnIter().append
-                                    (patchStart + facei);
+                                    (patchStart + patchFaceI);
 
                                 SLList<label>::iterator curInterProcBdrsNeiIter
                                    = interProcBoundaries[neighbourProc].begin();
@@ -380,7 +583,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                                             (
                                                 patchStart
                                               + cycOffset
-                                              + facei
+                                              + patchFaceI
                                             );
                                     }
 
@@ -415,7 +618,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                             interProcBoundaries[ownerProc]
                                 .append(neighbourProc);
                             interProcBFaces[ownerProc]
-                                .append(SLList<label>(patchStart + facei));
+                                .append(SLList<label>(patchStart + patchFaceI));
 
                             // neighbour
                             interProcBoundaries[neighbourProc]
@@ -427,7 +630,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                                     (
                                         patchStart
                                       + cycOffset
-                                      + facei
+                                      + patchFaceI
                                     )
                                 );
                         }
@@ -435,13 +638,14 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                     else
                     {
                         // This cyclic face remains on the processor
-                        label ownerProc = cellToProc_[firstFaceCells[facei]];
+                        label ownerProc =
+                            cellToProc_[firstFaceCells[patchFaceI]];
 
                         // add the face
-                        procFaceList[ownerProc].append(patchStart + facei);
+                        procFaceList[ownerProc].append(patchStart + patchFaceI);
 
                         // increment the number of faces for this patch
-                        procPatchSize_[ownerProc][patchi]++;
+                        procPatchSize_[ownerProc][patchI]++;
 
                         // Note: I cannot add the other side of the cyclic
                         // boundary here because this would violate the order.
@@ -453,23 +657,24 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                 // Ordering in cyclic boundaries is important.
                 // Add the other half of cyclic faces for cyclic boundaries
                 // that remain on the processor
-                forAll (secondFaceCells, facei)
+                forAll (secondFaceCells, patchFaceI)
                 {
                     if
                     (
-                        cellToProc_[firstFaceCells[facei]]
-                     == cellToProc_[secondFaceCells[facei]]
+                        cellToProc_[firstFaceCells[patchFaceI]]
+                     == cellToProc_[secondFaceCells[patchFaceI]]
                     )
                     {
                         // This cyclic face remains on the processor
-                        label ownerProc = cellToProc_[firstFaceCells[facei]];
+                        label ownerProc =
+                            cellToProc_[firstFaceCells[patchFaceI]];
 
-                        // add the second face
+                        // Add the second face
                         procFaceList[ownerProc].append
-                            (patchStart + cycOffset + facei);
+                            (patchStart + cycOffset + patchFaceI);
 
-                        // increment the number of faces for this patch
-                        procPatchSize_[ownerProc][patchi]++;
+                        // Increment the number of faces for this patch
+                        procPatchSize_[ownerProc][patchI]++;
                     }
                 }
             }
@@ -557,7 +762,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             labelList& curProcProcessorPatchStartIndex =
                 procProcessorPatchStartIndex_[procI];
 
-            // calculate the size
+            // Calculate the size
             label nFacesOnProcessor = curProcFaces.size();
 
             for
@@ -727,15 +932,15 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 
         label nPatches = 0;
 
-        forAll (oldPatchSizes, patchi)
+        forAll (oldPatchSizes, patchI)
         {
-            if (!filterEmptyPatches || oldPatchSizes[patchi] > 0)
+            if (!filterEmptyPatches || oldPatchSizes[patchI] > 0)
             {
-                curBoundaryAddressing[nPatches] = patchi;
+                curBoundaryAddressing[nPatches] = patchI;
 
-                curPatchSizes[nPatches] = oldPatchSizes[patchi];
+                curPatchSizes[nPatches] = oldPatchSizes[patchI];
 
-                curPatchStarts[nPatches] = oldPatchStarts[patchi];
+                curPatchStarts[nPatches] = oldPatchStarts[patchI];
 
                 nPatches++;
             }
@@ -788,7 +993,8 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
         for (label faceI = 0; faceI < nLiveProcFaces_[procI]; faceI++)
         {
             // Because of the turning index, some labels may be negative
-            const labelList& facePoints = fcs[mag(procFaceLabels[faceI]) - 1];
+            const labelList& facePoints =
+                allFaces[mag(procFaceLabels[faceI]) - 1];
 
             forAll (facePoints, pointI)
             {
@@ -823,7 +1029,8 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
         )
         {
             // Because of the turning index, some labels may be negative
-            const labelList& facePoints = fcs[mag(procFaceLabels[faceI]) - 1];
+            const labelList& facePoints =
+                allFaces[mag(procFaceLabels[faceI]) - 1];
 
             forAll (facePoints, pointI)
             {
@@ -882,10 +1089,10 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             // Reset the lookup list
             pointsUsage = 0;
 
-            forAll (curProcessorPatchStarts, patchi)
+            forAll (curProcessorPatchStarts, patchI)
             {
-                const label curStart = curProcessorPatchStarts[patchi];
-                const label curEnd = curStart + curProcessorPatchSizes[patchi];
+                const label curStart = curProcessorPatchStarts[patchI];
+                const label curEnd = curStart + curProcessorPatchSizes[patchI];
 
                 for
                 (
@@ -899,16 +1106,16 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                     // HJ, 5/Dec/2001
                     const label curF = mag(curFaceLabels[faceI]) - 1;
 
-                    const face& f = fcs[curF];
+                    const face& f = allFaces[curF];
 
                     forAll (f, pointI)
                     {
                         if (pointsUsage[f[pointI]] == 0)
                         {
                             // Point not previously used
-                            pointsUsage[f[pointI]] = patchi + 1;
+                            pointsUsage[f[pointI]] = patchI + 1;
                         }
-                        else if (pointsUsage[f[pointI]] != patchi + 1)
+                        else if (pointsUsage[f[pointI]] != patchI + 1)
                         {
                             // Point used by some other patch = global point!
                             gSharedPoints.insert(f[pointI]);
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C
index 4503bcf2b..8fc092847 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/distributeCells.C
@@ -26,7 +26,7 @@ License
 #include "domainDecomposition.H"
 #include "decompositionMethod.H"
 #include "cpuTime.H"
-#include "cyclicPolyPatch.H"
+#include "processorFvPatch.H"
 #include "cellSet.H"
 #include "regionSplit.H"
 
@@ -38,7 +38,6 @@ void Foam::domainDecomposition::distributeCells()
 
     cpuTime decompositionTime;
 
-
     // See if any faces need to have owner and neighbour on same processor
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -179,6 +178,46 @@ void Foam::domainDecomposition::distributeCells()
         cellToProc_ = decomposePtr().decompose(globalRegion, regionCentres);
     }
 
+    // If running in parallel, sync cellToProc_ across coupled boundaries
+    // Initialise transfer of restrict addressing on the interface
+    if (Pstream::parRun())
+    {
+        const fvBoundaryMesh& patches = mesh_.boundary();
+
+        forAll (patches, patchI)
+        {
+            if (isA<processorFvPatch>(patches[patchI]))
+            // if (patches[patchI].coupled())
+            {
+                const lduInterface& cpPatch =
+                    refCast<const lduInterface>(patches[patchI]);
+
+                cpPatch.initInternalFieldTransfer
+                (
+                    Pstream::blocking,
+                    cellToProc_
+                );
+            }
+        }
+
+        forAll (patches, patchI)
+        {
+            if (isA<processorFvPatch>(patches[patchI]))
+            // if (patches[patchI].coupled())
+            {
+                const lduInterface& cpPatch =
+                    refCast<const lduInterface>(patches[patchI]);
+
+                patchNbrCellToProc_[patchI] =
+                    cpPatch.internalFieldTransfer
+                    (
+                        Pstream::blocking,
+                        cellToProc_
+                    );
+            }
+        }
+    }
+    
     Info<< "\nFinished decomposition in "
         << decompositionTime.elapsedCpuTime()
         << " s" << endl;
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
index 6dae788ed..c43246b63 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
@@ -28,6 +28,7 @@ License
 #include "dictionary.H"
 #include "labelIOList.H"
 #include "processorPolyPatch.H"
+#include "passiveProcessorPolyPatch.H"
 #include "fvMesh.H"
 #include "OSspecific.H"
 #include "Map.H"
@@ -49,8 +50,8 @@ Foam::domainDecomposition::domainDecomposition
     mesh_(mesh),
     decompositionDict_(dict),
     nProcs_(readInt(decompositionDict_.lookup("numberOfSubdomains"))),
-    distributed_(false),
     cellToProc_(mesh_.nCells()),
+    patchNbrCellToProc_(mesh_.boundaryMesh().size()),
     procPointAddressing_(nProcs_),
     procFaceAddressing_(nProcs_),
     nInternalProcFaces_(nProcs_),
@@ -64,12 +65,7 @@ Foam::domainDecomposition::domainDecomposition
     procProcessorPatchStartIndex_(nProcs_),
     globallySharedPoints_(0),
     cyclicParallel_(false)
-{
-    if (decompositionDict_.found("distributed"))
-    {
-        distributed_ = Switch(decompositionDict_.lookup("distributed"));
-    }
-}
+{}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -84,7 +80,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
 (
     const label procI,
     const Time& processorDb,
-    const word& regionName
+    const word& regionName,
+    const bool createPassiveProcPatches
 ) const
 {
     // Create processor points
@@ -265,27 +262,54 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
         nPatches++;
     }
 
-    forAll (curProcessorPatchSizes, procPatchI)
+    if (createPassiveProcPatches)
     {
-        procPatches[nPatches] =
-            new processorPolyPatch
-            (
-                word("procBoundary") + Foam::name(procI)
-              + word("to")
-              + Foam::name(curNeighbourProcessors[procPatchI]),
-                curProcessorPatchSizes[procPatchI],
-                curProcessorPatchStarts[procPatchI],
-                nPatches,
-                procMesh.boundaryMesh(),
-                procI,
-                curNeighbourProcessors[procPatchI]
-        );
+        forAll (curProcessorPatchSizes, procPatchI)
+        {
+            procPatches[nPatches] =
+                new passiveProcessorPolyPatch
+                (
+                    word("procBoundary") + Foam::name(procI)
+                  + word("to")
+                  + Foam::name(curNeighbourProcessors[procPatchI]),
+                    curProcessorPatchSizes[procPatchI],
+                    curProcessorPatchStarts[procPatchI],
+                    nPatches,
+                    procMesh.boundaryMesh(),
+                    procI,
+                    curNeighbourProcessors[procPatchI]
+                );
 
-        nPatches++;
+            nPatches++;
+        }
+    }
+    else
+    {
+        forAll (curProcessorPatchSizes, procPatchI)
+        {
+            procPatches[nPatches] =
+                new processorPolyPatch
+                (
+                    word("procBoundary") + Foam::name(procI)
+                  + word("to")
+                  + Foam::name(curNeighbourProcessors[procPatchI]),
+                    curProcessorPatchSizes[procPatchI],
+                    curProcessorPatchStarts[procPatchI],
+                    nPatches,
+                    procMesh.boundaryMesh(),
+                    procI,
+                    curNeighbourProcessors[procPatchI]
+                );
+
+            nPatches++;
+        }
     }
 
+
     // Add boundary patches to polyMesh and fvMesh
-    procMesh.addFvPatches(procPatches);
+    // Note: Mark boundary as invalid to disable analysis
+    // due to the presence of old/new patches
+    procMesh.addFvPatches(procPatches, false);
 
     // Create and add zones
 
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
index f31e7bc43..5b3e42a39 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
@@ -65,12 +65,13 @@ class domainDecomposition
         //- Number of processors in decomposition
         label nProcs_;
 
-        //- Is the decomposition data to be distributed for each processor
-        bool distributed_;
-
         //- Processor label for each cell
         labelList cellToProc_;
 
+        //- Processor label for neighbour cell for each processor boundary
+        //  Data is used when running decomposition in parallel
+        labelListList patchNbrCellToProc_;
+
         //- Labels of points for each processor
         labelListList procPointAddressing_;
 
@@ -159,18 +160,19 @@ public:
             return nProcs_;
         }
 
-        //- Is the decomposition data to be distributed for each processor
-        bool distributed() const
-        {
-            return distributed_;
-        }
-
         //- Return cell-processor decomposition labels
         const labelList& cellToProc() const
         {
             return cellToProc_;
         }
 
+        //- Return cell-processor decomposition labels for cells across
+        //  coupled boundaries when running decomposition in parallel
+        const labelListList& patchNbrCellToProc() const
+        {
+            return patchNbrCellToProc_;
+        }
+
         //- Decompose mesh. Optionally remove zero-sized patches.
         void decomposeMesh(const bool filterEmptyPatches);
 
@@ -178,11 +180,16 @@ public:
         // Decomposed mesh and addressing
 
             //- Create a decomposed mesh for a given processor index
+            //  Note: at the point of construction, the boundary is marked
+            //  as invalid.  If the mesh should be used immediately upon
+            //  creation, initialise the boundary patches before use
+            //  HJ, 12/Apr/2018
             autoPtr<fvMesh> processorMesh
             (
                 const label procI,
                 const Time& procDb,
-                const word& regionName
+                const word& regionName,
+                const bool createPassiveProcPatches = false
             ) const;
 
             //- Return processor point addressing

From 6da19d932c402e0694bc4c46aa741ff5fe649855 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 13 Apr 2018 22:13:13 +0100
Subject: [PATCH 12/45] Load balancing development, 5

---
 .../finiteVolume/decomposeMesh.C              |  18 +-
 .../finiteVolume/domainDecomposition.C        |   8 +-
 .../finiteVolume/domainDecomposition.H        |   9 +
 .../passiveProcessorFvPatch.C                 |  40 +++
 .../passiveProcessorFvPatch.H                 |  94 ++++++
 .../passiveProcessorPolyPatch.C               | 131 +++++++++
 .../passiveProcessorPolyPatch.H               | 177 ++++++++++++
 .../finiteVolume/processorMeshesRebuild.C     | 268 ++++++++++++------
 .../processorMeshesReconstructor.H            |   8 +
 .../patchConstrainedDecomp.H                  |   7 +-
 .../loadBalanceFvMesh/loadBalanceFvMesh.C     |  87 +++++-
 11 files changed, 752 insertions(+), 95 deletions(-)
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorFvPatch/passiveProcessorFvPatch.C
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorFvPatch/passiveProcessorFvPatch.H
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.C
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.H

diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
index 56bbea30d..bb5995fb5 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
@@ -250,12 +250,10 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 
         forAll (patches, patchI)
         {
-            // Reset size and start index for all processors
+            // Reset size for all processors
             forAll (procPatchSize_, procI)
             {
                 procPatchSize_[procI][patchI] = 0;
-                procPatchStartIndex_[procI][patchI] =
-                    procFaceList[procI].size();
             }
         }
 
@@ -270,6 +268,8 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
         // the neighbour side.  This has been prepared in patchNbrCellToProc_
         // HJ, 11/Apr/2018
 
+        // Dump current processor patch faces into new processor patches
+        // that will be created in decomposition when running in parallel
         forAll (patches, patchI)
         {
             // Check the processor patch for which neighbour data exists
@@ -338,7 +338,10 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                                 // Add the face
                                 interProcBouFound = true;
 
-                                curInterProcBFacesOwnIter().append(patchStart + patchFaceI);
+                                curInterProcBFacesOwnIter().append
+                                (
+                                    patchStart + patchFaceI
+                                );
 
                                 SLList<label>::iterator
                                     curInterProcBdrsNeiIter =
@@ -447,6 +450,13 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 
         forAll (patches, patchI)
         {
+            // New patch: record start index for all processors
+            forAll (procPatchSize_, procI)
+            {
+                procPatchStartIndex_[procI][patchI] =
+                    procFaceList[procI].size();
+            }
+
             const label patchStart = patches[patchI].patch().start();
 
             // Do normal patches.  Note that processor patches
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
index c43246b63..c36cbd278 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
@@ -50,6 +50,7 @@ Foam::domainDecomposition::domainDecomposition
     mesh_(mesh),
     decompositionDict_(dict),
     nProcs_(readInt(decompositionDict_.lookup("numberOfSubdomains"))),
+    distributed_(false),
     cellToProc_(mesh_.nCells()),
     patchNbrCellToProc_(mesh_.boundaryMesh().size()),
     procPointAddressing_(nProcs_),
@@ -65,7 +66,12 @@ Foam::domainDecomposition::domainDecomposition
     procProcessorPatchStartIndex_(nProcs_),
     globallySharedPoints_(0),
     cyclicParallel_(false)
-{}
+{
+    if (decompositionDict_.found("distributed"))
+    {
+        distributed_ = Switch(decompositionDict_.lookup("distributed"));
+    }
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
index 5b3e42a39..88f1fb572 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
@@ -65,6 +65,9 @@ class domainDecomposition
         //- Number of processors in decomposition
         label nProcs_;
 
+        //- Is the decomposition data to be distributed for each processor
+        bool distributed_;
+
         //- Processor label for each cell
         labelList cellToProc_;
 
@@ -160,6 +163,12 @@ public:
             return nProcs_;
         }
 
+        //- Is the decomposition data to be distributed for each processor
+        inline bool distributed() const
+        {
+            return distributed_;
+        }
+
         //- Return cell-processor decomposition labels
         const labelList& cellToProc() const
         {
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorFvPatch/passiveProcessorFvPatch.C b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorFvPatch/passiveProcessorFvPatch.C
new file mode 100644
index 000000000..9bbfacfce
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorFvPatch/passiveProcessorFvPatch.C
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "passiveProcessorFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+defineTypeNameAndDebug(passiveProcessorFvPatch, 0);
+addToRunTimeSelectionTable(fvPatch, passiveProcessorFvPatch, polyPatch);
+
+}
+
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorFvPatch/passiveProcessorFvPatch.H b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorFvPatch/passiveProcessorFvPatch.H
new file mode 100644
index 000000000..0da0f8ab7
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorFvPatch/passiveProcessorFvPatch.H
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::passiveProcessorFvPatch
+
+Description
+    Passive processor fvPatch.  See passiveProcessorPolyPatch
+
+Author
+    Hrvoje Jasak, Wikki Ltd.  All rights reserved.
+
+SourceFiles
+    passiveProcessorFvPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef passiveProcessorFvPatch_H
+#define passiveProcessorFvPatch_H
+
+#include "coupledFvPatch.H"
+#include "processorLduInterface.H"
+#include "passiveProcessorPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class passiveProcessorFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class passiveProcessorFvPatch
+:
+    public fvPatch
+{
+public:
+
+    //- Runtime type information
+    TypeName(passiveProcessorPolyPatch::typeName_());
+
+
+    // Constructors
+
+        //- Construct from components
+        passiveProcessorFvPatch
+        (
+            const polyPatch& patch,
+            const fvBoundaryMesh& bm
+        )
+        :
+            fvPatch(patch, bm)
+        {}
+
+
+    //- Destructor
+    virtual ~passiveProcessorFvPatch()
+    {}
+
+
+    // Member functions
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.C b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.C
new file mode 100644
index 000000000..5c445eef1
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.C
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "passiveProcessorPolyPatch.H"
+#include "addToRunTimeSelectionTable.H"
+#include "dictionary.H"
+#include "SubField.H"
+#include "matchPoints.H"
+#include "OFstream.H"
+#include "polyBoundaryMesh.H"
+#include "polyMesh.H"
+#include "foamTime.H"
+#include "transformList.H"
+#include "demandDrivenData.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(passiveProcessorPolyPatch, 0);
+
+    addToRunTimeSelectionTable
+    (
+        polyPatch,
+        passiveProcessorPolyPatch,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::passiveProcessorPolyPatch::passiveProcessorPolyPatch
+(
+    const word& name,
+    const label size,
+    const label start,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const int myProcNo,
+    const int neighbProcNo
+)
+:
+    polyPatch(name, size, start, index, bm),
+    myProcNo_(myProcNo),
+    neighbProcNo_(neighbProcNo)
+{}
+
+
+Foam::passiveProcessorPolyPatch::passiveProcessorPolyPatch
+(
+    const word& name,
+    const dictionary& dict,
+    const label index,
+    const polyBoundaryMesh& bm
+)
+:
+    polyPatch(name, dict, index, bm),
+    myProcNo_(readLabel(dict.lookup("myProcNo"))),
+    neighbProcNo_(readLabel(dict.lookup("neighbProcNo")))
+{}
+
+
+Foam::passiveProcessorPolyPatch::passiveProcessorPolyPatch
+(
+    const passiveProcessorPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    polyPatch(pp, bm),
+    myProcNo_(pp.myProcNo_),
+    neighbProcNo_(pp.neighbProcNo_)
+{}
+
+
+Foam::passiveProcessorPolyPatch::passiveProcessorPolyPatch
+(
+    const passiveProcessorPolyPatch& pp,
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
+)
+:
+    polyPatch(pp, bm, index, newSize, newStart),
+    myProcNo_(pp.myProcNo_),
+    neighbProcNo_(pp.neighbProcNo_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::passiveProcessorPolyPatch::~passiveProcessorPolyPatch()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::passiveProcessorPolyPatch::write(Ostream& os) const
+{
+    polyPatch::write(os);
+    os.writeKeyword("myProcNo") << myProcNo_
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("neighbProcNo") << neighbProcNo_
+        << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.H b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.H
new file mode 100644
index 000000000..134fe30e2
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.H
@@ -0,0 +1,177 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::passiveProcessorPolyPatch
+
+Description
+    Passive processor polyPatch.
+
+    Passive processor polyPatch is created in load balancing when new processor
+    faces are built on each parallel decomposition.  It contains the data
+    which is needed to rebuild correct processor boundaries after load balancing
+
+Author
+    Hrvoje Jasak, Wikki Ltd.  All rights reserved.
+
+SourceFiles
+    passiveProcessorPolyPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef passiveProcessorPolyPatch_H
+#define passiveProcessorPolyPatch_H
+
+#include "polyBoundaryMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class passiveProcessorPolyPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class passiveProcessorPolyPatch
+:
+    public polyPatch
+{
+    // Private data
+
+        //- My processor number
+        int myProcNo_;
+
+        //- Neighbour processor number
+        int neighbProcNo_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("passiveProcessor");
+
+
+    // Constructors
+
+        //- Construct from components
+        passiveProcessorPolyPatch
+        (
+            const word& name,
+            const label size,
+            const label start,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const int myProcNo,
+            const int neighbProcNo
+        );
+
+        //- Construct from dictionary
+        passiveProcessorPolyPatch
+        (
+            const word& name,
+            const dictionary& dict,
+            const label index,
+            const polyBoundaryMesh&
+        );
+
+        //- Construct as copy, resetting the boundary mesh
+        passiveProcessorPolyPatch
+        (
+            const passiveProcessorPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
+        //- Construct as given the original patch and resetting the
+        //  face list and boundary mesh information
+        passiveProcessorPolyPatch
+        (
+            const passiveProcessorPolyPatch& pp,
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        );
+
+        //- Construct and return a clone, resetting the boundary mesh
+        virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
+        {
+            return autoPtr<polyPatch>(new passiveProcessorPolyPatch(*this, bm));
+        }
+
+        //- Construct and return a clone, resetting the face list
+        //  and boundary mesh
+        virtual autoPtr<polyPatch> clone
+        (
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        ) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new passiveProcessorPolyPatch
+                (
+                    refCast<const passiveProcessorPolyPatch>(*this),
+                    bm,
+                    index,
+                    newSize,
+                    newStart
+                )
+            );
+        }
+
+
+    //- Destructor
+    virtual ~passiveProcessorPolyPatch();
+
+
+    // Member functions
+
+        //- Return processor number
+        int myProcNo() const
+        {
+            return myProcNo_;
+        }
+
+        //- Return neigbour processor number
+        int neighbProcNo() const
+        {
+            return neighbProcNo_;
+        }
+
+        //- Write the polyPatch data as a dictionary
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
index 7c3f2942d..b94cd6e79 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
@@ -25,6 +25,7 @@ License
 
 #include "processorMeshesReconstructor.H"
 #include "processorPolyPatch.H"
+#include "passiveProcessorPolyPatch.H"
 #include "sharedPoints.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -45,7 +46,7 @@ Foam::label Foam::processorMeshesReconstructor::firstValidMesh() const
 
     return 0;
 }
-    
+
 
 bool Foam::processorMeshesReconstructor::readMapping()
 {
@@ -200,7 +201,7 @@ bool Foam::processorMeshesReconstructor::readMapping()
             }
         }
 
-        Info<< "Addressing from files: " << nl;
+        Info<< "Addressing from files: " << endl;
         forAll (meshes_, procI)
         {
             if (meshes_.set(procI))
@@ -359,6 +360,18 @@ void Foam::processorMeshesReconstructor::reconstructPoints(fvMesh& mesh) const
 Foam::autoPtr<Foam::fvMesh>
 Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 {
+    // Note:
+    // In load balancing, there will exist a double set of processor patches
+    // One, created by moving cells adjacent to "old" processor boundaries
+    // (processorPolyPatch) and another, created by splitting up previously
+    // internal mesh faces into "new" processor patches
+    // In order to reconstruct the mesh correctly, the two sets of processor
+    // boundaries are kept separately
+    // In reconstruction, the order of processor patch faces needs to be
+    // preserved.  This is achieved by
+    // - first adding original processor patch faces
+    // - adding passiveProcessor patch faces in the processor order
+
     // Check for read
 
     if (readMapping())
@@ -407,34 +420,55 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         }
     }
 
-    // Prepare patch reconstruction from processor 0
-    wordList reconPatchNames;
-    wordList reconPatchTypes;
+    // Prepare patch reconstruction
+    HashTable<label, word> patchNameLookup
+    (
+        meshes_[firstValidMesh()].boundaryMesh().size()
+    );
+    DynamicList<word> patchTypeLookup
+    (
+        meshes_[firstValidMesh()].boundaryMesh().size()
+    );
+
     label nReconPatches = 0;
 
-    // Grab names and types of patches, excluding processor patches
-    // Order must be identical on all processors
+    forAll (meshes_, procI)
     {
-        const polyBoundaryMesh& proc0Boundary =
-            meshes_[firstValidMesh()].boundaryMesh();
-
-        reconPatchNames.setSize(proc0Boundary.size());
-        reconPatchTypes.setSize(proc0Boundary.size());
-        nReconPatches = 0;
-
-        forAll (proc0Boundary, patchI)
+        if (meshes_.set(procI))
         {
-            if (!isA<processorPolyPatch>(proc0Boundary[patchI]))
+            const polyBoundaryMesh& procPatches = meshes_[procI].boundaryMesh();
+
+            forAll (procPatches, patchI)
             {
-                // Add patch name to list of patches
-                reconPatchNames[nReconPatches] = proc0Boundary[patchI].name();
-                reconPatchTypes[nReconPatches] = proc0Boundary[patchI].type();
-                nReconPatches++;
+                if (!isA<processorPolyPatch>(procPatches[patchI]))
+                {
+                    const word& patchName = procPatches[patchI].name();
+
+                    // Regular patch.  Try to find it in a list
+                    if (!patchNameLookup.found(patchName))
+                    {
+                        // Patch not found.  Add it
+                        patchNameLookup.insert(patchName, nReconPatches);
+                        patchTypeLookup.append(procPatches[patchI].type());
+                        nReconPatches++;
+                    }
+                }
             }
         }
+    }
 
-        reconPatchNames.setSize(nReconPatches);
-        reconPatchTypes.setSize(nReconPatches);
+    // Fill in patch names and types
+    wordList reconPatchNames(patchNameLookup.size());
+    wordList reconPatchTypes(patchNameLookup.size());
+
+    wordList patchNameToc = patchNameLookup.toc();
+
+    forAll (patchNameToc, pnI)
+    {
+        const label pnIndex = patchNameLookup.find(patchNameToc[pnI])();
+
+        reconPatchNames[pnIndex] = patchNameToc[pnI];
+        reconPatchTypes[pnIndex] = patchTypeLookup[pnIndex];
     }
 
     // Prepare point, face and patch reconstruction
@@ -442,6 +476,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     label nReconFaces = 0;
     label nReconCells = 0;
     labelList reconPatchSizes(reconPatchTypes.size(), 0);
+    Pout<< "reconPatchNames: " << reconPatchNames << endl;
 
     forAll (meshes_, procI)
     {
@@ -454,40 +489,44 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
             const polyBoundaryMesh& procPatches = meshes_[procI].boundaryMesh();
 
-            nReconPatches = 0;
-
             forAll (procPatches, patchI)
             {
                 if (!isA<processorPolyPatch>(procPatches[patchI]))
                 {
+                    // Find processor patch index in reconstructed boundary
+                    const label pnIndex = patchNameLookup.find
+                    (
+                        procPatches[patchI].name()
+                    )();
+
                     // Check patch name and type
                     if
                     (
                         procPatches[patchI].name()
-                     != reconPatchNames[nReconPatches]
+                     != reconPatchNames[pnIndex]
                      || procPatches[patchI].type()
-                     != reconPatchTypes[nReconPatches]
+                     != reconPatchTypes[pnIndex]
                     )
                     {
                         FatalErrorIn
                         (
                             "autoPtr<fvMesh> processorMeshesReconstructor::"
                             "reconstructMesh(const Time& db)"
-                        )   << "Patch names, types or ordering does not match "
-                            << "across processors"
+                        )   << "Patch name and type does not match "
+                            << "across processors for patch "
+                            << procPatches[patchI].name() << " type: "
+                            << procPatches[patchI].type()
                             << abort(FatalError);
                     }
 
                     // Record number of faces in patch
-                    reconPatchSizes[nReconPatches] +=
-                        procPatches[patchI].size();
-                    nReconPatches++;
+                    reconPatchSizes[pnIndex] += procPatches[patchI].size();
                 }
             }
         }
     }
 
-    Info<< "Estimated max global mesh size (with duplicates): " << nl
+    Pout<< "Estimated max global mesh size (with duplicates): " << nl
         << "    nPoints = " << nReconPoints << nl
         << "    nFaces = " << nReconFaces << nl
         << "    nCells = " << nReconCells << nl
@@ -612,8 +651,9 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
     // Dump first valid mesh without checking
     {
+        Pout<< "Dump mesh 0" << endl;
         const label fvmId = firstValidMesh();
-        
+
         cellOffset[fvmId] = 0;
 
         const polyMesh& curMesh = meshes_[fvmId];
@@ -678,6 +718,9 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                 const processorPolyPatch& procPatch =
                     refCast<const processorPolyPatch>(procPatches[patchI]);
 
+                // Record boundary-processor addressing: unmapped patch
+                bpAddr[patchI] = -1;
+                
                 for
                 (
                     label faceI = procPatch.start();
@@ -704,12 +747,19 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
             else
             {
                 // Regular patch: dump faces into patch face list
-                faceList& curRpFaces = reconPatchFaces[patchI];
-                labelList& curRpfOwner = reconPatchOwner[patchI];
-                label& nRpf = reconPatchSizes[patchI];
 
                 const polyPatch& curPatch = procPatches[patchI];
 
+                // Find processor patch index in reconstructed boundary
+                const label pnIndex = patchNameLookup.find(curPatch.name())();
+
+                // Record boundary-processor addressing: mapped patch
+                bpAddr[patchI] = pnIndex;
+                
+                faceList& curRpFaces = reconPatchFaces[pnIndex];
+                labelList& curRpfOwner = reconPatchOwner[pnIndex];
+                label& nRpf = reconPatchSizes[pnIndex];
+
                 for
                 (
                     label faceI = curPatch.start();
@@ -730,7 +780,6 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                     // HJ, 16/Feb/2011
                     fpAddr[faceI] = nRpf + 1;
                     nRpf++;
-
                 }
             }
         }
@@ -740,15 +789,6 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         {
             cpAddr[cellI] = cellI; // + cellOffset[firstValidMesh()];
         }
-
-        // Sort out boundary addressing: i for live patches, -1 for processor
-        bpAddr = -1;
-
-        // Note: loop over mapped patches
-        forAll (reconPatchSizes, patchI)
-        {
-            bpAddr[patchI] = patchI;
-        }
     }
 
 
@@ -756,6 +796,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
     for (label procI = 1; procI < meshes_.size(); procI++)
     {
+        Pout<< "Dump mesh " << procI << endl;
         // Grab cell offset from previous offset and mesh size
         cellOffset[procI] =
             cellOffset[procI - 1] + meshes_[procI - 1].nCells();
@@ -784,7 +825,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
             // Collect point-processor addressing for points on processor patches
 
-            // Go through all patches.  For neighbour patches, access
+            // Go through all processor patches.  For neighbour patches, access
             // owner addressing and dump into ppAddr
             forAll (procPatches, patchI)
             {
@@ -868,7 +909,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                 }
             }
 
-            Info<< "Processor " << procI << " merged " << nMergedPoints
+            Pout<< "Processor " << procI << " merged " << nMergedPoints
                 << " points out of local " << curPoints.size()
                 << " and total " << nReconPoints << endl;
 
@@ -934,6 +975,9 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                     const processorPolyPatch& procPatch =
                         refCast<const processorPolyPatch>(procPatches[patchI]);
 
+                    // Record boundary-processor addressing: unmapped patch
+                    bpAddr[patchI] = -1;
+                
                     // If patch is a master, drop the faces and fill the
                     // owner side addressing
                     if (procPatch.master())
@@ -1008,12 +1052,19 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                 else
                 {
                     // Regular patch: dump faces into patch face list
-                    faceList& curRpFaces = reconPatchFaces[patchI];
-                    labelList& curRpfOwner = reconPatchOwner[patchI];
-                    label& nRpf = reconPatchSizes[patchI];
 
                     const polyPatch& curPatch = procPatches[patchI];
 
+                    // Find processor patch index in reconstructed boundary
+                    const label pnIndex = patchNameLookup.find(curPatch.name())();
+
+                    // Record boundary-processor addressing: mapped patch
+                    bpAddr[patchI] = pnIndex;
+                
+                    faceList& curRpFaces = reconPatchFaces[pnIndex];
+                    labelList& curRpfOwner = reconPatchOwner[pnIndex];
+                    label& nRpf = reconPatchSizes[pnIndex];
+
                     for
                     (
                         label faceI = curPatch.start();
@@ -1043,16 +1094,6 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
             {
                 cpAddr[cellI] = cellI + cellOffset[procI];
             }
-
-            // Sort out boundary addressing: i for live patches,
-            // -1 for processor
-            bpAddr = -1;
-
-            // Note: loop over mapped patches
-            forAll (reconPatchSizes, patchI)
-            {
-                bpAddr[patchI] = patchI;
-            }
         }
     }
 
@@ -1147,6 +1188,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         }
     }
 
+    // Create global mesh with given region name
     autoPtr<fvMesh> globalMeshPtr
     (
         new fvMesh
@@ -1166,31 +1208,97 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     );
     fvMesh& globalMesh = globalMeshPtr();
 
-    // Create patch list using mesh from processor 0
-    List<polyPatch*> reconPatches(nReconPatches);
+    // Create patch list by cloning meshes.  If all processors hold all live
+    // patches, it is sufficient to rebuilt the patches only from the first
+    // valid processor
+    // Note: 
+    List<polyPatch*> reconPatches(nReconPatches, NULL);
 
+    forAll (meshes_, procI)
     {
-        const polyBoundaryMesh& procPatches =
-            meshes_[firstValidMesh()].boundaryMesh();
-
-        reconPatches.setSize(reconPatchSizes.size());
-
-        forAll (reconPatchSizes, patchI)
+        if (meshes_.set(procI))
         {
-            reconPatches[patchI] =
-                procPatches[patchI].clone
-                (
-                    globalMesh.boundaryMesh(),
-                    patchI,
-                    reconPatchSizes[patchI],
-                    reconPatchStarts[patchI]
-                ).ptr();
+            const polyBoundaryMesh& procPatches = meshes_[procI].boundaryMesh();
+
+            forAll (procPatches, patchI)
+            {
+                // Processor patches have disappeared: skip them
+                if (!isA<processorPolyPatch>(procPatches[patchI]))
+                {
+                    // Find processor patch index in reconstructed boundary
+                    const label pnIndex = patchNameLookup.find
+                    (
+                        procPatches[patchI].name()
+                    )();
+
+                    // Check if the patch has already been set
+                    if (reconPatches[pnIndex] == NULL)
+                    {
+                        // Patch not set: clone it
+                        // Note: watch indices: setting pnIndex from patchI
+
+                        if (isA<passiveProcessorPolyPatch>(procPatches[patchI]))
+                        {
+                            // For a passive processor patch, create new
+                            // processor patch
+                            const passiveProcessorPolyPatch& ppPatch =
+                                refCast<const passiveProcessorPolyPatch>
+                                (
+                                    procPatches[patchI]
+                                );
+
+                            reconPatches[pnIndex] = new processorPolyPatch
+                            (
+                                ppPatch.name(),
+                                reconPatchSizes[pnIndex],
+                                reconPatchStarts[pnIndex],
+                                pnIndex,
+                                globalMesh.boundaryMesh(),
+                                Pstream::myProcNo(),   // Use correct local proc
+                                ppPatch.neighbProcNo()
+                            );
+                        }
+                        else
+                        {
+                            // Regular patch: clone
+                            reconPatches[pnIndex] =
+                                procPatches[patchI].clone
+                                (
+                                    globalMesh.boundaryMesh(),
+                                    patchI,
+                                    reconPatchSizes[pnIndex],
+                                    reconPatchStarts[pnIndex]
+                                ).ptr();
+                        }
+                    }
+                }
+            }
         }
     }
 
-    // Add both poly and fv boundary patches
-    globalMesh.addFvPatches(reconPatches);
-
+    // Check the list and fill in the missing slots
+    forAll (reconPatches, patchI)
+    {
+        if (reconPatches[patchI] == NULL)
+        {
+            // Patch not set.  Check its type
+            FatalErrorIn
+            (
+                "autoPtr<fvMesh> processorMeshesReconstructor::"
+                "reconstructMesh(const Time& db)"
+            )   << "Reconstructed patch " << patchI
+                << " name " << reconPatchNames[patchI]
+                << " type " << reconPatchTypes[patchI]
+                << " not set."
+                << abort(FatalError);
+        }
+    }
+    
+    // Add boundary patches to polyMesh and fvMesh
+    // Note: Mark boundary as invalid to disable analysis
+    // due to the presence of old/new patches
+    globalMesh.addFvPatches(reconPatches, false);
+    Pout<< "global boundary: " << globalMesh.boundaryMesh() << endl;
     // TODO: point, face and cell zones
 
     Info<< "Reconstructed addressing: " << nl;
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
index 3e276fbbc..17d65b4b1 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H
@@ -25,6 +25,14 @@ Class
     Foam::processorMeshesReconstructor
 
 Description
+    The processorMeshesReconstructor will take a list of meshes with
+    matching processor boundaries and build a single combined mesh by
+    matching processor patches to each other.
+
+    In order to 
+
+Author
+    Hrvoje Jasak, Wikki Ltd.  All rights reserved.
 
 SourceFiles
     processorMeshesReconstructor.C
diff --git a/src/decompositionMethods/decompositionMethods/patchConstrainedDecomp/patchConstrainedDecomp.H b/src/decompositionMethods/decompositionMethods/patchConstrainedDecomp/patchConstrainedDecomp.H
index 74b045102..81f4d7162 100644
--- a/src/decompositionMethods/decompositionMethods/patchConstrainedDecomp/patchConstrainedDecomp.H
+++ b/src/decompositionMethods/decompositionMethods/patchConstrainedDecomp/patchConstrainedDecomp.H
@@ -96,10 +96,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~patchConstrainedDecomp()
-        {}
+    //- Destructor
+    virtual ~patchConstrainedDecomp()
+    {}
 
 
     // Member Functions
diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
index 17c8c619f..a346ec5bf 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
@@ -136,12 +136,12 @@ bool Foam::loadBalanceFvMesh::update()
 
         return false;
     }
-            
+
     Info<< "Hello from loadBalanceFvMesh::update()" << endl;
 
     // Check imbalance.  Note: add run-time selection for the imbalance
     // weights criterion
-    
+
     // Create a parallel decomposition
     domainDecomposition meshDecomp
     (
@@ -152,7 +152,8 @@ bool Foam::loadBalanceFvMesh::update()
     // Decompose the mesh based on processor data
     meshDecomp.decomposeMesh(false);
 
-    // Analyse mesh decomposition to see how many cells are passed to which processor
+    // Analyse mesh decomposition to see how many cells are passed
+    // to which processor
     labelListList migratedCells(meshDecomp.nProcs());
 
     // Fill local list with number of local cells to be sent to each processor
@@ -171,10 +172,13 @@ bool Foam::loadBalanceFvMesh::update()
     // Now that each processor has filled in its own part, combine the data
     Pstream::gatherList(migratedCells);
     Pstream::scatterList(migratedCells);
-    Pout<< "migratedCells: " << migratedCells << endl;
+
     // Reading through second index now tells how many cells will arrive
     // from which processor
 
+    // Find out which processor faces will become local internal faces
+    // by comparing decomposition index from the other side
+
 
     // Split the mesh and fields over processors and send
     for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
@@ -193,7 +197,8 @@ bool Foam::loadBalanceFvMesh::update()
                 (
                     procI,
                     time(),
-                    "processorPart" + Foam::name(procI)
+                    "processorPart" + Foam::name(procI),
+                    true    // Create passive processor patches
                 );
                 fvMesh& procMesh = procMeshPtr();
 
@@ -314,6 +319,76 @@ bool Foam::loadBalanceFvMesh::update()
         << reconMesh.boundary().size()
         << endl;
 
+    // Apply changes to the local mesh:
+    // - refactor the boundary to match new patches.  Note: processor
+    //   patch types may be added or removed
+    // - reset all primitives
+    Pout<< "Resetting mesh for load balancing.  Old boundary names: "
+        << boundaryMesh().names() << nl
+        << "New boundary names: "
+        << reconMesh.boundaryMesh().names() << nl
+        << endl;
+
+    polyBoundaryMesh& bMesh = const_cast<polyBoundaryMesh&>(boundaryMesh());
+
+    const polyBoundaryMesh& reconBMesh = reconMesh.boundaryMesh();
+
+    // Resize the existing boundary to match in the number of patches
+    if (bMesh.size() > reconBMesh.size())
+    {
+        // Decreasing in size: check patches that are due to disappear
+        Pout<< "New boundary is smaller: "
+            << bMesh.size() << " to " << reconBMesh.size() << endl;
+        // Check before resizing: only processor patches may be deleted
+        bool okToDelete = true;
+        
+        for (label patchI = reconBMesh.size(); patchI < bMesh.size(); patchI++)
+        {
+            if (!isA<processorPolyPatch>(bMesh[patchI]))
+            {
+                okToDelete = false;
+                break;
+            }
+        }
+
+        if (!okToDelete)
+        {
+            FatalErrorIn("bool loadBalanceFvMesh::update()")
+                << "Boundary resizing error: deleting non-processor patches "
+                << bMesh.size() << " to " << reconBMesh.size() << nl
+                << "old patch types: " << bMesh.types() << nl
+                << "new patch types: " << reconBMesh.types() << nl
+                << "This is not allowed."
+                << abort(FatalError);
+        }
+
+        // Resize the boundary
+        bMesh.setSize(reconBMesh.size());
+    }
+    else if (bMesh.size() < reconBMesh.size())
+    {
+        // Increasing in size: check patches that are due to disappear
+        Pout<< "New boundary is larger: "
+            << bMesh.size() << " to " << reconBMesh.size() << endl;
+
+        bMesh.setSize(reconBMesh.size());
+    }
+
+    // Delete processor patches from old boundary
+
+    
+    // Check alignment and types of old and new boundary
+    // forAll (bMesh, patchI)
+    // {
+    //     if (!bMesh[patchI].set())
+    //     {
+    //     }
+    // }
+
+    // To Do: reset mesh in polyMesh
+    // To Do: build a reconstructor from addressing data
+
+        
     // Create field reconstructor
     // fvFieldReconstructor fieldReconstructor
     // (
@@ -330,7 +405,7 @@ bool Foam::loadBalanceFvMesh::update()
     // Otherwise, they will be deleted.  HJ, 5/Mar/2018
     autoPtr<fvMesh> curMesh = procMeshes.set(Pstream::myProcNo(), NULL);
     curMesh.ptr();
-    
+
     return true;
 }
 

From afdc01fec6167d60072a34445e67e7933227c6c6 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 13 Apr 2018 22:13:41 +0100
Subject: [PATCH 13/45] Clean-up

---
 src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index e1d3cf76b..185c27272 100644
--- a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -125,7 +125,7 @@ Foam::polyBoundaryMesh::polyBoundaryMesh
 {
     polyPatchList& patches = *this;
     token firstToken(is);
-    Pout<< "firstToken: " << firstToken << endl;
+
     PtrList<entry> patchEntries(is);
     patches.setSize(patchEntries.size());
 

From 6f06d1cbd38c97b7841e243d1071a5cf865187b0 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 13 Apr 2018 22:14:06 +0100
Subject: [PATCH 14/45] Comments

---
 .../meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H    | 2 +-
 src/mesh/blockMesh/blockMesh/blockMeshTopology.C                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/foam/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H b/src/foam/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
index 8a2007647..b5beaac4e 100644
--- a/src/foam/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
+++ b/src/foam/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class wallPolyPatch Declaration
+                          Class wallPolyPatch Declaration
 \*---------------------------------------------------------------------------*/
 
 class wallPolyPatch
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
index f7c2a1700..3ec3bc842 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
@@ -468,7 +468,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology
                     << endl;
             }
 
-            // Override neighbourpatch name
+            // Override neighbour patch name
             if (nbrPatchNames[patchI] != word::null)
             {
                 dict.set("neighbourPatch", nbrPatchNames[patchI]);

From d8d860caee908e05f374f459ef8314b0dafa8077 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 23 Apr 2018 10:26:52 +0100
Subject: [PATCH 15/45] Load balancing updates

---
 .../finiteVolume/processorMeshesRebuild.C     |   7 +-
 .../finiteVolume/sharedPoints.C               |  27 --
 .../loadBalanceFvMesh/loadBalanceFvMesh.C     | 246 +++++++++++++++---
 3 files changed, 209 insertions(+), 71 deletions(-)

diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
index b94cd6e79..6d5f411eb 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
@@ -476,7 +476,6 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     label nReconFaces = 0;
     label nReconCells = 0;
     labelList reconPatchSizes(reconPatchTypes.size(), 0);
-    Pout<< "reconPatchNames: " << reconPatchNames << endl;
 
     forAll (meshes_, procI)
     {
@@ -909,10 +908,6 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                 }
             }
 
-            Pout<< "Processor " << procI << " merged " << nMergedPoints
-                << " points out of local " << curPoints.size()
-                << " and total " << nReconPoints << endl;
-
             // Dump all internal faces into the list
             const faceList& curFaces = curMesh.allFaces();
             const labelList& curOwner = curMesh.faceOwner();
@@ -1298,7 +1293,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     // Note: Mark boundary as invalid to disable analysis
     // due to the presence of old/new patches
     globalMesh.addFvPatches(reconPatches, false);
-    Pout<< "global boundary: " << globalMesh.boundaryMesh() << endl;
+
     // TODO: point, face and cell zones
 
     Info<< "Reconstructed addressing: " << nl;
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C
index 203ec753f..b707cb2b9 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C
@@ -26,12 +26,6 @@ License
 #include "sharedPoints.H"
 #include "processorPolyPatch.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 Foam::labelListList Foam::sharedPoints::procPatchPairs() const
@@ -393,16 +387,9 @@ void Foam::sharedPoints::calcSharedPoints()
             }
         }
     }
-
-    Info<< "nGlobalPoints_: " << nGlobalPoints_ << nl
-        << "sharedPointLabels_: " << sharedPointLabels_ << nl
-        << "sharedPointAddr_: " << sharedPointAddr_ << endl;
 }
 
 
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::sharedPoints::sharedPoints(const PtrList<fvMesh>& meshes)
@@ -422,18 +409,4 @@ Foam::sharedPoints::sharedPoints(const PtrList<fvMesh>& meshes)
 // {}
 
 
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
-// void Foam::sharedPoints::operator=(const sharedPoints& rhs)
-// {
-//     // Check for assignment to self
-//     if (this == &rhs)
-//     {
-//         FatalErrorIn("Foam::sharedPoints::operator=(const Foam::sharedPoints&)")
-//             << "Attempted assignment to self"
-//             << abort(FatalError);
-//     }
-// }
-
-
 // ************************************************************************* //
diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
index a346ec5bf..3371ff1fa 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
@@ -26,7 +26,6 @@ License
 #include "loadBalanceFvMesh.H"
 #include "domainDecomposition.H"
 #include "fvFieldDecomposer.H"
-
 #include "processorMeshesReconstructor.H"
 #include "fvFieldReconstructor.H"
 #include "mapPolyMesh.H"
@@ -137,8 +136,6 @@ bool Foam::loadBalanceFvMesh::update()
         return false;
     }
 
-    Info<< "Hello from loadBalanceFvMesh::update()" << endl;
-
     // Check imbalance.  Note: add run-time selection for the imbalance
     // weights criterion
 
@@ -164,6 +161,30 @@ bool Foam::loadBalanceFvMesh::update()
 
     const labelList& cellToProc = meshDecomp.cellToProc();
 
+    // Write as volScalarField for post-processing
+    volScalarField cellDist
+    (
+        IOobject
+        (
+            "cellDist",
+            time().timeName(),
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        *this,
+        dimensionedScalar("cellDist", dimless, 0),
+        zeroGradientFvPatchScalarField::typeName
+    );
+
+    forAll(cellToProc, celli)
+    {
+       cellDist[celli] = cellToProc[celli];
+    }
+
+    cellDist.write();
+
+
     forAll (cellToProc, cellI)
     {
         curMigratedCells[cellToProc[cellI]]++;
@@ -290,19 +311,24 @@ bool Foam::loadBalanceFvMesh::update()
                         false             // Do not sync
                     )
                 );
-                Pout<< "Received " << procI << " mesh stats: "
-                    << " polyPatches: "
-                    << procMeshes[procI].boundaryMesh().size()
-                    << " patches: "
-                    << procMeshes[procI].boundary().size()
-                    << endl;
+
                 // Receive the fields
             }
         }
         else
         {
             // Insert own mesh
-            procMeshes.set(procI, this);
+            procMeshes.set
+            (
+                procI,
+                meshDecomp.processorMesh
+                (
+                    procI,
+                    time(),
+                    "processorPart" + Foam::name(procI),
+                    true    // Create passive processor patches
+                )                
+            );
         }
     }
 
@@ -323,12 +349,8 @@ bool Foam::loadBalanceFvMesh::update()
     // - refactor the boundary to match new patches.  Note: processor
     //   patch types may be added or removed
     // - reset all primitives
-    Pout<< "Resetting mesh for load balancing.  Old boundary names: "
-        << boundaryMesh().names() << nl
-        << "New boundary names: "
-        << reconMesh.boundaryMesh().names() << nl
-        << endl;
 
+    // Use non-const access to boundaryMesh
     polyBoundaryMesh& bMesh = const_cast<polyBoundaryMesh&>(boundaryMesh());
 
     const polyBoundaryMesh& reconBMesh = reconMesh.boundaryMesh();
@@ -337,11 +359,10 @@ bool Foam::loadBalanceFvMesh::update()
     if (bMesh.size() > reconBMesh.size())
     {
         // Decreasing in size: check patches that are due to disappear
-        Pout<< "New boundary is smaller: "
-            << bMesh.size() << " to " << reconBMesh.size() << endl;
+
         // Check before resizing: only processor patches may be deleted
         bool okToDelete = true;
-        
+
         for (label patchI = reconBMesh.size(); patchI < bMesh.size(); patchI++)
         {
             if (!isA<processorPolyPatch>(bMesh[patchI]))
@@ -362,33 +383,189 @@ bool Foam::loadBalanceFvMesh::update()
                 << abort(FatalError);
         }
 
-        // Resize the boundary
+        // Resize the boundary.  Patches hanging off the end of the list
+        // will be deleted by PtrList
         bMesh.setSize(reconBMesh.size());
     }
     else if (bMesh.size() < reconBMesh.size())
     {
         // Increasing in size: check patches that are due to disappear
-        Pout<< "New boundary is larger: "
-            << bMesh.size() << " to " << reconBMesh.size() << endl;
-
         bMesh.setSize(reconBMesh.size());
     }
 
     // Delete processor patches from old boundary
+    boolList patchesToReplace(bMesh.size(), false);
+
+    forAll (bMesh, patchI)
+    {
+        // If the patch is not set, the slot is available for re-use
+        if (!bMesh.set(patchI))
+        {
+            patchesToReplace[patchI] = true;
+        }
+        else if (isA<processorPolyPatch>(bMesh[patchI]))
+        {
+            // If the patch is set and contains an "old" processor patch
+            // the old patch will be deleted and replaced with a new one
+            patchesToReplace[patchI] = true;
+        }
+    }
 
-    
     // Check alignment and types of old and new boundary
-    // forAll (bMesh, patchI)
-    // {
-    //     if (!bMesh[patchI].set())
-    //     {
-    //     }
-    // }
+    // Insert new patches processor patches
+    // Collect patch sizes and starts
+
+    labelList reconPatchSizes(reconBMesh.size(), 0);
+
+    forAll (bMesh, patchI)
+    {
+        // If the patch is preserved, types need to match
+        if (!patchesToReplace[patchI])
+        {
+            const polyPatch& bPatch = bMesh[patchI];
+            const polyPatch& reconBPatch = reconBMesh[patchI];
+
+            // Check if the patch is matching
+            if
+            (
+                bPatch.type() != reconBPatch.type()
+             || bPatch.name() != reconBPatch.name()
+            )
+            {
+                FatalErrorIn("bool loadBalanceFvMesh::update()")
+                    << "Patch names or types not matching for index "
+                    << patchI << nl
+                    << "bMesh name: " << bPatch.name()
+                    << " type: " << bPatch.type() << nl
+                    << "reconBMesh name: " << reconBPatch.name()
+                    << "  type: " << reconBPatch.type() << nl
+                    << abort(FatalError);
+            }
+
+            // Record patch size
+            reconPatchSizes[patchI] = reconBMesh[patchI].size();
+        }
+    }
+
+    // Insert new processor patches
+    // Note:
+    // The code is set up so that any intermediate empty boundary patch
+    // slots are re-used.  It is expected that the new patches will be
+    // added at the end, so this is safety.
+    // As a result, patch sizes and starts need to be re-assembled
+    // rather than used directly from reconBMesh
+    // HJ, 16/Apr/2018
+    forAll (reconBMesh, reconPatchI)
+    {
+        if (isA<processorPolyPatch>(reconBMesh[reconPatchI]))
+        {
+            // Find a slot to insert into
+            label nextPatchSlot = 0;
+
+            for
+            (
+                nextPatchSlot = 0;
+                nextPatchSlot < patchesToReplace.size();
+                nextPatchSlot++
+            )
+            {
+                if (patchesToReplace[nextPatchSlot])
+                {
+                    // Found a patch slot
+                    break;
+                }
+            }
+
+            if (nextPatchSlot >= patchesToReplace.size())
+            {
+                FatalErrorIn("bool loadBalanceFvMesh::update()")
+                    << "Cannot find available patch slot: " << nextPatchSlot
+                    << abort(FatalError);
+            }
+
+            // Insert a patch
+            const processorPolyPatch& ppPatch =
+                refCast<const processorPolyPatch>
+                (
+                    reconBMesh[reconPatchI]
+                );
+
+            // Note:
+            // The new mesh has not been reset.  Therefore, sizes and starts
+            // cannot be set properly until the mesh is reset
+            // This is done in the resetPrimitives function
+            // HJ, 16/Apr/2018
+            bMesh.set
+            (
+                nextPatchSlot,
+                new processorPolyPatch
+                (
+                    ppPatch.name(),
+                    0,                  // dummy size
+                    nInternalFaces(),   // dummy start
+                    // ppPatch.size(),
+                    // ppPatch.start(),
+                    nextPatchSlot,
+                    bMesh,
+                    ppPatch.myProcNo(),
+                    ppPatch.neighbProcNo()
+                )
+            );
+
+            // Mark patch slot as used
+            patchesToReplace[nextPatchSlot] = false;
+
+            // Collect size
+            reconPatchSizes[nextPatchSlot] = reconBMesh[reconPatchI].size();
+        }
+    }
+
+    // Debug
+    {
+        labelList RPSIZES(reconBMesh.size());
+
+        forAll (reconBMesh, patchI)
+        {
+            RPSIZES[patchI] = reconBMesh[patchI].size();
+        }
+
+        Pout<< "RPSIZES: " << RPSIZES << end;
+    }
+
+    // Patch sizes are assembled.  Collect patch starts for the new mesh
+    labelList reconPatchStarts(reconBMesh.size(), 0);
+
+    if (!reconPatchStarts.empty())
+    {
+        reconPatchStarts[0] = reconMesh.nInternalFaces();
+
+        for (label i = 1; i < reconPatchStarts.size(); i++)
+        {
+            reconPatchStarts[i] =
+                reconPatchStarts[i - 1]
+              + reconPatchSizes[i - 1];
+        }
+    }
+
+    // Reset fvMesh and patches
+    resetFvPrimitives
+    (
+        xferCopy(reconMesh.allPoints()),
+        xferCopy(reconMesh.allFaces()),
+        xferCopy(reconMesh.faceOwner()),
+        xferCopy(reconMesh.faceNeighbour()),
+        reconPatchSizes,
+        reconPatchStarts,
+        true                       // Valid boundary
+    );
+
+    Pout<< "faceOwner: " << faceOwner() << nl
+        << "faceNeighbour: " << faceNeighbour() << nl
+        << "boundary: " << boundaryMesh() << endl;
 
-    // To Do: reset mesh in polyMesh
     // To Do: build a reconstructor from addressing data
 
-        
+
     // Create field reconstructor
     // fvFieldReconstructor fieldReconstructor
     // (
@@ -399,13 +576,6 @@ bool Foam::loadBalanceFvMesh::update()
     //     meshRecon.boundaryProcAddressing()
     // );
 
-
-    // Note: Local mesh and fields need to be removed from the PtrList
-    // before the destruction and from autoPtr.
-    // Otherwise, they will be deleted.  HJ, 5/Mar/2018
-    autoPtr<fvMesh> curMesh = procMeshes.set(Pstream::myProcNo(), NULL);
-    curMesh.ptr();
-
     return true;
 }
 

From 3199b527b79324e4352b337ea8801bc3ea890fb0 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 23 Apr 2018 17:05:46 +0100
Subject: [PATCH 16/45] Bugfix: future patch processor ordering

---
 .../finiteVolume/decomposeMesh.C              | 469 +++++++++++-------
 .../finiteVolume/domainDecomposition.C        |  13 +-
 .../finiteVolume/processorMeshesRebuild.C     |  17 +-
 3 files changed, 299 insertions(+), 200 deletions(-)

diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
index bb5995fb5..bd385b835 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
@@ -126,6 +126,176 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 
         List<SLList<label> > procPatchIndex(nProcs_);
 
+        // Rewrite:
+        // Handling of coupled patches is changed.  HJ, 11/Apr/2018
+
+        // Prepare collection of patch faces
+
+        // For all processors, set the size of start index and patch size
+        // lists to the number of patches in the mesh
+        forAll (procPatchSize_, procI)
+        {
+            procPatchSize_[procI].setSize(patches.size());
+            procPatchStartIndex_[procI].setSize(patches.size());
+        }
+
+        forAll (patches, patchI)
+        {
+            // Reset size for all processors
+            forAll (procPatchSize_, procI)
+            {
+                procPatchSize_[procI][patchI] = 0;
+            }
+        }
+
+
+        // Algorithm:
+        // When running the decomposition in parallel, it is assumed that
+        // the result will be used in dynamic load balancing
+        // For load balancing, the processor patches need to match in order for
+        // the patch-to-patch matching to work propely on mesh reconstruction
+        // Therefore, all processor patches need to be split into the matching
+        // and non-matching part be examining the cellToProc_ data on
+        // the neighbour side.  This has been prepared in patchNbrCellToProc_
+        // HJ, 11/Apr/2018
+
+        // The correct order of dumping the faces is to dump the
+        // slave processor patches first, then internal faces and then
+        // master processor patches
+        // HJ, 23/Apr/2018
+
+        // Dump current processor patch faces into new processor patches
+        // that will be created in decomposition when running in parallel
+        forAll (patches, patchI)
+        {
+            // Check the processor patch for which neighbour data exists
+            if
+            (
+                isA<processorFvPatch>(patches[patchI])
+             && !patchNbrCellToProc_[patchI].empty()
+            )
+            {
+                const processorFvPatch& procPatch =
+                    refCast<const processorFvPatch>(patches[patchI]);
+
+                // DO ONLY SLAVE SIDE
+                if (!procPatch.master())
+                {
+                    // Get patch start
+                    const label patchStart = patches[patchI].patch().start();
+
+                    // Get faceCells
+                    const labelList& fc = patches[patchI].faceCells();
+
+                    // Get neighbour cellToProc addressing across the interface
+                    const labelList& curNbrPtc = patchNbrCellToProc_[patchI];
+
+                    forAll (fc, patchFaceI)
+                    {
+                        // Local owner proc is looked up using faceCells
+                        const label ownerProc = cellToProc_[fc[patchFaceI]];
+
+                        // Neighbour proc is looked up directly
+                        const label neighbourProc = curNbrPtc[patchFaceI];
+
+                        // Check change in processor type across the processor
+                        // boundary
+                        // If ownerProc and neighbourProc are the same, the
+                        // processor face will be merged, meaning that it
+                        // remains in the (old) processor patch
+                        // If ownerProc and neighbourProc are different,
+                        // this will be a new processor boundary created from
+                        //  the existing processor face and added afterwards
+                        if (ownerProc != neighbourProc)
+                        {
+                            Pout<< "Slave: New proc from old proc["
+                                << patchFaceI
+                                << "]: " << ownerProc << " " << neighbourProc
+                                << " face: " << patchStart + patchFaceI
+                                << endl;
+
+                            // Search algorithm repeated in processor patches.
+                            // HJ, 11/Apr/2018
+                            SLList<label>::iterator curInterProcBdrsOwnIter =
+                                interProcBoundaries[ownerProc].begin();
+
+                            SLList<SLList<label> >::iterator
+                                curInterProcBFacesOwnIter =
+                                interProcBFaces[ownerProc].begin();
+
+                            bool interProcBouFound = false;
+
+                            // WARNING: Synchronous SLList iterators
+
+                            for
+                            (
+                                ;
+                                curInterProcBdrsOwnIter
+                             != interProcBoundaries[ownerProc].end()
+                             && curInterProcBFacesOwnIter
+                             != interProcBFaces[ownerProc].end();
+                                ++curInterProcBdrsOwnIter,
+                                ++curInterProcBFacesOwnIter
+                            )
+                            {
+                                if (curInterProcBdrsOwnIter() == neighbourProc)
+                                {
+                                    // Inter - processor boundary exists.
+                                    // Add the face
+                                    interProcBouFound = true;
+
+                                    // Add to owner only!
+                                    curInterProcBFacesOwnIter().append
+                                    (
+                                        patchStart + patchFaceI
+                                    );
+                                }
+
+                                if (interProcBouFound) break;
+                            }
+
+                            if (!interProcBouFound)
+                            {
+                                // inter - processor boundaries do not exist and
+                                // need to be created
+
+                                // set the new addressing information
+
+                                // Add to owner only!
+                                interProcBoundaries[ownerProc].append
+                                (
+                                    neighbourProc
+                                );
+                                interProcBFaces[ownerProc].append
+                                (
+                                    SLList<label>(patchStart + patchFaceI)
+                                );
+                            }
+                        }
+                        else
+                        {
+                            // Owner and neighbour processor index are the same
+                            // across the processor boundary.  This face will be
+                            // re-merged into internal faces in load balancing
+                            // and therefore remains in the processor patch
+                            Pout<< "Preserved proc[" << patchFaceI << "]: "
+                                << ownerProc << " " << neighbourProc << endl;
+
+                            // Add the face
+                            procFaceList[ownerProc].append
+                            (
+                                patchStart + patchFaceI
+                            );
+
+                            // Increment the number of faces for this patch
+                            procPatchSize_[ownerProc][patchI]++;
+                        }
+                    }
+                }
+            }
+        }
+
+        // Internal mesh faces
         forAll (neighbour, faceI)
         {
             if (cellToProc_[owner[faceI]] != cellToProc_[neighbour[faceI]])
@@ -199,15 +369,19 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                             if (neighbourFound) break;
                         }
 
-                        if (interProcBouFound && !neighbourFound)
-                        {
-                            FatalErrorIn
+                        if (!neighbourFound)
+                        { 
+                            // Owner found (slave proc boundary), but neighbour
+                            // not found: add it
+                            interProcBoundaries[neighbourProc].append
                             (
-                                "domainDecomposition::decomposeMesh()"
-                            )   << "Inconsistency in inter - "
-                                << "processor boundary lists for processors "
-                                << ownerProc << " and " << neighbourProc
-                                << abort(FatalError);
+                                ownerProc
+                            );
+
+                            interProcBFaces[neighbourProc].append
+                            (
+                                SLList<label>(faceI)
+                            );
                         }
                     }
 
@@ -221,11 +395,11 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 
                     // set the new addressing information
 
-                    // owner
+                    // Add owner side
                     interProcBoundaries[ownerProc].append(neighbourProc);
                     interProcBFaces[ownerProc].append(SLList<label>(faceI));
 
-                    // neighbour
+                    // Add neighbour side
                     interProcBoundaries[neighbourProc].append(ownerProc);
                     interProcBFaces[neighbourProc].append
                     (
@@ -235,39 +409,6 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             }
         }
 
-        // Rewrite:
-        // Handling of coupled patches is changed.  HJ, 11/Apr/2018
-
-        // Prepare collection of patch faces
-
-        // For all processors, set the size of start index and patch size
-        // lists to the number of patches in the mesh
-        forAll (procPatchSize_, procI)
-        {
-            procPatchSize_[procI].setSize(patches.size());
-            procPatchStartIndex_[procI].setSize(patches.size());
-        }
-
-        forAll (patches, patchI)
-        {
-            // Reset size for all processors
-            forAll (procPatchSize_, procI)
-            {
-                procPatchSize_[procI][patchI] = 0;
-            }
-        }
-
-
-        // Algorithm:
-        // When running the decomposition in parallel, it is assumed that
-        // the result will be used in dynamic load balancing
-        // For load balancing, the processor patches need to match in order for
-        // the patch-to-patch matching to work propely on mesh reconstruction
-        // Therefore, all processor patches need to be split into the matching
-        // and non-matching part be examining the cellToProc_ data on
-        // the neighbour side.  This has been prepared in patchNbrCellToProc_
-        // HJ, 11/Apr/2018
-
         // Dump current processor patch faces into new processor patches
         // that will be created in decomposition when running in parallel
         forAll (patches, patchI)
@@ -279,167 +420,121 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
              && !patchNbrCellToProc_[patchI].empty()
             )
             {
-                // Get patch start
-                const label patchStart = patches[patchI].patch().start();
+                const processorFvPatch& procPatch =
+                    refCast<const processorFvPatch>(patches[patchI]);
 
-                // Get faceCells
-                const labelList& fc = patches[patchI].faceCells();
-
-                // Get neighbour cellToProc addressing across the interface
-                const labelList& curNbrPtc = patchNbrCellToProc_[patchI];
-
-                forAll (fc, patchFaceI)
+                // DO ONLY MASTER SIDE
+                if (procPatch.master())
                 {
-                    // Local owner proc is looked up using faceCells
-                    const label ownerProc = cellToProc_[fc[patchFaceI]];
+                    // Get patch start
+                    const label patchStart = patches[patchI].patch().start();
 
-                    // Neighbour proc is looked up directly
-                    const label neighbourProc = curNbrPtc[patchFaceI];
+                    // Get faceCells
+                    const labelList& fc = patches[patchI].faceCells();
 
-                    // Check change in processor type across the processor
-                    // boundary
-                    // If ownerProc and neighbourProc are the same, the
-                    // processor face will be merged, meaning that it remains
-                    // in the (old) processor patch
-                    // If ownerProc and neighbourProc are different, this will
-                    // be a new processor boundary created from the existing
-                    // processor face and added afterwards
-                    if (ownerProc != neighbourProc)
+                    // Get neighbour cellToProc addressing across the interface
+                    const labelList& curNbrPtc = patchNbrCellToProc_[patchI];
+
+                    forAll (fc, patchFaceI)
                     {
-                        Pout<< "New proc from old proc[" << patchFaceI << "]: "
-                            << ownerProc << " " << neighbourProc << endl;
-                        // Search algorithm repeated in processor patches.
-                        // HJ, 11/Apr/2018
-                        SLList<label>::iterator curInterProcBdrsOwnIter =
-                            interProcBoundaries[ownerProc].begin();
+                        // Local owner proc is looked up using faceCells
+                        const label ownerProc = cellToProc_[fc[patchFaceI]];
 
-                        SLList<SLList<label> >::iterator
-                            curInterProcBFacesOwnIter =
-                            interProcBFaces[ownerProc].begin();
+                        // Neighbour proc is looked up directly
+                        const label neighbourProc = curNbrPtc[patchFaceI];
 
-                        bool interProcBouFound = false;
-
-                        // WARNING: Synchronous SLList iterators
-
-                        for
-                        (
-                            ;
-                            curInterProcBdrsOwnIter
-                         != interProcBoundaries[ownerProc].end()
-                         && curInterProcBFacesOwnIter
-                         != interProcBFaces[ownerProc].end();
-                            ++curInterProcBdrsOwnIter,
-                            ++curInterProcBFacesOwnIter
-                        )
+                        // Check change in processor type across the processor
+                        // boundary
+                        // If ownerProc and neighbourProc are the same, the
+                        // processor face will be merged, meaning that it
+                        // remains in the (old) processor patch
+                        // If ownerProc and neighbourProc are different,
+                        // this will be a new processor boundary created from
+                        //  the existing processor face and added afterwards
+                        if (ownerProc != neighbourProc)
                         {
-                            if (curInterProcBdrsOwnIter() == neighbourProc)
+                            Pout<< "Master: New proc from old proc["
+                                << patchFaceI << "]: "
+                                << ownerProc << " " << neighbourProc
+                                << " face: " << patchStart + patchFaceI << endl;
+
+                            // Search algorithm repeated in processor patches.
+                            // HJ, 11/Apr/2018
+                            SLList<label>::iterator curInterProcBdrsOwnIter =
+                                interProcBoundaries[ownerProc].begin();
+
+                            SLList<SLList<label> >::iterator
+                                curInterProcBFacesOwnIter =
+                                interProcBFaces[ownerProc].begin();
+
+                            bool interProcBouFound = false;
+
+                            // WARNING: Synchronous SLList iterators
+
+                            for
+                            (
+                                ;
+                                curInterProcBdrsOwnIter
+                             != interProcBoundaries[ownerProc].end()
+                             && curInterProcBFacesOwnIter
+                             != interProcBFaces[ownerProc].end();
+                                ++curInterProcBdrsOwnIter,
+                                ++curInterProcBFacesOwnIter
+                            )
                             {
-                                // Inter - processor boundary exists.
-                                // Add the face
-                                interProcBouFound = true;
-
-                                curInterProcBFacesOwnIter().append
-                                (
-                                    patchStart + patchFaceI
-                                );
-
-                                SLList<label>::iterator
-                                    curInterProcBdrsNeiIter =
-                                    interProcBoundaries[neighbourProc].begin();
-
-                                SLList<SLList<label> >::iterator
-                                    curInterProcBFacesNeiIter =
-                                    interProcBFaces[neighbourProc].begin();
-
-                                bool neighbourFound = false;
-
-                                // WARNING: Synchronous SLList iterators
-
-                                for
-                                (
-                                    ;
-                                    curInterProcBdrsNeiIter !=
-                                    interProcBoundaries[neighbourProc].end()
-                                 && curInterProcBFacesNeiIter !=
-                                    interProcBFaces[neighbourProc].end();
-                                    ++curInterProcBdrsNeiIter,
-                                    ++curInterProcBFacesNeiIter
-                                )
+                                if (curInterProcBdrsOwnIter() == neighbourProc)
                                 {
-                                    if (curInterProcBdrsNeiIter() == ownerProc)
-                                    {
-                                        // Boundary found. Add the face
-                                        neighbourFound = true;
+                                    // Inter - processor boundary exists.
+                                    // Add the face
+                                    interProcBouFound = true;
 
-                                        curInterProcBFacesNeiIter().append
-                                        (
-                                            patchStart + patchFaceI
-                                        );
-                                    }
-
-                                    if (neighbourFound) break;
-                                }
-
-                                if (interProcBouFound && !neighbourFound)
-                                {
-                                    FatalErrorIn
+                                    // Add to owner only!
+                                    curInterProcBFacesOwnIter().append
                                     (
-                                        "domainDecomposition::decomposeMesh()"
-                                    )   << "Inconsistency in inter - "
-                                        << "processor boundary lists for "
-                                        << "processors "
-                                        << ownerProc << " and "
-                                        << neighbourProc
-                                        << abort(FatalError);
+                                        patchStart + patchFaceI
+                                    );
                                 }
+
+                                if (interProcBouFound) break;
                             }
 
-                            if (interProcBouFound) break;
-                        }
+                            if (!interProcBouFound)
+                            {
+                                // inter - processor boundaries do not exist and
+                                // need to be created
+                                
+                                // set the new addressing information
 
-                        if (!interProcBouFound)
+                                // Add to owner only!
+                                interProcBoundaries[ownerProc].append
+                                (
+                                    neighbourProc
+                                );
+                                interProcBFaces[ownerProc].append
+                                (
+                                    SLList<label>(patchStart + patchFaceI)
+                                );
+                            }
+                        }
+                        else
                         {
-                            // inter - processor boundaries do not exist and
-                            // need to be created
+                            // Owner and neighbour processor index are the same
+                            // across the processor boundary.  This face will be
+                            // re-merged into internal faces in load balancing
+                            // and therefore remains in the processor patch
+                            Pout<< "Preserved proc[" << patchFaceI << "]: "
+                                << ownerProc << " " << neighbourProc << endl;
 
-                            // set the new addressing information
-
-                            // owner
-                            interProcBoundaries[ownerProc].append
+                            // Add the face
+                            procFaceList[ownerProc].append
                             (
-                                neighbourProc
-                            );
-                            interProcBFaces[ownerProc].append
-                            (
-                                SLList<label>(patchStart + patchFaceI)
+                                patchStart + patchFaceI
                             );
 
-                            // neighbour
-                            interProcBoundaries[neighbourProc].append
-                            (
-                                ownerProc
-                            );
-                            interProcBFaces[neighbourProc].append
-                            (
-                                SLList<label>(patchStart + patchFaceI)
-                            );
+                            // Increment the number of faces for this patch
+                            procPatchSize_[ownerProc][patchI]++;
                         }
                     }
-                    else
-                    {
-                        // Owner and neighbour processor index are the same
-                        // across the processor boundary.  This face will be
-                        // re-merged into internal faces in load balancing
-                        // and therefore remains in the processor patch
-                        Pout<< "Preserved proc[" << patchFaceI << "]: "
-                            << ownerProc << " " << neighbourProc << endl;
-
-                        // add the face
-                        procFaceList[ownerProc].append(patchStart + patchFaceI);
-
-                        // increment the number of faces for this patch
-                        procPatchSize_[ownerProc][patchI]++;
-                    }
                 }
             }
         }
@@ -462,11 +557,13 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             // Do normal patches.  Note that processor patches
             // have already been done and need to be skipped
             // For all other patches patchNbrCellToProc_ will be empty
-            if
-            (
-                !isA<cyclicFvPatch>(patches[patchI])
-             && patchNbrCellToProc_[patchI].empty()
-            )
+            if (!patchNbrCellToProc_[patchI].empty())
+            {
+                // Processor patch.  Skip it
+                continue;
+            }
+
+            if (!isA<cyclicFvPatch>(patches[patchI]))
             {
                 // Normal patch. Add faces to processor where the cell
                 // next to the face lives
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
index c36cbd278..44cc03ba7 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
@@ -39,6 +39,7 @@ License
 
 defineTypeNameAndDebug(Foam::domainDecomposition, 0);
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::domainDecomposition::domainDecomposition
@@ -117,19 +118,19 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
 
     faceList procFaces(curFaceLabels.size());
 
-    forAll (curFaceLabels, facei)
+    forAll (curFaceLabels, faceI)
     {
         // Mark the original face as used
         // Remember to decrement the index by one (turning index)
         // HJ, 5/Dec/2001
-        label curF = mag(curFaceLabels[facei]) - 1;
+        label curF = mag(curFaceLabels[faceI]) - 1;
 
-        faceLookup[curF] = facei;
+        faceLookup[curF] = faceI;
 
         // get the original face
         labelList origFaceLabels;
 
-        if (curFaceLabels[facei] >= 0)
+        if (curFaceLabels[faceI] >= 0)
         {
             // face not turned
             origFaceLabels = meshFaces[curF];
@@ -140,7 +141,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
         }
 
         // translate face labels into local point list
-        face& procFaceLabels = procFaces[facei];
+        face& procFaceLabels = procFaces[faceI];
 
         procFaceLabels.setSize(origFaceLabels.size());
 
@@ -275,7 +276,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
             procPatches[nPatches] =
                 new passiveProcessorPolyPatch
                 (
-                    word("procBoundary") + Foam::name(procI)
+                    word("passiveProcBoundary") + Foam::name(procI)
                   + word("to")
                   + Foam::name(curNeighbourProcessors[procPatchI]),
                     curProcessorPatchSizes[procPatchI],
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
index 6d5f411eb..2f1aa34f2 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
@@ -650,8 +650,8 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
     // Dump first valid mesh without checking
     {
-        Pout<< "Dump mesh 0" << endl;
         const label fvmId = firstValidMesh();
+        Pout<< "Dump mesh " << fvmId << endl;
 
         cellOffset[fvmId] = 0;
 
@@ -719,7 +719,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
                 // Record boundary-processor addressing: unmapped patch
                 bpAddr[patchI] = -1;
-                
+
                 for
                 (
                     label faceI = procPatch.start();
@@ -754,7 +754,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
                 // Record boundary-processor addressing: mapped patch
                 bpAddr[patchI] = pnIndex;
-                
+
                 faceList& curRpFaces = reconPatchFaces[pnIndex];
                 labelList& curRpfOwner = reconPatchOwner[pnIndex];
                 label& nRpf = reconPatchSizes[pnIndex];
@@ -795,13 +795,14 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
     for (label procI = 1; procI < meshes_.size(); procI++)
     {
-        Pout<< "Dump mesh " << procI << endl;
         // Grab cell offset from previous offset and mesh size
         cellOffset[procI] =
             cellOffset[procI - 1] + meshes_[procI - 1].nCells();
 
         if (meshes_.set(procI))
         {
+            Pout<< "Dump mesh " << procI << endl;
+
             const polyMesh& curMesh = meshes_[procI];
             const polyBoundaryMesh& procPatches = curMesh.boundaryMesh();
 
@@ -972,7 +973,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
                     // Record boundary-processor addressing: unmapped patch
                     bpAddr[patchI] = -1;
-                
+
                     // If patch is a master, drop the faces and fill the
                     // owner side addressing
                     if (procPatch.master())
@@ -1055,7 +1056,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
                     // Record boundary-processor addressing: mapped patch
                     bpAddr[patchI] = pnIndex;
-                
+
                     faceList& curRpFaces = reconPatchFaces[pnIndex];
                     labelList& curRpfOwner = reconPatchOwner[pnIndex];
                     label& nRpf = reconPatchSizes[pnIndex];
@@ -1206,7 +1207,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     // Create patch list by cloning meshes.  If all processors hold all live
     // patches, it is sufficient to rebuilt the patches only from the first
     // valid processor
-    // Note: 
+    // Note:
     List<polyPatch*> reconPatches(nReconPatches, NULL);
 
     forAll (meshes_, procI)
@@ -1288,7 +1289,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                 << abort(FatalError);
         }
     }
-    
+
     // Add boundary patches to polyMesh and fvMesh
     // Note: Mark boundary as invalid to disable analysis
     // due to the presence of old/new patches

From f523ecfb3c4d36e86cc00d96e6c2dbfce0dcc2e2 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 24 Apr 2018 11:03:39 +0100
Subject: [PATCH 17/45] Formatting

---
 src/foam/containers/Lists/PtrList/PtrList.H       | 5 ++---
 src/foam/meshes/patchIdentifier/patchIdentifier.H | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/foam/containers/Lists/PtrList/PtrList.H b/src/foam/containers/Lists/PtrList/PtrList.H
index 89d4c17b6..0c663c941 100644
--- a/src/foam/containers/Lists/PtrList/PtrList.H
+++ b/src/foam/containers/Lists/PtrList/PtrList.H
@@ -145,9 +145,8 @@ public:
         PtrList(Istream&);
 
 
-    // Destructor
-
-        ~PtrList();
+    //- Destructor
+    ~PtrList();
 
 
     // Member functions
diff --git a/src/foam/meshes/patchIdentifier/patchIdentifier.H b/src/foam/meshes/patchIdentifier/patchIdentifier.H
index c0e781872..619d42616 100644
--- a/src/foam/meshes/patchIdentifier/patchIdentifier.H
+++ b/src/foam/meshes/patchIdentifier/patchIdentifier.H
@@ -52,7 +52,7 @@ Ostream& operator<<(Ostream&, const patchIdentifier&);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class patchIdentifier Declaration
+                     Class patchIdentifier Declaration
 \*---------------------------------------------------------------------------*/
 
 class patchIdentifier
@@ -97,9 +97,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~patchIdentifier();
+    //- Destructor
+    virtual ~patchIdentifier();
 
 
     // Member Functions

From 3f8721dfec32c99eda9b5a0a72d35f7d90a586e1 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 24 Apr 2018 11:04:03 +0100
Subject: [PATCH 18/45] Load balancing support, polyMesh

---
 src/foam/meshes/polyMesh/polyMesh.C           | 14 ++++-----
 src/foam/meshes/polyMesh/polyMesh.H           |  4 +--
 .../polyPatches/polyPatch/polyPatch.C         | 30 +++++++++++++++++++
 .../polyPatches/polyPatch/polyPatch.H         |  7 +++++
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/foam/meshes/polyMesh/polyMesh.C b/src/foam/meshes/polyMesh/polyMesh.C
index b53e36c0c..cf4b48c07 100644
--- a/src/foam/meshes/polyMesh/polyMesh.C
+++ b/src/foam/meshes/polyMesh/polyMesh.C
@@ -719,6 +719,9 @@ void Foam::polyMesh::resetPrimitives
     // Clear addressing. Keep geometric props for mapping.
     clearAddressing();
 
+    // Clear everything
+    clearOut();
+
     // Take over new primitive data.
     // Optimized to avoid overwriting data at all
     if (!pts().empty())
@@ -748,19 +751,16 @@ void Foam::polyMesh::resetPrimitives
 
 
     // Reset patch sizes and starts
+    Pout<< "Resetting patches: starts: " << patchStarts << endl;
     forAll (boundary_, patchI)
     {
-        boundary_[patchI] = polyPatch
+        boundary_[patchI].resetPatch
         (
-            boundary_[patchI].name(),
             patchSizes[patchI],
-            patchStarts[patchI],
-            patchI,
-            boundary_
+            patchStarts[patchI]
         );
     }
 
-
     // Flags the mesh files as being changed
     setInstance(time().timeName());
 
@@ -804,12 +804,10 @@ void Foam::polyMesh::resetPrimitives
         }
     }
 
-
     // Set the primitive mesh from the owner_, neighbour_.
     // Works out from patch end where the active faces stop.
     initMesh();
 
-
     if (validBoundary)
     {
         // Note that we assume that all the patches stay the same and are
diff --git a/src/foam/meshes/polyMesh/polyMesh.H b/src/foam/meshes/polyMesh/polyMesh.H
index d1d64d2cb..2c2e2190f 100644
--- a/src/foam/meshes/polyMesh/polyMesh.H
+++ b/src/foam/meshes/polyMesh/polyMesh.H
@@ -539,8 +539,8 @@ public:
             void removeZones();
 
             //- Reset mesh primitive data. Assumes all patch info correct
-            //  (so does e.g. parallel communication). If not use
-            //  validBoundary=false
+            //  (so does e.g. parallel communication). If not, use
+            //  validBoundary = false
             //  (still assumes patchStarts[0] = nInternalFaces and last
             //  patch ends at nActiveFaces) and change patches with addPatches.
             void resetPrimitives
diff --git a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index babd37e9e..df7ad82f8 100644
--- a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -579,6 +579,36 @@ void Foam::polyPatch::syncOrder() const
 {}
 
 
+void Foam::polyPatch::resetPatch
+(
+    const label newSize,
+    const label newStart
+)
+{
+    // Clear all data
+    clearAddressing();
+    
+    // Reset start and primitive patch
+    start_ = newStart;
+    
+    primitivePatch::operator=
+    (
+        primitivePatch
+        (
+            faceSubList
+            (
+                boundaryMesh_.mesh().allFaces(),
+                newSize,
+                newStart
+            ),
+            boundaryMesh_.mesh().allPoints()
+        )
+    );
+
+    Pout<< "Patch reset: faceCells: " << faceCells() << endl;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 void Foam::polyPatch::operator=(const polyPatch& p)
diff --git a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index 29dc8a0d3..c834b274b 100644
--- a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -464,6 +464,13 @@ public:
         //  but is happening on other processors
         virtual void syncOrder() const;
 
+        //- Reset patch
+        virtual void resetPatch
+        (
+            const label newSize,
+            const label newStart
+        );
+
 
     // Member operators
 

From 685151b9be47c3ef009901e6e2a1de4fa8f25caf Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 24 Apr 2018 11:04:22 +0100
Subject: [PATCH 19/45] Formatting

---
 .../matrices/blockLduMatrix/BlockAMG/coarseBlockAMGLevel.C   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/foam/matrices/blockLduMatrix/BlockAMG/coarseBlockAMGLevel.C b/src/foam/matrices/blockLduMatrix/BlockAMG/coarseBlockAMGLevel.C
index 694f2a152..ac6abf3d6 100644
--- a/src/foam/matrices/blockLduMatrix/BlockAMG/coarseBlockAMGLevel.C
+++ b/src/foam/matrices/blockLduMatrix/BlockAMG/coarseBlockAMGLevel.C
@@ -244,8 +244,7 @@ void Foam::coarseBlockAMGLevel<Type>::solve
         // Note: top-level preconditioner is incorrect: FIX.  HJ, 3/Oct/2017
         topLevelDict.add("preconditioner", "Cholesky");
 
-        coarseSolverPerf =
-         BlockCGSolver<Type>
+        coarseSolverPerf = BlockCGSolver<Type>
         (
             "topLevelCorr",
             matrixPtr_,
@@ -348,7 +347,7 @@ void Foam::coarseBlockAMGLevel<Type>::initLevel
 )
 {
     // Update matrix by repeating coarsening
-    
+
     // Update smoother for new matrix
     smootherPtr_->initMatrix();
 

From 942ecf88c1e47ed2120b1ae8e622ac66c6ebd1c6 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 24 Apr 2018 11:05:21 +0100
Subject: [PATCH 20/45] Load balancing support, fvMesh

---
 .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.C    | 58 ++++++++++++++-----
 .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.H    |  5 ++
 src/finiteVolume/fvMesh/fvMesh.C              | 38 +++++++++++-
 src/finiteVolume/fvMesh/fvMesh.H              | 19 ++++++
 src/finiteVolume/fvMesh/fvMeshGeometry.C      |  6 +-
 .../fvMesh/fvPatches/fvPatch/fvPatch.C        |  3 +-
 6 files changed, 109 insertions(+), 20 deletions(-)

diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
index 264a8620d..c8cf5195a 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
@@ -27,33 +27,63 @@ License
 #include "fvBoundaryMesh.H"
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void fvBoundaryMesh::addFvPatches()
+void Foam::fvBoundaryMesh::addFvPatches()
 {
     const polyBoundaryMesh& bMesh = mesh_.boundaryMesh();
-    
+
+    // Clear existing patches and resize the list
+    clear();
     setSize(bMesh.size());
 
     // Set boundary patches, using the patches added to the polyMesh
     // Bug fix.  HJ, 1/Mar/2018
     fvPatchList& Patches = *this;
 
-    forAll(Patches, patchI)
+    forAll (Patches, patchI)
     {
         Patches.set(patchI, fvPatch::New(bMesh[patchI], *this));
     }
 }
 
 
+void Foam::fvBoundaryMesh::resetFvPatches(const boolList& resetFvPatchFlag)
+{
+    const polyBoundaryMesh& bMesh = mesh_.boundaryMesh();
+
+    if (resetFvPatchFlag.size() != bMesh.size())
+    {
+        FatalErrorIn("void resetFvPatches(const boolList& resetFvPatchFlag)")
+            << "Incorrect size of reset list.  Boundary size: "
+            << bMesh.size() << " reset size: " << resetFvPatchFlag.size()
+            << abort(FatalError);
+    }
+
+    // Reset list size.  This will delete pointers to patches
+    // if the list is truncated
+    setSize(bMesh.size());
+
+    // Set boundary patches, using the patches added to the polyMesh
+    // Bug fix.  HJ, 1/Mar/2018
+    fvPatchList& Patches = *this;
+
+    // In order to preserve patch links on resize of boundary,
+    // only reset the empty slots
+    forAll (Patches, patchI)
+    {
+        if (resetFvPatchFlag[patchI])
+        {
+            // Set new patch.  This also deletes old pointer
+            Patches.set(patchI, fvPatch::New(bMesh[patchI], *this));
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-fvBoundaryMesh::fvBoundaryMesh
+Foam::fvBoundaryMesh::fvBoundaryMesh
 (
     const fvMesh& m
 )
@@ -67,7 +97,7 @@ fvBoundaryMesh::fvBoundaryMesh
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void fvBoundaryMesh::movePoints()
+void Foam::fvBoundaryMesh::movePoints()
 {
     forAll(*this, patchi)
     {
@@ -81,7 +111,7 @@ void fvBoundaryMesh::movePoints()
 }
 
 
-lduInterfacePtrsList fvBoundaryMesh::interfaces() const
+Foam::lduInterfacePtrsList Foam::fvBoundaryMesh::interfaces() const
 {
     lduInterfacePtrsList interfaces(size());
 
@@ -101,15 +131,11 @@ lduInterfacePtrsList fvBoundaryMesh::interfaces() const
 }
 
 
-void fvBoundaryMesh::readUpdate()
+void Foam::fvBoundaryMesh::readUpdate()
 {
     clear();
     addFvPatches();
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
index e9e5d55f4..e6a420db3 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
@@ -73,6 +73,11 @@ private:
         //- Add fvPatches corresponding to the polyBoundaryMesh
         void addFvPatches();
 
+        //- Reset fvPatches corresponding to the polyBoundaryMesh
+        //  When the mesh is resized, the existing patches may be preserved
+        //  or reset depending on the resetFlag
+        void resetFvPatches(const boolList& resetFvPatchFlag);
+
 
 protected:
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index f5b87e4b1..713cfc919 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -392,13 +392,49 @@ void Foam::fvMesh::removeFvBoundary()
 
     // Remove fvBoundaryMesh data first.
     boundary_.clear();
-    boundary_.setSize(0);
     polyMesh::removeBoundary();
 
     clearOut();
 }
 
 
+void Foam::fvMesh::resetFvPrimitives
+(
+    const Xfer<pointField>& points,
+    const Xfer<faceList>& faces,
+    const Xfer<labelList>& owner,
+    const Xfer<labelList>& neighbour,
+    const labelList& patchSizes,
+    const labelList& patchStarts,
+    const boolList& resetFvPatchFlag,
+    const bool validBoundary
+)
+{
+    // Reset polyMesh primitives
+    polyMesh::resetPrimitives
+    (
+        points,
+        faces,
+        owner,
+        neighbour,
+        patchSizes,
+        patchStarts,
+        validBoundary
+    );
+
+    boundary_.resetFvPatches(resetFvPatchFlag);
+    surfaceInterpolation::clearOut();
+    clearGeomNotOldVol();
+
+    // Reset fvPatches?  HJ, 16/Apr/2018
+
+    // Clear LDU
+    clearAddressing();
+
+    // Clear cell volumes?
+}        
+
+
 Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
 {
     if (debug)
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 22f973efc..90d23af20 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -360,6 +360,25 @@ public:
             //  these fvPatches.
             void removeFvBoundary();
 
+            //- Reset mesh primitive data. Assumes all patch info correct
+            //  (so does e.g. parallel communication). If not, use
+            //  validBoundary = false
+            //  (still assumes patchStarts[0] = nInternalFaces and last
+            //  patch ends at nActiveFaces) and change patches with addPatches.
+            //  resetFvPatchFlag indicates which fvPatches will be rebuilt
+            //  if the flag is set to false, original patch is preserved
+            void resetFvPrimitives
+            (
+                const Xfer<pointField>& points,
+                const Xfer<faceList>& faces,
+                const Xfer<labelList>& owner,
+                const Xfer<labelList>& neighbour,
+                const labelList& patchSizes,
+                const labelList& patchStarts,
+                const boolList& resetFvPatchFlag,
+                const bool validBoundary = true
+            );
+
             //- Return cell face motion fluxes
             surfaceScalarField& setPhi();
 
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index e5286a3fb..6f83ec2ee 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -155,7 +155,8 @@ void fvMesh::makeC() const
         *this,
         dimLength,
         cellCentres(),
-        faceCentres()
+        faceCentres(),
+        false             // Do not preserve couples in geometry fields
     );
 
     // This piece of code is necessary for cyclic and cyclicGgi interfaces
@@ -231,7 +232,8 @@ void fvMesh::makeCf() const
         ),
         *this,
         dimLength,
-        faceCentres()
+        faceCentres(),
+        false             // Do not preserve couples in geometry fields
     );
 
     // Boundary update.  Used in complex geometries, eg. immersed boundary
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
index 4fd439f4e..fc99a18f6 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
@@ -146,7 +146,8 @@ tmp<vectorField> fvPatch::Cn() const
     // Get reference to global cell centres
     // Bugfix: access cell centres from fvMesh data, not polyMesh.
     // HJ, 30/Nov/2017
-    const vectorField& gcc = boundaryMesh().mesh().C().internalField();
+    // const vectorField& gcc = boundaryMesh().mesh().C().internalField();
+    const vectorField& gcc = boundaryMesh().mesh().cellCentres();
 
     forAll (faceCells, faceI)
     {

From 9cc1acc8a0b56177d63958e7216a03d2e69e3f8a Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 24 Apr 2018 11:07:07 +0100
Subject: [PATCH 21/45] Load balancing - WIP

---
 .../loadBalanceFvMesh/loadBalanceFvMesh.C     | 71 ++++++++++---------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
index 3371ff1fa..8964a6e29 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
@@ -276,6 +276,29 @@ bool Foam::loadBalanceFvMesh::update()
         meshDecomp.nProcs()
     );
 
+    // Insert own mesh if there is a piece to insert
+    if (curMigratedCells[Pstream::myProcNo()] > 0)
+    {
+        Pout<< "Inserting local mesh piece, proc " << Pstream::myProcNo()
+            << endl;
+
+        procMeshes.set
+        (
+            Pstream::myProcNo(),
+            meshDecomp.processorMesh
+            (
+                Pstream::myProcNo(),
+                time(),
+                "processorPart" + Foam::name(Pstream::myProcNo()),
+                true    // Create passive processor patches
+            )
+        );
+        Pout<< "Local proc mesh: " << Pstream::myProcNo() << nl
+            << procMeshes[Pstream::myProcNo()].boundaryMesh()
+            << endl;
+        // Set local fields
+    }
+
     for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
     {
         if (procI != Pstream::myProcNo())
@@ -283,7 +306,7 @@ bool Foam::loadBalanceFvMesh::update()
             // Check if there is a mesh to send
             if (migratedCells[procI][Pstream::myProcNo()] > 0)
             {
-                Info<< "Processor " << procI << ": receive mesh and fields"
+                Pout<< "Receive mesh and fields from " << procI
                     << endl;
 
                 // Note: communication can be optimised.  HJ, 27/Feb/2018
@@ -311,27 +334,15 @@ bool Foam::loadBalanceFvMesh::update()
                         false             // Do not sync
                     )
                 );
-
+                Pout<< "Received boundary: " << nl
+                    << procMeshes[procI].boundaryMesh()
+                    << endl;
                 // Receive the fields
             }
         }
-        else
-        {
-            // Insert own mesh
-            procMeshes.set
-            (
-                procI,
-                meshDecomp.processorMesh
-                (
-                    procI,
-                    time(),
-                    "processorPart" + Foam::name(procI),
-                    true    // Create passive processor patches
-                )                
-            );
-        }
     }
 
+    
     // Create the reconstructed mesh
     autoPtr<fvMesh> reconstructedMeshPtr =
         meshRecon.reconstructMesh(time());
@@ -411,6 +422,10 @@ bool Foam::loadBalanceFvMesh::update()
         }
     }
 
+    // Store the resetFvPatchFlag to indicate patches that will be rebuilt
+    // patchesToReplace will be used in further signalling
+    boolList resetFvPatchFlag = patchesToReplace;
+    
     // Check alignment and types of old and new boundary
     // Insert new patches processor patches
     // Collect patch sizes and starts
@@ -500,7 +515,9 @@ bool Foam::loadBalanceFvMesh::update()
                 nextPatchSlot,
                 new processorPolyPatch
                 (
-                    ppPatch.name(),
+                    // ppPatch.name(),
+                    "procBoundary" + Foam::name(ppPatch.myProcNo()) + "to"
+                    + Foam::name(ppPatch.neighbProcNo()),
                     0,                  // dummy size
                     nInternalFaces(),   // dummy start
                     // ppPatch.size(),
@@ -520,18 +537,6 @@ bool Foam::loadBalanceFvMesh::update()
         }
     }
 
-    // Debug
-    {
-        labelList RPSIZES(reconBMesh.size());
-
-        forAll (reconBMesh, patchI)
-        {
-            RPSIZES[patchI] = reconBMesh[patchI].size();
-        }
-
-        Pout<< "RPSIZES: " << RPSIZES << end;
-    }
-
     // Patch sizes are assembled.  Collect patch starts for the new mesh
     labelList reconPatchStarts(reconBMesh.size(), 0);
 
@@ -556,12 +561,10 @@ bool Foam::loadBalanceFvMesh::update()
         xferCopy(reconMesh.faceNeighbour()),
         reconPatchSizes,
         reconPatchStarts,
+        resetFvPatchFlag,
         true                       // Valid boundary
     );
-
-    Pout<< "faceOwner: " << faceOwner() << nl
-        << "faceNeighbour: " << faceNeighbour() << nl
-        << "boundary: " << boundaryMesh() << endl;
+    Pout<< "BMESH: " << boundaryMesh() << endl;
 
     // To Do: build a reconstructor from addressing data
 

From 41829c7a5389fa42e6277649b72a941bbf7944aa Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 24 Apr 2018 19:04:02 +0100
Subject: [PATCH 22/45] Field mapping for patch reset

---
 .../manipulation/renumberMesh/renumberMesh.C  |   9 ++
 .../decomposePar/decomposePar.C               |   1 +
 .../reconstructParMesh/reconstructParMesh.C   |   1 +
 .../finiteVolume/decomposeMesh.C              | 126 +++++++++---------
 .../finiteVolume/domainDecomposition.C        |   8 +-
 .../directTopoChange/directTopoChange.C       |  12 ++
 .../layerAdditionRemoval/addCellLayer.C       |   4 +-
 .../layerAdditionRemoval.C                    |  31 ++++-
 .../layerAdditionRemoval.H                    |  14 +-
 .../polyTopoChangerChangeMesh.C               |   6 +
 .../dynamicTopoFvMesh/dynamicTopoFvMesh.C     |  16 ++-
 .../fieldMapping/topoMapper.C                 |   1 +
 .../fieldMapping/topoMapper.H                 |  19 ++-
 .../loadBalanceFvMesh/loadBalanceFvMesh.C     |  16 +--
 .../linearValveLayersFvMesh.C                 |   4 +-
 .../faMesh/faMeshMapper/faMeshMapper.C        |   3 +-
 .../faMesh/faMeshMapper/faMeshMapper.H        |  11 ++
 src/finiteVolume/fvMesh/fvMesh.C              |  11 +-
 .../fvMesh/fvMeshMapper/fvMeshMapper.H        |   9 ++
 .../GeometricField/MapGeometricFields.H       |  72 ++++++++--
 .../pointMeshMapper/pointMeshMapper.H         |  13 +-
 .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.C |   4 +
 .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.H |  33 +++++
 src/foam/meshes/polyMesh/polyMesh.C           |  59 +-------
 .../polyPatches/polyPatch/polyPatch.C         |   2 -
 .../MapTetFemFields/tetPolyMeshMapper.H       |  23 +++-
 26 files changed, 335 insertions(+), 173 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 1eef9c952..3d4d18a49 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -342,26 +342,35 @@ autoPtr<mapPolyMesh> reorderMesh
             mesh.nPoints(),             // nOldPoints,
             mesh.nFaces(),              // nOldFaces,
             mesh.nCells(),              // nOldCells,
+
             identity(mesh.nPoints()),   // pointMap,
             List<objectMap>(0),         // pointsFromPoints,
+
             faceOrder,                  // faceMap,
             List<objectMap>(0),         // facesFromPoints,
             List<objectMap>(0),         // facesFromEdges,
             List<objectMap>(0),         // facesFromFaces,
+
             cellOrder,                  // cellMap,
             List<objectMap>(0),         // cellsFromPoints,
             List<objectMap>(0),         // cellsFromEdges,
             List<objectMap>(0),         // cellsFromFaces,
             List<objectMap>(0),         // cellsFromCells,
+
             identity(mesh.nPoints()),   // reversePointMap,
             reverseFaceOrder,           // reverseFaceMap,
             reverseCellOrder,           // reverseCellMap,
+
             labelHashSet(0),            // flipFaceFlux,
+
             patchPointMap,              // patchPointMap,
             labelListList(0),           // pointZoneMap,
             labelListList(0),           // faceZonePointMap,
             labelListList(0),           // faceZoneFaceMap,
             labelListList(0),           // cellZoneMap,
+
+            boolList(mesh.boundaryMesh().size(), false), // resetPatchFlag
+
             pointField(0),              // preMotionPoints,
             patchStarts,                // oldPatchStarts,
             oldPatchNMeshPoints         // oldPatchNMeshPoints
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 6d7430682..42071d39a 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -651,6 +651,7 @@ int main(int argc, char *argv[])
                 processorDb
             )
         );
+        procMesh.syncUpdateMesh();
 
         labelIOList cellProcAddressing
         (
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index cb931aed1..342d4c129 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -142,6 +142,7 @@ int main(int argc, char *argv[])
         regionName
     );
 
+    // Get reconstructed mesh
     autoPtr<fvMesh> meshPtr = procMeshes.reconstructMesh(runTime);
 
 
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
index bd385b835..9cc673e28 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
@@ -272,24 +272,9 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                                 );
                             }
                         }
-                        else
-                        {
-                            // Owner and neighbour processor index are the same
-                            // across the processor boundary.  This face will be
-                            // re-merged into internal faces in load balancing
-                            // and therefore remains in the processor patch
-                            Pout<< "Preserved proc[" << patchFaceI << "]: "
-                                << ownerProc << " " << neighbourProc << endl;
-
-                            // Add the face
-                            procFaceList[ownerProc].append
-                            (
-                                patchStart + patchFaceI
-                            );
-
-                            // Increment the number of faces for this patch
-                            procPatchSize_[ownerProc][patchI]++;
-                        }
+                        // Note: cannot insert regular faces here, because
+                        // they are out of sequence.
+                        // HJ, 24/Apr/2018
                     }
                 }
             }
@@ -516,24 +501,9 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                                 );
                             }
                         }
-                        else
-                        {
-                            // Owner and neighbour processor index are the same
-                            // across the processor boundary.  This face will be
-                            // re-merged into internal faces in load balancing
-                            // and therefore remains in the processor patch
-                            Pout<< "Preserved proc[" << patchFaceI << "]: "
-                                << ownerProc << " " << neighbourProc << endl;
-
-                            // Add the face
-                            procFaceList[ownerProc].append
-                            (
-                                patchStart + patchFaceI
-                            );
-
-                            // Increment the number of faces for this patch
-                            procPatchSize_[ownerProc][patchI]++;
-                        }
+                        // Note: cannot insert regular faces here, because
+                        // they are out of sequence.
+                        // HJ, 24/Apr/2018
                     }
                 }
             }
@@ -555,35 +525,53 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             const label patchStart = patches[patchI].patch().start();
 
             // Do normal patches.  Note that processor patches
-            // have already been done and need to be skipped
-            // For all other patches patchNbrCellToProc_ will be empty
-            if (!patchNbrCellToProc_[patchI].empty())
+            // have already been partially done and need special treatment
+            if
+            (
+                isA<processorFvPatch>(patches[patchI])
+             && !patchNbrCellToProc_[patchI].empty()
+            )
             {
+                // Only collect faces where the owner and neighbour processor
+                // index are the same.
+                // If owner and neighbour processor index are different,
+                // the face was already collected into a separate patch
+                // HJ, 23/Apr/2018
+
+                const unallocLabelList& fc = patches[patchI].faceCells();
+
+                // Get neighbour cellToProc addressing across the interface
+                const labelList& curNbrPtc = patchNbrCellToProc_[patchI];
+
+                forAll (fc, patchFaceI)
+                {
+                    // Local owner proc is looked up using faceCells
+                    const label ownerProc = cellToProc_[fc[patchFaceI]];
+
+                    // Neighbour proc is looked up directly
+                    const label neighbourProc = curNbrPtc[patchFaceI];
+
+                    // If the owner and neighbour processor index is the same,
+                    // the face remains in the processor patch
+                    // In load balancing, it will be re-merged on reconstruction
+                    // HJ, 23/Apr/2018
+                    if (ownerProc == neighbourProc)
+                    {
+                        // Add the face
+                        procFaceList[ownerProc].append(patchStart + patchFaceI);
+                        Pout<< "Add proc face to proc patch.  Face "
+                            << patchStart + patchFaceI
+                            << endl;
+                        // Increment the number of faces for this patch
+                        procPatchSize_[ownerProc][patchI]++;
+                    }
+                }
+                
                 // Processor patch.  Skip it
                 continue;
             }
 
-            if (!isA<cyclicFvPatch>(patches[patchI]))
-            {
-                // Normal patch. Add faces to processor where the cell
-                // next to the face lives
-
-                const unallocLabelList& patchFaceCells =
-                    patches[patchI].faceCells();
-
-                forAll (patchFaceCells, patchFaceI)
-                {
-                    const label curProc =
-                        cellToProc_[patchFaceCells[patchFaceI]];
-
-                    // add the face
-                    procFaceList[curProc].append(patchStart + patchFaceI);
-
-                    // increment the number of faces for this patch
-                    procPatchSize_[curProc][patchI]++;
-                }
-            }
-            else
+            else if (isA<cyclicFvPatch>(patches[patchI]))
             {
                 // Cyclic patch special treatment
 
@@ -785,6 +773,24 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                     }
                 }
             }
+            else
+            {
+                // Normal patch. Add faces to processor where the cell
+                // next to the face lives
+
+                const unallocLabelList& fc = patches[patchI].faceCells();
+
+                forAll (fc, patchFaceI)
+                {
+                    const label curProc = cellToProc_[fc[patchFaceI]];
+
+                    // add the face
+                    procFaceList[curProc].append(patchStart + patchFaceI);
+
+                    // increment the number of faces for this patch
+                    procPatchSize_[curProc][patchI]++;
+                }
+            }
         }
 
         // Face zone treatment.  HJ, 27/Mar/2009
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
index 44cc03ba7..67b12dd0f 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
@@ -207,7 +207,13 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
     }
 
     // Create processor mesh without a boundary
-
+    Pout<< "RAW MESH: points: " << procPoints.size()
+        << " faces: " << procFaces.size()
+        << " owner: " << procOwner.size()
+        << " procNeighbour: " << procNeighbour.size() << nl
+        << "curPatchSizes: " << procPatchSize_[procI] << nl
+        << " curPatchStarts: " << procPatchStartIndex_[procI] << nl
+        << endl;
     // Create the mesh
     autoPtr<fvMesh> procMeshPtr
     (
diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C
index 062366906..b7be6d38f 100644
--- a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C
+++ b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C
@@ -3162,6 +3162,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::directTopoChange::changeMesh
     calcFaceZonePointMap(mesh, oldFaceZoneMeshPointMaps, faceZonePointMap);
 
 
+    // Patch reset map is currently dummy
+    // HJ, 23/Apr/2018
+    boolList resetPatchFlag(mesh.boundaryMesh().size(), false);
+
     return autoPtr<mapPolyMesh>
     (
         new mapPolyMesh
@@ -3199,6 +3203,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::directTopoChange::changeMesh
             faceZoneFaceMap,
             cellZoneMap,
 
+            resetPatchFlag,
+
             newPoints,          // if empty signals no inflation.
             oldPatchStarts,
             oldPatchNMeshPoints,
@@ -3470,6 +3476,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::directTopoChange::makeMesh
         writeMeshStats(mesh, Pout);
     }
 
+    // Patch reset map is currently dummy
+    // HJ, 23/Apr/2018
+    boolList resetPatchFlag(mesh.boundaryMesh().size(), false);
+
     return autoPtr<mapPolyMesh>
     (
         new mapPolyMesh
@@ -3507,6 +3517,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::directTopoChange::makeMesh
             faceZoneFaceMap,
             cellZoneMap,
 
+            resetPatchFlag,
+
             newPoints,          // if empty signals no inflation.
             oldPatchStarts,
             oldPatchNMeshPoints,
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/addCellLayer.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/addCellLayer.C
index b1ea2c9b3..81dc957a9 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/addCellLayer.C
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/addCellLayer.C
@@ -87,7 +87,7 @@ void Foam::layerAdditionRemoval::addCellLayer
         {
             extrusionDir[mpI] = points[ptc[mpI]] - points[mp[mpI]];
         }
-        extrusionDir *= addDelta_*maxLayerThickness_;
+        extrusionDir *= addDelta_()*maxLayerThickness_;
     }
     else
     {
@@ -118,7 +118,7 @@ void Foam::layerAdditionRemoval::addCellLayer
                 polyAddPoint
                 (
                     points[mp[pointI]]                  // point
-//                   + addDelta_*maxLayerThickness_*extrusionDir[pointI],
+//                   + addDelta_()*maxLayerThickness_*extrusionDir[pointI],
                   + extrusionDir[pointI],
                     mp[pointI],                         // master point
                     -1,                                 // zone for point
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.C
index e15066faa..47443b8de 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.C
@@ -48,8 +48,19 @@ namespace Foam
 }
 
 
-const Foam::scalar Foam::layerAdditionRemoval::addDelta_ = 0.3;
-const Foam::scalar Foam::layerAdditionRemoval::removeDelta_ = 0.1;
+const Foam::debug::tolerancesSwitch
+Foam::layerAdditionRemoval::motionDelta_
+(
+    "layerAdditionRemoval::motionDelta",
+    0.01
+);
+
+const Foam::debug::tolerancesSwitch
+Foam::layerAdditionRemoval::addDelta_
+(
+    "layerAdditionRemoval::addDelta",
+    0.3
+);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -354,7 +365,12 @@ bool Foam::layerAdditionRemoval::changeTopology() const
 
         topologicalChange = false;
     }
-    else if (avgDelta < oldLayerThickness_)
+    // New criterion to avoid round-off triggering layer addition/removal
+    // HJ, 30/Mar/2018
+    else if
+    (
+        (oldLayerThickness_ - avgDelta) > motionDelta_()*minLayerThickness_
+    )
     {
         // Layers moving towards removal
         if (minDelta < minLayerThickness_)
@@ -397,7 +413,12 @@ bool Foam::layerAdditionRemoval::changeTopology() const
             oldLayerThickness_ = avgDelta;
         }
     }
-    else
+    // New criterion to avoid round-off triggering layer addition/removal
+    // HJ, 30/Mar/2018
+    else if
+    (
+        (avgDelta - oldLayerThickness_) > motionDelta_()*minLayerThickness_
+    )
     {
         // Layers moving towards addition
         if (maxDelta > maxLayerThickness_)
@@ -422,6 +443,8 @@ bool Foam::layerAdditionRemoval::changeTopology() const
             oldLayerThickness_ = avgDelta;
         }
     }
+    // else the motion change is smaller than the tolerance and the layer
+    // interface is practically static.  HJ, 30/Mar/2018
 
     return topologicalChange;
 }
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.H b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.H
index 566ddf551..56497d60d 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.H
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.H
@@ -40,6 +40,7 @@ SourceFiles
 #include "polyMeshModifier.H"
 #include "primitiveFacePatch.H"
 #include "ZoneIDs.H"
+#include "tolerancesSwitch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -128,13 +129,14 @@ class layerAdditionRemoval
 
     // Static data members
 
-        //- Thickness insertion fraction for the pre-motion
-        static const scalar addDelta_;
+        //- Motion detection fraction: if the motion is smaller than
+        // motionDelta*minLayerThickness_, it is assumed that the mesh is
+        // not layering
+        static const debug::tolerancesSwitch motionDelta_;
+
+        //- Thickness insertion fraction for the pre-motion
+        static const debug::tolerancesSwitch addDelta_;
 
-        //- Thickness removal fraction for the cell collapse
-        //  Note: the cell will be collapsed to this relative
-        //  thickness before the layer is removed.
-        static const scalar removeDelta_;
 
 public:
 
diff --git a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C
index e91b4800b..11e1e689d 100644
--- a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C
+++ b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C
@@ -2416,6 +2416,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChanger::changeMesh
     List<objectMap> facesFromFaces;
     List<objectMap> cellsFromCells;
 
+    // Patch reset map is currently dummy: does not support change in number
+    // of boundary patches
+    // HJ, 23/Apr/2018
+    boolList resetPatchFlag(boundary.size(), false);
 
     autoPtr<mapPolyMesh> topoChangeMap
     (
@@ -2453,6 +2457,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChanger::changeMesh
             fzFaceRenumber,
             czRenumber,
 
+            resetPatchFlag,
+
             newPointsMotion,
             oldPatchStarts,
             oldPatchNMeshPoints,
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMesh.C b/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMesh.C
index eae20af74..af045652c 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMesh.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMesh.C
@@ -4253,6 +4253,11 @@ bool dynamicTopoFvMesh::resetMesh()
             }
         }
 
+        // Patch reset map is currently dummy: does not support change
+        // in number of boundary patches
+        // HJ, 23/Apr/2018
+        boolList resetPatchFlag(boundaryMesh().size(), false);
+
         // Generate new mesh mapping information
         mapPolyMesh mpm
         (
@@ -4260,30 +4265,39 @@ bool dynamicTopoFvMesh::resetMesh()
             nOldPoints_,
             nOldFaces_,
             nOldCells_,
+
             pointMap_,
             pointsFromPoints_,
+
             faceMap_,
             facesFromPoints_,
             facesFromEdges_,
             facesFromFaces_,
+
             cellMap_,
             cellsFromPoints_,
             cellsFromEdges_,
             cellsFromFaces_,
             cellsFromCells_,
+
             reversePointMap_,
             reverseFaceMap_,
             reverseCellMap_,
+
             flipFaces_,
+
             patchPointMap,
             pointZoneMap,
             faceZonePointMap,
             faceZoneFaceMap,
             cellZoneMap,
+
+            resetPatchFlag,
+
             preMotionPoints,
             oldPatchStarts,
             oldPatchNMeshPoints,
-            true
+            true                   // Re-use storage
         );
 
         // Update the underlying mesh, and map all related fields
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoMapper.C b/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoMapper.C
index b35a9a42e..ae20ecfb9 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoMapper.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoMapper.C
@@ -192,6 +192,7 @@ topoMapper::topoMapper
     cellMap_(NULL),
     surfaceMap_(NULL),
     boundaryMap_(NULL),
+    resetPatchFlag_(mesh.boundaryMesh().size(), false), // Disabled
     fluxCorrector_(fluxCorrector::New(mesh, dict)),
     cellVolumesPtr_(NULL),
     cellCentresPtr_(NULL)
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoMapper.H b/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoMapper.H
index 106604ebb..9ce7a25eb 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoMapper.H
+++ b/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoMapper.H
@@ -69,6 +69,7 @@ class topoMapper
         typedef Tuple2<word, label> GradientMap;
         typedef HashTable<GradientMap> GradientTable;
 
+
     // Private data
 
         //- Reference to fvMesh
@@ -77,6 +78,7 @@ class topoMapper
         //- Reference to the options dictionary
         const dictionary& dict_;
 
+
     // Demand-driven private data
 
         //- Cell mapper
@@ -88,6 +90,10 @@ class topoMapper
         //- Boundary mapper
         mutable autoPtr<topoBoundaryMeshMapper> boundaryMap_;
 
+        //- Reset patch flag.  Set true for the rebuilt patch (no mapping)
+        //  Disabled.  HJ, 24/Apr/2018
+        boolList resetPatchFlag_;
+
         //- Flux corrector
         mutable autoPtr<fluxCorrector> fluxCorrector_;
 
@@ -118,6 +124,7 @@ class topoMapper
         mutable labelListList patchSizes_;
         mutable labelListList patchStarts_;
 
+
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -141,6 +148,7 @@ class topoMapper
         //- Set geometric information
         void storeGeometry() const;
 
+
 public:
 
     // Constructors
@@ -148,9 +156,10 @@ public:
         //- Construct from mesh and dictionary
         topoMapper(const fvMesh& mesh, const dictionary& dict);
 
-    // Destructor
 
-        ~topoMapper();
+    //- Destructor
+    ~topoMapper();
+
 
     // Member Functions
 
@@ -256,6 +265,12 @@ public:
         //- Return boundary mapper
         const topoBoundaryMeshMapper& boundaryMap() const;
 
+        //- Return reset patch flag
+        const boolList& resetPatchFlag() const
+        {
+            return resetPatchFlag_;
+        }
+
         //- Return flux-corrector
         const fluxCorrector& surfaceFluxCorrector() const;
 
diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
index 8964a6e29..56d5f484d 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
@@ -279,9 +279,6 @@ bool Foam::loadBalanceFvMesh::update()
     // Insert own mesh if there is a piece to insert
     if (curMigratedCells[Pstream::myProcNo()] > 0)
     {
-        Pout<< "Inserting local mesh piece, proc " << Pstream::myProcNo()
-            << endl;
-
         procMeshes.set
         (
             Pstream::myProcNo(),
@@ -293,9 +290,7 @@ bool Foam::loadBalanceFvMesh::update()
                 true    // Create passive processor patches
             )
         );
-        Pout<< "Local proc mesh: " << Pstream::myProcNo() << nl
-            << procMeshes[Pstream::myProcNo()].boundaryMesh()
-            << endl;
+
         // Set local fields
     }
 
@@ -334,9 +329,7 @@ bool Foam::loadBalanceFvMesh::update()
                         false             // Do not sync
                     )
                 );
-                Pout<< "Received boundary: " << nl
-                    << procMeshes[procI].boundaryMesh()
-                    << endl;
+
                 // Receive the fields
             }
         }
@@ -564,10 +557,13 @@ bool Foam::loadBalanceFvMesh::update()
         resetFvPatchFlag,
         true                       // Valid boundary
     );
-    Pout<< "BMESH: " << boundaryMesh() << endl;
 
     // To Do: build a reconstructor from addressing data
+    Pout<< nl << nl
+        << "FINISHED CYCLE" << nl << nl << nl
+        << endl;
 
+    write();
 
     // Create field reconstructor
     // fvFieldReconstructor fieldReconstructor
diff --git a/src/dynamicMesh/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/dynamicMesh/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 58172e0b1..82842fc51 100644
--- a/src/dynamicMesh/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/dynamicMesh/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -75,7 +75,6 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
     )
     {
         // Zones found.  Check topo changer
-
         if (topoChanger_.empty())
         {
             FatalErrorIn
@@ -138,7 +137,6 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
     }
 
 
-
     // Do face zones for slider
 
     // Inner slider
@@ -242,7 +240,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
     fz.setSize(nFz);
     // Cell zones remain unchanged
 
-    Info << "Adding point and face zones" << endl;
+    Info<< "Adding point and face zones" << endl;
     removeZones();
     addZones(pz, fz, cz);
 
diff --git a/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.C b/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.C
index 632f27aa3..065330357 100644
--- a/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.C
+++ b/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.C
@@ -46,7 +46,8 @@ Foam::faMeshMapper::faMeshMapper
     oldPatchEdgeFaces_(mesh.boundary().size()),
     areaMap_(mesh, mpm),
     edgeMap_(mesh, mpm),
-    boundaryMap_(mesh, mpm)
+    boundaryMap_(mesh, mpm),
+    resetPatchFlag_(mesh.boundary().size(), false)  // Disabled
 {
     // Capture old patch information
     const faBoundaryMesh& patches = mesh.boundary();
diff --git a/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H b/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H
index 87dce1f20..6fe57e3a8 100644
--- a/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H
+++ b/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H
@@ -103,6 +103,10 @@ class faMeshMapper
             //- Boundary mapper
             faBoundaryMeshMapper boundaryMap_;
 
+            //- Reset patch flag.  Set true for the rebuilt patch (no mapping)
+            //- Disabled.  HJ, 24/Apr/2018
+            boolList resetPatchFlag_;
+
 
     // Private Member Functions
 
@@ -201,6 +205,13 @@ public:
             {
                 return boundaryMap_;
             }
+
+            //- Return reset patch flag
+            //- Disabled.  HJ, 24/Apr/2018
+            const boolList& resetPatchFlag() const
+            {
+                return resetPatchFlag_;
+            }
 };
 
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 713cfc919..adeab5068 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -422,16 +422,11 @@ void Foam::fvMesh::resetFvPrimitives
         validBoundary
     );
 
+    // Reset fvPatches  HJ, 16/Apr/2018
     boundary_.resetFvPatches(resetFvPatchFlag);
-    surfaceInterpolation::clearOut();
-    clearGeomNotOldVol();
 
-    // Reset fvPatches?  HJ, 16/Apr/2018
-
-    // Clear LDU
-    clearAddressing();
-
-    // Clear cell volumes?
+    // Clear all mesh data
+    clearOut();
 }        
 
 
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
index 067591095..57b7037fd 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
@@ -73,6 +73,9 @@ class fvMeshMapper
         //- Boundary mapper
         fvBoundaryMeshMapper boundaryMap_;
 
+        //- Reset patch flag.  Set true for the rebuilt patch (no mapping)
+        boolList resetPatchFlag_;
+
 
     // Private Member Functions
 
@@ -130,6 +133,12 @@ public:
         {
             return boundaryMap_;
         }
+
+        //- Return reset patch flag
+        const boolList& resetPatchFlag() const
+        {
+            return resetPatchFlag_;
+        }
 };
 
 
diff --git a/src/foam/fields/GeometricFields/GeometricField/MapGeometricFields.H b/src/foam/fields/GeometricFields/GeometricField/MapGeometricFields.H
index 1b7c8c726..77cce7070 100644
--- a/src/foam/fields/GeometricFields/GeometricField/MapGeometricFields.H
+++ b/src/foam/fields/GeometricFields/GeometricField/MapGeometricFields.H
@@ -23,6 +23,7 @@ License
 
 Class
     Foam::MapInternalField
+    Foam::MapGeometricFields
 
 Description
     Generic internal field mapper.  For "real" mapping, add template
@@ -131,17 +132,72 @@ void MapGeometricFields
                 mapper
             );
 
-            // Map the patch fields
-            forAll (field.boundaryField(), patchi)
+            // Repatch boundary if needed
+            if
+            (
+                field.boundaryField().size()
+             != mapper.mesh().boundary().size()
+            )
             {
-                // Cannot check sizes for patch fields because of
-                // empty fields in FV and because point fields get their size
-                // from the patch which has already been resized
+                if (polyMesh::debug)
+                {
+                    InfoIn("void MapGeometricFields(const MeshMapper& mapper)")
+                        << "Resizing boundary field for "
+                        << field.typeName << ' ' << field.name()
+                        << endl;
+                }
 
-                field.boundaryField()[patchi].autoMap
+                field.boundaryField().setSize(mapper.mesh().boundary().size());
+            }
+
+            // Get repatch flag
+            const boolList& resetPatchFlag = mapper.resetPatchFlag();
+
+            if (resetPatchFlag.size() != field.boundaryField().size())
+            {
+                FatalErrorIn
                 (
-                    mapper.boundaryMap()[patchi]
-                );
+                    "void MapGeometricFields(const MeshMapper& mapper)"
+                )   << "Incorrect resetPatchFlag array size.  Boundary: "
+                    << field.boundaryField().size() << " flag: "
+                    << resetPatchFlag.size()
+                    << abort(FatalError);
+            }
+
+            // Map the patch fields
+            forAll (field.boundaryField(), patchI)
+            {
+                // Flag reset can only take place for the constrained patches
+                // such as empty or processor
+                if (resetPatchFlag[patchI])
+                {
+                    // Build a new patchField if reset is true
+                    field.boundaryField().set
+                    (
+                        patchI,
+                        PatchField<Type>::New
+                        (
+                            mapper.mesh().boundary()[patchI].type(),
+                            field.mesh().boundary()[patchI],
+                            field.dimensionedInternalField()
+                        )
+                    );
+
+                    // Set to zero to avoid NaNs?
+                }
+                else
+                {
+                    // No reset: auto-map
+
+                    // Cannot check sizes for patch fields because of
+                    // empty fields in FV and because point fields get
+                    // their size from the patch which has already been resized
+
+                    field.boundaryField()[patchI].autoMap
+                    (
+                        mapper.boundaryMap()[patchI]
+                    );
+                }
             }
 
             field.instance() = field.time().timeName();
diff --git a/src/foam/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H b/src/foam/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
index 3aa734ebb..389335e32 100644
--- a/src/foam/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
+++ b/src/foam/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
@@ -36,6 +36,7 @@ SourceFiles
 #ifndef pointMeshMapper_H
 #define pointMeshMapper_H
 
+#include "mapPolyMesh.H"
 #include "pointMapper.H"
 #include "pointBoundaryMeshMapper.H"
 
@@ -65,6 +66,9 @@ class pointMeshMapper
         //- Boundary mapper
         pointBoundaryMeshMapper boundaryMap_;
 
+        //- Reset patch flag.  Set true for the rebuilt patch (no mapping)
+        boolList resetPatchFlag_;
+
 
     // Private Member Functions
 
@@ -84,7 +88,8 @@ public:
         :
             mesh_(mesh),
             pointMap_(mpm),
-            boundaryMap_(mesh, pointMap_, mpm)
+            boundaryMap_(mesh, pointMap_, mpm),
+            resetPatchFlag_(mpm.resetPatchFlag())
         {}
 
 
@@ -115,6 +120,12 @@ public:
         {
             return boundaryMap_;
         }
+
+        //- Return reset patch flag
+        const boolList& resetPatchFlag() const
+        {
+            return resetPatchFlag_;
+        }
 };
 
 
diff --git a/src/foam/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C b/src/foam/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
index 1fd53638b..5eca023b0 100644
--- a/src/foam/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
+++ b/src/foam/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
@@ -69,6 +69,7 @@ Foam::mapPolyMesh::mapPolyMesh
     const labelListList& faceZonePointMap,
     const labelListList& faceZoneFaceMap,
     const labelListList& cellZoneMap,
+    const boolList& resetPatchFlag,
     const pointField& preMotionPoints,
     const labelList& oldPatchStarts,
     const labelList& oldPatchNMeshPoints
@@ -99,6 +100,7 @@ Foam::mapPolyMesh::mapPolyMesh
     faceZonePointMap_(faceZonePointMap),
     faceZoneFaceMap_(faceZoneFaceMap),
     cellZoneMap_(cellZoneMap),
+    resetPatchFlag_(resetPatchFlag),
     preMotionPoints_(preMotionPoints),
     oldPatchSizes_(oldPatchStarts.size()),
     oldPatchStarts_(oldPatchStarts),
@@ -155,6 +157,7 @@ Foam::mapPolyMesh::mapPolyMesh
     labelListList& faceZonePointMap,
     labelListList& faceZoneFaceMap,
     labelListList& cellZoneMap,
+    boolList& resetPatchFlag,
     pointField& preMotionPoints,
     labelList& oldPatchStarts,
     labelList& oldPatchNMeshPoints,
@@ -186,6 +189,7 @@ Foam::mapPolyMesh::mapPolyMesh
     faceZonePointMap_(faceZonePointMap, reUse),
     faceZoneFaceMap_(faceZoneFaceMap, reUse),
     cellZoneMap_(cellZoneMap, reUse),
+    resetPatchFlag_(resetPatchFlag, reUse),
     preMotionPoints_(preMotionPoints, reUse),
     oldPatchSizes_(oldPatchStarts.size()),
     oldPatchStarts_(oldPatchStarts, reUse),
diff --git a/src/foam/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H b/src/foam/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
index fdac9df25..1c9daeb58 100644
--- a/src/foam/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
+++ b/src/foam/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
@@ -139,6 +139,7 @@ SourceFiles
 #ifndef mapPolyMesh_H
 #define mapPolyMesh_H
 
+#include "boolList.H"
 #include "labelList.H"
 #include "objectMap.H"
 #include "pointField.H"
@@ -259,6 +260,10 @@ class mapPolyMesh
         //  For added cells, the index is set to -1
         const labelListList cellZoneMap_;
 
+        //- Reset patch flag
+        //  True for the rebuilt patch (no mapping)
+        boolList resetPatchFlag_;
+
         //- Pre-motion point positions.
         //  This specifies the correct way of blowing up zero-volume objects
         const pointField preMotionPoints_;
@@ -296,26 +301,36 @@ public:
             const label nOldPoints,
             const label nOldFaces,
             const label nOldCells,
+
             const labelList& pointMap,
             const List<objectMap>& pointsFromPoints,
+
             const labelList& faceMap,
             const List<objectMap>& facesFromPoints,
             const List<objectMap>& facesFromEdges,
             const List<objectMap>& facesFromFaces,
+
             const labelList& cellMap,
             const List<objectMap>& cellsFromPoints,
             const List<objectMap>& cellsFromEdges,
             const List<objectMap>& cellsFromFaces,
             const List<objectMap>& cellsFromCells,
+
             const labelList& reversePointMap,
             const labelList& reverseFaceMap,
             const labelList& reverseCellMap,
+
             const labelHashSet& flipFaceFlux,
+
             const labelListList& patchPointMap,
+
             const labelListList& pointZoneMap,
             const labelListList& faceZonePointMap,
             const labelListList& faceZoneFaceMap,
             const labelListList& cellZoneMap,
+
+            const boolList& resetPatchFlag,
+
             const pointField& preMotionPoints,
             const labelList& oldPatchStarts,
             const labelList& oldPatchNMeshPoints
@@ -328,26 +343,36 @@ public:
             const label nOldPoints,
             const label nOldFaces,
             const label nOldCells,
+
             labelList& pointMap,
             List<objectMap>& pointsFromPoints,
+
             labelList& faceMap,
             List<objectMap>& facesFromPoints,
             List<objectMap>& facesFromEdges,
             List<objectMap>& facesFromFaces,
+
             labelList& cellMap,
             List<objectMap>& cellsFromPoints,
             List<objectMap>& cellsFromEdges,
             List<objectMap>& cellsFromFaces,
             List<objectMap>& cellsFromCells,
+
             labelList& reversePointMap,
             labelList& reverseFaceMap,
             labelList& reverseCellMap,
+
             labelHashSet& flipFaceFlux,
+
             labelListList& patchPointMap,
+
             labelListList& pointZoneMap,
             labelListList& faceZonePointMap,
             labelListList& faceZoneFaceMap,
             labelListList& cellZoneMap,
+
+            boolList& resetPatchFlag,
+
             pointField& preMotionPoints,
             labelList& oldPatchStarts,
             labelList& oldPatchNMeshPoints,
@@ -616,6 +641,14 @@ public:
                     return cellZoneMap_;
                 }
 
+                //- Reset patch flag
+                //  True for the rebuilt patch (no mapping)
+                const boolList& resetPatchFlag() const
+                {
+                    return resetPatchFlag_;
+                }
+
+
             //- Pre-motion point positions.
             //  This specifies the correct way of blowing up
             //  zero-volume objects
diff --git a/src/foam/meshes/polyMesh/polyMesh.C b/src/foam/meshes/polyMesh/polyMesh.C
index cf4b48c07..90fffb0e1 100644
--- a/src/foam/meshes/polyMesh/polyMesh.C
+++ b/src/foam/meshes/polyMesh/polyMesh.C
@@ -751,7 +751,6 @@ void Foam::polyMesh::resetPrimitives
 
 
     // Reset patch sizes and starts
-    Pout<< "Resetting patches: starts: " << patchStarts << endl;
     forAll (boundary_, patchI)
     {
         boundary_[patchI].resetPatch
@@ -1294,65 +1293,9 @@ const Foam::globalMeshData& Foam::polyMesh::globalData() const
                 << "Constructing parallelData from processor topology"
                 << endl;
         }
+
         // Construct globalMeshData using processorPatch information only.
         globalMeshDataPtr_ = new globalMeshData(*this);
-
-        // Old method.  HJ, 6/Dec/2006
-
-//         // Check for parallel boundaries
-//         bool parBoundaries = false;
-
-//         forAll (boundaryMesh(), patchI)
-//         {
-//             if
-//             (
-//                 typeid(boundaryMesh()[patchI])
-//              == typeid(processorPolyPatch)
-//             )
-//             {
-//                 parBoundaries = true;
-//                 break;
-//             }
-//         }
-
-//         if (parBoundaries)
-//         {
-//             // All is well - read the parallel data
-
-//             globalDataPtr_ =
-//                 new globalMeshData
-//                 (
-//                     IOobject
-//                     (
-//                         "globalData",
-//                         time().findInstance(meshDir(), "globalData"),
-//                         meshSubDir,
-//                         *this,
-//                         IOobject::MUST_READ,
-//                         IOobject::NO_WRITE
-//                     ),
-//                     *this
-//                 );
-//         }
-//         else
-//         {
-//             // The mesh has no parallel boundaries.  Create and hook a
-//             // "non-parallel" parallel info
-//             globalDataPtr_ =
-//                 new globalMeshData
-//                 (
-//                     *this,
-//                     false,
-//                     false,  // cyclicParallel.  Remove when fixed
-//                     nPoints(),
-//                     nFaces(),
-//                     nCells(),
-//                     0,
-//                     labelList(0),
-//                     labelList(0),
-//                     labelList(0)
-//                 );
-//         }
     }
 
     return *globalMeshDataPtr_;
diff --git a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index df7ad82f8..5031e61a3 100644
--- a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -604,8 +604,6 @@ void Foam::polyPatch::resetPatch
             boundaryMesh_.mesh().allPoints()
         )
     );
-
-    Pout<< "Patch reset: faceCells: " << faceCells() << endl;
 }
 
 
diff --git a/src/tetFiniteElement/tetPolyMesh/MapTetFemFields/tetPolyMeshMapper.H b/src/tetFiniteElement/tetPolyMesh/MapTetFemFields/tetPolyMeshMapper.H
index d710f78e3..d5b8fbb73 100644
--- a/src/tetFiniteElement/tetPolyMesh/MapTetFemFields/tetPolyMeshMapper.H
+++ b/src/tetFiniteElement/tetPolyMesh/MapTetFemFields/tetPolyMeshMapper.H
@@ -36,6 +36,7 @@ SourceFiles
 #define tetPolyMeshMapper_H
 
 #include "tetPointMapper.H"
+#include "mapPolyMesh.H"
 #include "pointMapper.H"
 #include "faceMapper.H"
 #include "cellMapper.H"
@@ -76,6 +77,9 @@ class tetPolyMeshMapper
         //- Boundary mapper
         tetPolyBoundaryMapper boundaryMap_;
 
+        //- Reset patch flag.  Set true for the rebuilt patch (no mapping)
+        boolList resetPatchFlag_;
+
 
     // Private Member Functions
 
@@ -94,15 +98,16 @@ public:
         tetPolyMeshMapper
         (
             const tetPolyMesh& mesh,
-            const mapPolyMesh& meshMap
+            const mapPolyMesh& mpm
         )
         :
             mesh_(mesh),
-            pointMap_(meshMap),
-            faceMap_(meshMap),
-            cellMap_(meshMap),
-            tetPointMap_(mesh, meshMap, pointMap_, faceMap_, cellMap_),
-            boundaryMap_(mesh, meshMap, pointMap_, faceMap_)
+            pointMap_(mpm),
+            faceMap_(mpm),
+            cellMap_(mpm),
+            tetPointMap_(mesh, mpm, pointMap_, faceMap_, cellMap_),
+            boundaryMap_(mesh, mpm, pointMap_, faceMap_),
+            resetPatchFlag_(mpm.resetPatchFlag())
         {}
 
 
@@ -138,6 +143,12 @@ public:
         {
             return boundaryMap_;
         }
+
+        //- Return reset patch flag
+        const boolList& resetPatchFlag() const
+        {
+            return resetPatchFlag_;
+        }
 };
 
 

From 48a70dfb294c2e81671c723be71525aad35e3589 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 1 May 2018 15:51:56 +0100
Subject: [PATCH 23/45] Formatting

---
 .../DimensionedFields/DimensionedField/DimensionedFieldI.H | 2 +-
 .../pointPatchFields/pointPatchField/pointPatchField.H     | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/foam/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H b/src/foam/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
index e3586dd28..11645b699 100644
--- a/src/foam/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
+++ b/src/foam/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
@@ -35,7 +35,7 @@ inline const DimensionedField<Type, GeoMesh>&
 DimensionedField<Type, GeoMesh>::null()
 {
     // Dangerous, but no null constructor.  Reconsider.  HJ, 10/Apr/2013
-    return *reinterpret_cast< DimensionedField<Type, GeoMesh>* >(0);
+    return *reinterpret_cast<DimensionedField<Type, GeoMesh>* >(0);
 }
 
 
diff --git a/src/foam/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/foam/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 1c8682ba5..20579bd9a 100644
--- a/src/foam/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/foam/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -108,10 +108,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~pointPatchField()
-        {}
+    //- Destructor
+    virtual ~pointPatchField()
+    {}
 
 
     // Member operators

From a1eae83ca69b3bc77e1e491ba22fbf2c32ba7f69 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 1 May 2018 15:52:53 +0100
Subject: [PATCH 24/45] Added more typedefs in Field, DimensionedField and
 GeometricField

---
 .../DimensionedField/DimensionedField.H       | 12 ++++++++-
 src/foam/fields/Fields/Field/Field.H          | 13 +++++++---
 .../GeometricField/GeometricField.H           | 25 +++++++++++++------
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/src/foam/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/foam/fields/DimensionedFields/DimensionedField/DimensionedField.H
index 0a531296a..8d447462c 100644
--- a/src/foam/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/foam/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -65,7 +65,7 @@ template<class Type, class GeoMesh> Ostream& operator<<
 
 
 /*---------------------------------------------------------------------------*\
-                           Class DimensionedField Declaration
+                     Class DimensionedField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type, class GeoMesh>
@@ -79,7 +79,17 @@ public:
 
     // Public typedefs
 
+        //- Field mesh type (eg. volMesh, surfaceMesh, areaMesh)
+        typedef GeoMesh GeoMeshType;
+
+        //- Actual mesh type on which the DimensionedField is instantiated
+        //  (eg fvMesh, faMesh)
         typedef typename GeoMesh::Mesh Mesh;
+
+        //- Field element type (eg. scalar, vector)
+        typedef Type PrimitiveType;
+
+        //- Field element component type
         typedef typename Field<Type>::cmptType cmptType;
 
 
diff --git a/src/foam/fields/Fields/Field/Field.H b/src/foam/fields/Fields/Field/Field.H
index e384f3c64..9d88ee96a 100644
--- a/src/foam/fields/Fields/Field/Field.H
+++ b/src/foam/fields/Fields/Field/Field.H
@@ -83,11 +83,16 @@ class Field
 
 public:
 
-    //- Component type
-    typedef typename pTraits<Type>::cmptType cmptType;
+    // Public typedefs
 
-    //- Declare type of subField
-    typedef SubField<Type> subField;
+        //- Field element type (eg. scalar, vector)
+        typedef Type PrimitiveType;
+
+        //- Component type
+        typedef typename pTraits<Type>::cmptType cmptType;
+
+        //- Declare type of subField
+        typedef SubField<Type> subField;
 
 
     // Static data members
diff --git a/src/foam/fields/GeometricFields/GeometricField/GeometricField.H b/src/foam/fields/GeometricFields/GeometricField/GeometricField.H
index fc4d40024..f1dc0974c 100644
--- a/src/foam/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/foam/fields/GeometricFields/GeometricField/GeometricField.H
@@ -82,7 +82,7 @@ class GeometricField
 :
     public DimensionedField<Type, GeoMesh>
 {
-    // Private member functions
+    // Private Member Functions
 
         //- Read from file if it is present
         bool readIfPresent();
@@ -95,13 +95,30 @@ public:
 
     // Public typedefs
 
+        //- Field mesh type (eg. volMesh, surfaceMesh, areaMesh)
+        typedef GeoMesh GeoMeshType;
+
+        //- Type of mesh on which this GeometricField is instantiated
         typedef typename GeoMesh::Mesh Mesh;
+
+        //- Type of boundary mesh on which this
+        //  GeometricField::Boundary is instantiated
         typedef typename GeoMesh::BoundaryMesh BoundaryMesh;
 
+        //- Type of the internal field from which this GeometricField is derived
         typedef DimensionedField<Type, GeoMesh> DimensionedInternalField;
         typedef Field<Type> InternalField;
+
+        //- Type of the patch field of which the
+        //  GeometricField::Boundary is composed
         typedef PatchField<Type> PatchFieldType;
 
+        //- Field element type (eg. scalar, vector)
+        typedef Type PrimitiveType;
+
+        //- Field element component type
+        typedef typename Field<Type>::cmptType cmptType;
+
 
     class GeometricBoundaryField
     :
@@ -261,10 +278,6 @@ public:
     TypeName("GeometricField");
 
 
-    // Public typedefs
-
-        typedef typename Field<Type>::cmptType cmptType;
-
     // Static Member Functions
 
         //- Return a null geometric field
@@ -573,7 +586,6 @@ public:
 
     // Ostream operators
 
-#ifndef SWIG
         friend Ostream& operator<< <Type, PatchField, GeoMesh>
         (
             Ostream&,
@@ -585,7 +597,6 @@ public:
             Ostream&,
             const tmp<GeometricField<Type, PatchField, GeoMesh> >&
         );
-#endif
 };
 
 

From d490c9d9b565c20bfcb1cb16490b0d4f351ae464 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 1 May 2018 15:53:44 +0100
Subject: [PATCH 25/45] Formatting

---
 .../fvPatchFields/basic/calculated/calculatedFvPatchField.H  | 2 +-
 .../constraint/processor/processorFvsPatchField.H            | 5 ++---
 src/finiteVolume/fvMesh/fvMeshGeometry.C                     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
index 89aca585e..a62ab7b2a 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                  Class calculatedFvPatchField Declaration
+                    Class calculatedFvPatchField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
index 6c8656460..8c1d55e4b 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
@@ -130,9 +130,8 @@ public:
         }
 
 
-    // Destructor
-
-        ~processorFvsPatchField();
+    //- Destructor
+    virtual ~processorFvsPatchField();
 
 
     // Member functions
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index 6f83ec2ee..ba16b50ca 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -360,7 +360,7 @@ void fvMesh::updatePhi(const scalarField& sweptVols) const
     // HJ, 22/Dec/2017
     V0();
     V();
-    
+
     // Boundary update.  Used in complex geometries, eg. immersed boundary
     // HJ, 29/Nov/2017
     forAll (phi.boundaryField(), patchI)

From afde586e9f0d6f6d0aa6d59f6d2cfe3c48b7262f Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 1 May 2018 15:55:29 +0100
Subject: [PATCH 26/45] Bugfix: Update signalling for topologically changing
 mesh

---
 .../polyTopoChanger/polyTopoChangerChangeMesh.C             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C
index 11e1e689d..c2437da96 100644
--- a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C
+++ b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C
@@ -2497,6 +2497,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChanger::changeMesh()
         // Increment the morph index
         morphIndex_++;
 
+        // Mark the mesh as changing
+        mesh_.changing(true);
+        
         return topoChangeMap;
     }
     else
@@ -2510,6 +2513,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChanger::changeMesh()
 
             // Sync mesh update
             mesh_.syncUpdateMesh();
+
+            // Mark the mesh as changing
+            mesh_.changing(true);
         }
 
         return autoPtr<mapPolyMesh>(new mapPolyMesh(mesh_));

From 71745958393577f1f09f0e5f82a62bed561bafe8 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 1 May 2018 15:56:31 +0100
Subject: [PATCH 27/45] Working load balancing code

---
 .../loadBalanceFvMesh/loadBalanceFvMesh.C     | 317 +++++++++++-----
 .../loadBalanceFvMesh/loadBalanceFvMesh.H     |  46 ++-
 .../loadBalanceFvMeshTemplates.C              | 347 ++++++++++++++++++
 3 files changed, 613 insertions(+), 97 deletions(-)
 create mode 100644 src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMeshTemplates.C

diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
index 56d5f484d..3ee68ecd0 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
@@ -31,6 +31,8 @@ License
 #include "mapPolyMesh.H"
 #include "addToRunTimeSelectionTable.H"
 
+#include "GeoMesh.H"
+
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
@@ -113,7 +115,6 @@ Foam::loadBalanceFvMesh::loadBalanceFvMesh(const IOobject& io)
 
         imbalanceTrigger_ = 0.8;
     }
-
 }
 
 
@@ -202,52 +203,93 @@ bool Foam::loadBalanceFvMesh::update()
 
 
     // Split the mesh and fields over processors and send
+
+    // Prepare receiving side
+
+    // Create the reconstructor
+    processorMeshesReconstructor meshRecon("reconstructed");
+
+    PtrList<fvMesh>& procMeshes = meshRecon.meshes();
+    procMeshes.setSize(meshDecomp.nProcs());
+
+    // Collect local fields for decomposition
+    clearOut();
+    
+    // Collect fields for load balancing
+    HashTable<const volScalarField*> volScalarFields =
+        thisDb().lookupClass<volScalarField>();
+    Pout<< "volScalarFields: " << volScalarFields.sortedToc() << endl;
+    HashTable<const volVectorField*>volVectorFields =
+        thisDb().lookupClass<volVectorField>();
+    Pout<< "volVectorFields: " << volVectorFields.sortedToc() << endl;
+    HashTable<const surfaceScalarField*> surfaceScalarFields =
+        thisDb().lookupClass<surfaceScalarField>();
+    Pout<< "surfaceScalarFields: " << surfaceScalarFields.sortedToc() << endl;
+    //HJ, HERE: remove the fields that should not be load balanced
+
+    // Prepare fields for reconstruction
+    // First index: field index from volScalarFields
+    // Second index: processor entry for the field
+    List<PtrList<volScalarField> > receivedVolScalarFields
+    (
+        volScalarFields.size()
+    );
+
+    List<PtrList<volVectorField> > receivedVolVectorFields
+    (
+       volVectorFields.size()
+    );
+
+    List<PtrList<surfaceScalarField> > receivedSurfaceScalarFields
+    (
+        surfaceScalarFields.size()
+    );
+
+    forAll (receivedVolScalarFields, fieldI)
+    {
+        receivedVolScalarFields[fieldI].setSize(Pstream::nProcs());
+    }
+
+    forAll (receivedVolVectorFields, fieldI)
+    {
+        receivedVolVectorFields[fieldI].setSize(Pstream::nProcs());
+    }
+
+    forAll (receivedSurfaceScalarFields, fieldI)
+    {
+        receivedSurfaceScalarFields[fieldI].setSize(Pstream::nProcs());
+    }
+
     for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
     {
-        if (procI != Pstream::myProcNo())
+        // Check if there is a mesh to send
+        if (curMigratedCells[procI] > 0)
         {
-            Pout<< "Send mesh and fields to processor " << procI << endl;
+            // Send mesh and field to processor procI
 
-            // Check if there is a mesh to send
-            if (curMigratedCells[procI] > 0)
+            // Get mesh from decomposition
+            autoPtr<fvMesh> procMeshPtr = meshDecomp.processorMesh
+            (
+                procI,
+                time(),
+                "processorPart" + Foam::name(procI),
+                true    // Create passive processor patches
+            );
+            fvMesh& procMesh = procMeshPtr();
+
+            // Create a field decomposer
+            fvFieldDecomposer fieldDecomposer
+            (
+                *this,
+                procMesh,
+                meshDecomp.procFaceAddressing()[procI],
+                meshDecomp.procCellAddressing()[procI],
+                meshDecomp.procBoundaryAddressing()[procI]
+            );
+
+            if (procI != Pstream::myProcNo())
             {
-                // Send mesh and field to processor procI
-
-                // Get mesh from decomposition
-                autoPtr<fvMesh> procMeshPtr = meshDecomp.processorMesh
-                (
-                    procI,
-                    time(),
-                    "processorPart" + Foam::name(procI),
-                    true    // Create passive processor patches
-                );
-                fvMesh& procMesh = procMeshPtr();
-
-                // Create a field decomposer
-                fvFieldDecomposer fieldDecomposer
-                (
-                    *this,
-                    procMesh,
-                    meshDecomp.procFaceAddressing()[procI],
-                    meshDecomp.procCellAddressing()[procI],
-                    meshDecomp.procBoundaryAddressing()[procI]
-                );
-/*
-                // Simple test only: rebalance volScalarFields
-                HashTable<const volScalarField*> volScalarFields =
-                    thisDb().lookupClass<volScalarField>();
-
-                for
-                (
-                    HashTable<const volScalarField*>::const_iterator iter =
-                        volScalarFields.begin();
-                    iter != volScalarFields.end();
-                    ++iter
-                )
-                {
-                    fieldDecomposer.decomposeField(*(iter()));
-                }
-*/
+                Pout<< "Send mesh and fields to processor " << procI << endl;
 
                 OPstream toProc
                 (
@@ -256,44 +298,54 @@ bool Foam::loadBalanceFvMesh::update()
                 );
 
                 // Send the mesh and fields to target processor
-                toProc << procMesh;
+                toProc << procMesh << nl;
+
+                // Send fields
+                sendFields(volScalarFields, fieldDecomposer, toProc);
+                sendFields(volVectorFields, fieldDecomposer, toProc);
+                sendFields(surfaceScalarFields, fieldDecomposer, toProc);
+            }
+            else
+            {
+                // My processor.  Grab mesh and fields
+                // Note: procI == Pstream::myProcNo()
+                // HJ, 26/Apr/2018
+
+                // Set local mesh piece
+                procMeshes.set
+                (
+                    procI,
+                    procMeshPtr
+                );
+
+                // Set local fields
+                // Note: first index is field index and second index is procI
+                insertFields
+                (
+                    volScalarFields,
+                    fieldDecomposer,
+                    receivedVolScalarFields
+                );
+
+                insertFields
+                (
+                    volVectorFields,
+                    fieldDecomposer,
+                    receivedVolVectorFields
+                );
+
+                insertFields
+                (
+                    surfaceScalarFields,
+                    fieldDecomposer,
+                    receivedSurfaceScalarFields
+                );
             }
         }
     }
 
 
     // Collect pieces of mesh and fields from other processors
-
-    // Create a list of processor meshes
-    // Create the reconstructor
-    processorMeshesReconstructor meshRecon("reconstructed");
-
-    PtrList<fvMesh>& procMeshes = meshRecon.meshes();
-    procMeshes.setSize(meshDecomp.nProcs());
-
-    List<PtrList<volScalarField*> > receiveVolScalarFields
-    (
-        meshDecomp.nProcs()
-    );
-
-    // Insert own mesh if there is a piece to insert
-    if (curMigratedCells[Pstream::myProcNo()] > 0)
-    {
-        procMeshes.set
-        (
-            Pstream::myProcNo(),
-            meshDecomp.processorMesh
-            (
-                Pstream::myProcNo(),
-                time(),
-                "processorPart" + Foam::name(Pstream::myProcNo()),
-                true    // Create passive processor patches
-            )
-        );
-
-        // Set local fields
-    }
-
     for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
     {
         if (procI != Pstream::myProcNo())
@@ -330,12 +382,36 @@ bool Foam::loadBalanceFvMesh::update()
                     )
                 );
 
-                // Receive the fields
+                // Receive fields
+                // Note: first index is field index and second index is procI
+                receiveFields
+                (
+                    procI,
+                    receivedVolScalarFields,
+                    procMeshes[procI],
+                    fromProc
+                );
+
+                receiveFields
+                (
+                    procI,
+                    receivedVolVectorFields,
+                    procMeshes[procI],
+                    fromProc
+                );
+
+                receiveFields
+                (
+                    procI,
+                    receivedSurfaceScalarFields,
+                    procMeshes[procI],
+                    fromProc
+                );
             }
         }
     }
 
-    
+
     // Create the reconstructed mesh
     autoPtr<fvMesh> reconstructedMeshPtr =
         meshRecon.reconstructMesh(time());
@@ -398,27 +474,27 @@ bool Foam::loadBalanceFvMesh::update()
     }
 
     // Delete processor patches from old boundary
-    boolList patchesToReplace(bMesh.size(), false);
+    boolList patchFlag(bMesh.size(), false);
 
     forAll (bMesh, patchI)
     {
         // If the patch is not set, the slot is available for re-use
         if (!bMesh.set(patchI))
         {
-            patchesToReplace[patchI] = true;
+            patchFlag[patchI] = true;
         }
         else if (isA<processorPolyPatch>(bMesh[patchI]))
         {
             // If the patch is set and contains an "old" processor patch
             // the old patch will be deleted and replaced with a new one
-            patchesToReplace[patchI] = true;
+            patchFlag[patchI] = true;
         }
     }
 
     // Store the resetFvPatchFlag to indicate patches that will be rebuilt
-    // patchesToReplace will be used in further signalling
-    boolList resetFvPatchFlag = patchesToReplace;
-    
+    // patchFlag will be used in further signalling
+    boolList resetFvPatchFlag = patchFlag;
+
     // Check alignment and types of old and new boundary
     // Insert new patches processor patches
     // Collect patch sizes and starts
@@ -428,7 +504,7 @@ bool Foam::loadBalanceFvMesh::update()
     forAll (bMesh, patchI)
     {
         // If the patch is preserved, types need to match
-        if (!patchesToReplace[patchI])
+        if (!patchFlag[patchI])
         {
             const polyPatch& bPatch = bMesh[patchI];
             const polyPatch& reconBPatch = reconBMesh[patchI];
@@ -473,18 +549,18 @@ bool Foam::loadBalanceFvMesh::update()
             for
             (
                 nextPatchSlot = 0;
-                nextPatchSlot < patchesToReplace.size();
+                nextPatchSlot < patchFlag.size();
                 nextPatchSlot++
             )
             {
-                if (patchesToReplace[nextPatchSlot])
+                if (patchFlag[nextPatchSlot])
                 {
                     // Found a patch slot
                     break;
                 }
             }
 
-            if (nextPatchSlot >= patchesToReplace.size())
+            if (nextPatchSlot >= patchFlag.size())
             {
                 FatalErrorIn("bool loadBalanceFvMesh::update()")
                     << "Cannot find available patch slot: " << nextPatchSlot
@@ -523,7 +599,7 @@ bool Foam::loadBalanceFvMesh::update()
             );
 
             // Mark patch slot as used
-            patchesToReplace[nextPatchSlot] = false;
+            patchFlag[nextPatchSlot] = false;
 
             // Collect size
             reconPatchSizes[nextPatchSlot] = reconBMesh[reconPatchI].size();
@@ -558,22 +634,71 @@ bool Foam::loadBalanceFvMesh::update()
         true                       // Valid boundary
     );
 
+    Pout<< "New mesh: points " << nPoints()
+        << " faces: " << nFaces()
+        << " internal: " << nInternalFaces()
+        << " cells: " << nCells()
+        << " patches: " << reconPatchSizes.size() << endl;
+
+    forAll (procMeshes, procI)
+    {
+        Pout<< "procMesh " << procI
+            << " points " << procMeshes[procI].nPoints()
+            << " faces: " << procMeshes[procI].nFaces()
+            << " internal: " << procMeshes[procI].nInternalFaces()
+            << " cells: " << procMeshes[procI].nCells()
+            << " patches: " << procMeshes[procI].boundary().size()
+            << endl;
+    }
+
+    // Pout<< "RECON face: " << meshRecon.faceProcAddressing() << nl
+    //     << " cell: " << meshRecon.cellProcAddressing() << nl
+    //     << " boundary: " << meshRecon.boundaryProcAddressing() << nl
+    //     << endl;
+
+
     // To Do: build a reconstructor from addressing data
     Pout<< nl << nl
         << "FINISHED CYCLE" << nl << nl << nl
         << endl;
 
-    write();
+    // Create a dummy mapping object to re-size all fields
 
     // Create field reconstructor
-    // fvFieldReconstructor fieldReconstructor
-    // (
-    //     *this,
-    //     procMeshes,
-    //     meshRecon.faceProcAddressing(),
-    //     meshRecon.cellProcAddressing(),
-    //     meshRecon.boundaryProcAddressing()
-    // );
+    fvFieldReconstructor fieldReconstructor
+    (
+        *this,
+        procMeshes,
+        meshRecon.faceProcAddressing(),
+        meshRecon.cellProcAddressing(),
+        meshRecon.boundaryProcAddressing()
+    );
+
+    // Rebuild fields
+
+    rebuildFields
+    (
+        volScalarFields,
+        fieldReconstructor,
+        receivedVolScalarFields,
+        resetFvPatchFlag
+    );
+
+    rebuildFields
+    (
+        volVectorFields,
+        fieldReconstructor,
+        receivedVolVectorFields,
+        resetFvPatchFlag
+    );
+
+    rebuildFields
+    (
+        surfaceScalarFields,
+        fieldReconstructor,
+        receivedSurfaceScalarFields,
+        resetFvPatchFlag
+    );
 
     return true;
 }
diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H
index edda17a1a..a8d72c014 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                     Class loadBalanceFvMesh Declaration
+                      Class loadBalanceFvMesh Declaration
 \*---------------------------------------------------------------------------*/
 
 class loadBalanceFvMesh
@@ -71,6 +71,44 @@ class loadBalanceFvMesh
         //- Check balance.  Return true if re-balancing is required
         bool checkLoadBalance(const scalarField& weights) const;
 
+        //- Send fields to other processor
+        template<class GeoField, class Decomposer>
+        void sendFields
+        (
+            const HashTable<const GeoField*>& geoFields,
+            const Decomposer& decomposer,
+            Ostream& toProc
+        ) const;
+
+        //- Insert local fields
+        template<class GeoField, class Decomposer>
+        void insertFields
+        (
+            const HashTable<const GeoField*>& geoFields,
+            const Decomposer& decomposer,
+            List<PtrList<GeoField> >& localFields
+        ) const;
+
+        //- Receive fields from other processor
+        template<class GeoMesh, class GeoField>
+        void receiveFields
+        (
+            const label procIndex,
+            List<PtrList<GeoField> >& receivedFields,
+            const GeoMesh& procMesh,
+            Istream& fromProc
+        ) const;
+
+        //- Resize and rebuild fields
+        template<class GeoField, class Reconstructor>
+        void rebuildFields
+        (
+            const HashTable<const GeoField*>& geoFields,
+            const Reconstructor& reconstructor,
+            const List<PtrList<GeoField> >& receivedFields,
+            const boolList& patchesToReplace
+        ) const;
+
 
 public:
 
@@ -95,6 +133,12 @@ public:
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "loadBalanceFvMeshTemplates.C"
+#endif
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMeshTemplates.C b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMeshTemplates.C
new file mode 100644
index 000000000..75aa71569
--- /dev/null
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMeshTemplates.C
@@ -0,0 +1,347 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "loadBalanceFvMesh.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class GeoField, class Decomposer>
+void Foam::loadBalanceFvMesh::sendFields
+(
+    const HashTable<const GeoField*>& geoFields,
+    const Decomposer& decomposer,
+    Ostream& toProc
+) const
+{
+    // Send number of fields
+    toProc<< geoFields.size() << nl;
+
+    label fI = 0;
+    
+    forAllConstIter
+    (
+        typename HashTable<const GeoField*>,
+        geoFields,
+        iter
+    )
+    {
+        Pout<< "Sending field " << iter()->name() << " in slot " << fI << endl;
+        // Encapsulate a field within a dictionary in order
+        // to read it correctly on the receiving side
+        toProc << iter()->name() << nl
+            << token::BEGIN_BLOCK << nl
+            << decomposer.decomposeField(*(iter()))
+            << nl << token::END_BLOCK
+            << nl;
+
+        fI++;
+    }
+}
+
+
+template<class GeoField, class Decomposer>
+void Foam::loadBalanceFvMesh::insertFields
+(
+    const HashTable<const GeoField*>& geoFields,
+    const Decomposer& decomposer,
+    List<PtrList<GeoField> >& localFields
+) const
+{
+    // Note:
+    // In the insertion, the first index in the receivedFields is the field
+    // index and the second index is the processor index.
+    // In this way, receivedFields[fI] gives the PtrList of processor fields
+    // to be reconstructed into a single field
+    // HJ, 30/Apr/2018
+
+    // Insertion of fields happens processor-per-processor, meaning that the
+    // first index is varied and procIndex remains constant
+    localFields.setSize(geoFields.size());
+
+    label fI = 0;
+
+    forAllConstIter
+    (
+        typename HashTable<const GeoField*>,
+        geoFields,
+        iter
+    )
+    {
+        
+        localFields[fI].set
+        (
+            Pstream::myProcNo(),
+            decomposer.decomposeField(*(iter()))
+        );
+
+        Pout<< "Setting field " << localFields[fI][Pstream::myProcNo()].name()
+            << " in slot " << fI << endl;
+        fI++;
+    }
+}
+
+
+template<class GeoMesh, class GeoField>
+void Foam::loadBalanceFvMesh::receiveFields
+(
+    const label procIndex,
+    List<PtrList<GeoField> >& receivedFields,
+    const GeoMesh& procMesh,
+    Istream& fromProc
+) const
+{
+    // Note:
+    // In the insertion, the first index in the receivedFields is the field
+    // index and the second index is the processor index.
+    // In this way, receivedFields[fI] gives the PtrList of processor fields
+    // to be reconstructed into a single field
+    // HJ, 30/Apr/2018
+
+    // Insertion of fields happens processor-per-processor, meaning that the
+    // first index is varied and procIndex remains constant
+
+    // Receive number of fields
+    label nScalarFields = readLabel(fromProc);
+
+    receivedFields.setSize(nScalarFields);
+
+    forAll (receivedFields, fI)
+    {
+        word fieldName(fromProc);
+        Pout<< "Receiving field " << fieldName << " in slot " << fI << endl;
+
+        dictionary dict(fromProc);
+
+        receivedFields[fI].set
+        (
+            procIndex,
+            new GeoField
+            (
+                IOobject
+                (
+                    fieldName,
+                    procMesh.time().timeName(),
+                    procMesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                procMesh,
+                dict
+            )
+        );
+    }
+}
+
+
+template<class GeoField, class Reconstructor>
+void Foam::loadBalanceFvMesh::rebuildFields
+(
+    const HashTable<const GeoField*>& geoFields,
+    const Reconstructor& reconstructor,
+    const List<PtrList<GeoField> >& receivedFields,
+    const boolList& patchesToReplace
+) const
+{
+    label fieldI = 0;
+
+    forAllConstIter
+    (
+        typename HashTable<const GeoField*>,
+        geoFields,
+        iter
+    )
+    {
+        GeoField& masterField = const_cast<GeoField&>(*iter());
+
+        const PtrList<GeoField>& partFields = receivedFields[fieldI];
+
+        Pout<< "Rebuilding field " << masterField.name() << endl;
+
+        // Check name match.  Note: there may be holes
+        word partName;
+
+        bool nameSet = false;
+        bool nameOk = true;
+
+        forAll (partFields, pfI)
+        {
+            if (partFields.set(pfI))
+            {
+                if (!nameSet)
+                {
+                    partName = partFields[pfI].name();
+                    nameSet = true;
+                }
+                else
+                {
+                    if (partName != partFields[pfI].name())
+                    {
+                        Pout<< "BAD NAME, 1: " << partName
+                            << " and " << partFields[pfI].name()
+                            << endl;
+                        nameOk = false;
+                    }
+                }
+            }
+        }
+
+        if (masterField.name() != partName)
+        {
+            // Check that all fields have the same name
+            Pout<< "BAD NAME, 2 " << partName
+                << " and " << masterField.name()
+                << endl;
+            nameOk = false;
+        }
+
+        if (!nameOk)
+        {
+            FatalErrorIn
+            (
+                "loadBalanceFvMesh::rebuildFields\n"
+                "(\n"
+                "    const HashTable<const GeoField*>& geoFields,\n"
+                "    const Reconstructor& reconstructor,\n"
+                "    const List<PtrList<GeoField> >& receivedFields,\n"
+                ") const"
+            )   << "Name mismatch when rebuilding field " << masterField.name()
+                << abort(FatalError);
+        }
+
+        if (patchesToReplace.size() != masterField.mesh().boundary().size())
+        {
+            FatalErrorIn
+            (
+                "loadBalanceFvMesh::rebuildFields\n"
+                "(\n"
+                "    const HashTable<const GeoField*>& geoFields,\n"
+                "    const Reconstructor& reconstructor,\n"
+                "    const List<PtrList<GeoField> >& receivedFields,\n"
+                ") const"
+            )   << "Bad size of patches to replace.  Boundary: "
+                << masterField.mesh().boundary().size()
+                << " patchesToReplace: " << patchesToReplace.size()
+                << abort(FatalError);
+        }
+
+        typename GeoField::GeoMeshType fieldMesh(*this);
+
+        // Resize the master field
+
+        // Resize internal field
+        if
+        (
+            masterField.internalField().size()
+         != GeoField::GeoMeshType::size(masterField.mesh())
+        )
+        {
+            Pout<< "Resizing internal field: old size = "
+                << masterField.internalField().size()
+                << " new size = "
+                << GeoField::GeoMeshType::size(masterField.mesh())
+                << endl;
+            masterField.setSize
+            (
+                GeoField::GeoMeshType::size(masterField.mesh())
+            );
+        }
+
+        // Resize boundary (number of patches)
+        typename GeoField::GeometricBoundaryField& patchFields =
+                masterField.boundaryField();
+
+        if (patchFields.size() != masterField.mesh().boundary().size())
+        {
+            Pout<< "Resizing boundary field: "
+                    << masterField.mesh().boundary().size()
+                    << endl;
+
+            patchFields.setSize(masterField.mesh().boundary().size());
+        }
+
+        // Resize patch fields
+        forAll (patchFields, patchI)
+        {
+            if (patchesToReplace[patchI])
+            {
+                // Create a new constrained patch field
+                Pout<< "Inserting constrained patch field for patch "
+                    << masterField.mesh().boundary()[patchI].name()
+                    << endl;
+
+                patchFields.set
+                (
+                    patchI,
+                    GeoField::PatchFieldType::New
+                    (
+                        masterField.mesh().boundary()[patchI].type(),
+                        masterField.mesh().boundary()[patchI],
+                        masterField
+                    )
+                );
+
+                // Set field to zero to avoid uninitialised memory
+                patchFields[patchI] =
+                    pTraits
+                    <
+                        typename GeoField::PrimitiveType
+                    >::zero;
+            }
+            else if
+            (
+                patchFields[patchI].size()
+             != masterField.mesh().boundary()[patchI].size()
+            )
+            {
+                // Resize patch field
+                Pout<< "Resizing patch field for patch "
+                    << masterField.mesh().boundary()[patchI].name()
+                    << " old size: " << patchFields[patchI].size()
+                    << " new size: "
+                    << masterField.mesh().boundary()[patchI].size()
+                    << endl;
+
+                patchFields[patchI].setSize
+                (
+                    masterField.mesh().boundary()[patchI].size()
+                );
+            }
+        }
+
+        // Rebuild the master field from components
+        reconstructor.reconstructField
+        (
+            masterField,
+            partFields
+        );
+
+        // Increment field counter
+        fieldI++;
+        Pout<< "... done" << endl;
+    }
+}
+
+
+// ************************************************************************* //

From 1e8847d71e1d40a006c7cf45119e6073c5ee88a7 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 1 May 2018 15:57:12 +0100
Subject: [PATCH 28/45] Refactor decompose/reconstruct tools for load balancing

---
 .../decomposeReconstruct/Make/files           |   3 +
 .../finiteVolume/domainDecomposition.C        |   8 -
 .../finiteVolume/fvFieldDecomposer.H          |   5 +-
 .../fvFieldDecomposerDecomposeFields.C        |  84 +++---
 .../passiveProcessorFvPatchField.C            | 112 ++++++++
 .../passiveProcessorFvPatchField.H            | 151 +++++++++++
 .../passiveProcessorFvPatchFields.C           |  43 ++++
 .../passiveProcessorFvPatchFields.H           |  49 ++++
 .../passiveProcessorFvPatchFieldsFwd.H        |  51 ++++
 .../passiveProcessorFvsPatchField.C           | 116 +++++++++
 .../passiveProcessorFvsPatchField.H           | 151 +++++++++++
 .../passiveProcessorFvsPatchFields.C          |  44 ++++
 .../passiveProcessorFvsPatchFields.H          |  49 ++++
 .../passiveProcessorFvsPatchFieldsFwd.H       |  51 ++++
 .../finiteVolume/fvFieldReconstructor.H       | 100 ++++----
 .../fvFieldReconstructorReconstructFields.C   | 242 +++++++++---------
 16 files changed, 1047 insertions(+), 212 deletions(-)
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchField.C
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchField.H
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFields.C
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFields.H
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFieldsFwd.H
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchField.C
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchField.H
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFields.C
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFields.H
 create mode 100644 src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFieldsFwd.H

diff --git a/src/decompositionMethods/decomposeReconstruct/Make/files b/src/decompositionMethods/decomposeReconstruct/Make/files
index 0d3f4f821..ee9bfc9f7 100644
--- a/src/decompositionMethods/decomposeReconstruct/Make/files
+++ b/src/decompositionMethods/decomposeReconstruct/Make/files
@@ -1,6 +1,9 @@
 passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.C
 passivePatches/passiveProcessorFvPatch/passiveProcessorFvPatch.C
 
+passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFields.C
+passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFields.C
+
 decomposeTools/finiteVolume/domainDecomposition.C
 decomposeTools/finiteVolume/distributeCells.C
 decomposeTools/finiteVolume/decomposeMesh.C
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
index 67b12dd0f..a873dceb2 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
@@ -207,14 +207,6 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
     }
 
     // Create processor mesh without a boundary
-    Pout<< "RAW MESH: points: " << procPoints.size()
-        << " faces: " << procFaces.size()
-        << " owner: " << procOwner.size()
-        << " procNeighbour: " << procNeighbour.size() << nl
-        << "curPatchSizes: " << procPatchSize_[procI] << nl
-        << " curPatchStarts: " << procPatchStartIndex_[procI] << nl
-        << endl;
-    // Create the mesh
     autoPtr<fvMesh> procMeshPtr
     (
         new fvMesh
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposer.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposer.H
index cbf16bbb2..b0323607e 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposer.H
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposer.H
@@ -253,9 +253,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~fvFieldDecomposer();
+    //- Destructor
+    ~fvFieldDecomposer();
 
 
     // Member Functions
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposerDecomposeFields.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposerDecomposeFields.C
index e32d72ab4..89950e2f0 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposerDecomposeFields.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposerDecomposeFields.C
@@ -47,38 +47,45 @@ fvFieldDecomposer::decomposeField
     // Create and map the patch field values
     PtrList<fvPatchField<Type> > patchFields(boundaryAddressing_.size());
 
-    forAll (boundaryAddressing_, patchi)
+    forAll (boundaryAddressing_, patchI)
     {
-        if (boundaryAddressing_[patchi] >= 0)
+        if (boundaryAddressing_[patchI] >= 0)
         {
             patchFields.set
             (
-                patchi,
+                patchI,
                 fvPatchField<Type>::New
                 (
-                    field.boundaryField()[boundaryAddressing_[patchi]],
-                    procMesh_.boundary()[patchi],
+                    field.boundaryField()[boundaryAddressing_[patchI]],
+                    procMesh_.boundary()[patchI],
                     DimensionedField<Type, volMesh>::null(),
-                    *patchFieldDecomposerPtrs_[patchi]
+                    *patchFieldDecomposerPtrs_[patchI]
                 )
             );
         }
         else
         {
+            // This will be a processor or passiveProcessor field,
+            // depending on the patch type.  Construct it first and set the
+            // data by hand
             patchFields.set
             (
-                patchi,
-                new processorFvPatchField<Type>
+                patchI,
+                fvPatchField<Type>::New
+                // new processorFvPatchField<Type>
                 (
-                    procMesh_.boundary()[patchi],
-                    DimensionedField<Type, volMesh>::null(),
-                    Field<Type>
-                    (
-                        field.internalField(),
-                        *processorVolPatchFieldDecomposerPtrs_[patchi]
-                    )
+                    procMesh_.boundary()[patchI].type(),
+                    procMesh_.boundary()[patchI],
+                    DimensionedField<Type, volMesh>::null()
                 )
             );
+
+            patchFields[patchI] ==
+                Field<Type>
+                (
+                    field.internalField(),
+                    *processorVolPatchFieldDecomposerPtrs_[patchI]
+                );
         }
     }
 
@@ -135,7 +142,9 @@ fvFieldDecomposer::decomposeField
     // faces and faces from cyclic boundaries. This is a bit of a hack, but
     // I cannot find a better solution without making the internal storage
     // mechanism for surfaceFields correspond to the one of faces in polyMesh
-    // (i.e. using slices)
+    // (i.e. using slices). HJ, date unknown, before 2004
+
+    // Copy all face data into a single array across all patches
     Field<Type> allFaceField(field.mesh().nFaces());
 
     forAll (field.internalField(), i)
@@ -143,11 +152,11 @@ fvFieldDecomposer::decomposeField
         allFaceField[i] = field.internalField()[i];
     }
 
-    forAll (field.boundaryField(), patchi)
+    forAll (field.boundaryField(), patchI)
     {
-        const Field<Type> & p = field.boundaryField()[patchi];
+        const Field<Type> & p = field.boundaryField()[patchI];
 
-        const label patchStart = field.mesh().boundaryMesh()[patchi].start();
+        const label patchStart = field.mesh().boundaryMesh()[patchI].start();
 
         forAll (p, i)
         {
@@ -158,38 +167,45 @@ fvFieldDecomposer::decomposeField
     // Create and map the patch field values
     PtrList<fvsPatchField<Type> > patchFields(boundaryAddressing_.size());
 
-    forAll (boundaryAddressing_, patchi)
+    forAll (boundaryAddressing_, patchI)
     {
-        if (boundaryAddressing_[patchi] >= 0)
+        if (boundaryAddressing_[patchI] >= 0)
         {
             patchFields.set
             (
-                patchi,
+                patchI,
                 fvsPatchField<Type>::New
                 (
-                    field.boundaryField()[boundaryAddressing_[patchi]],
-                    procMesh_.boundary()[patchi],
+                    field.boundaryField()[boundaryAddressing_[patchI]],
+                    procMesh_.boundary()[patchI],
                     DimensionedField<Type, surfaceMesh>::null(),
-                    *patchFieldDecomposerPtrs_[patchi]
+                    *patchFieldDecomposerPtrs_[patchI]
                 )
             );
         }
         else
         {
+            // This will be a processor or passiveProcessor field,
+            // depending on the patch type.  Construct it first and set the
+            // data by hand
             patchFields.set
             (
-                patchi,
-                new processorFvsPatchField<Type>
+                patchI,
+                fvsPatchField<Type>::New
+                // new processorFvsPatchField<Type>
                 (
-                    procMesh_.boundary()[patchi],
-                    DimensionedField<Type, surfaceMesh>::null(),
-                    Field<Type>
-                    (
-                        allFaceField,
-                        *processorSurfacePatchFieldDecomposerPtrs_[patchi]
-                    )
+                    procMesh_.boundary()[patchI].type(),
+                    procMesh_.boundary()[patchI],
+                    DimensionedField<Type, surfaceMesh>::null()
                 )
             );
+
+            patchFields[patchI] ==
+                Field<Type>
+                (
+                    allFaceField,
+                    *processorSurfacePatchFieldDecomposerPtrs_[patchI]
+                );
         }
     }
 
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchField.C b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchField.C
new file mode 100644
index 000000000..496ac394c
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchField.C
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "passiveProcessorFvPatchField.H"
+#include "passiveProcessorFvPatch.H"
+#include "IPstream.H"
+#include "OPstream.H"
+#include "transformField.H"
+#include "coeffFields.H"
+#include "demandDrivenData.H"
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::passiveProcessorFvPatchField<Type>::passiveProcessorFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    fvPatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+Foam::passiveProcessorFvPatchField<Type>::passiveProcessorFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const Field<Type>& f
+)
+:
+    fvPatchField<Type>(p, iF, f)
+{}
+
+
+template<class Type>
+Foam::passiveProcessorFvPatchField<Type>::passiveProcessorFvPatchField
+(
+    const passiveProcessorFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+Foam::passiveProcessorFvPatchField<Type>::passiveProcessorFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+Foam::passiveProcessorFvPatchField<Type>::passiveProcessorFvPatchField
+(
+    const passiveProcessorFvPatchField<Type>& ptf
+)
+:
+    fvPatchField<Type>(ptf)
+{}
+
+
+template<class Type>
+Foam::passiveProcessorFvPatchField<Type>::passiveProcessorFvPatchField
+(
+    const passiveProcessorFvPatchField<Type>& ptf,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    fvPatchField<Type>(ptf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::passiveProcessorFvPatchField<Type>::~passiveProcessorFvPatchField()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchField.H b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchField.H
new file mode 100644
index 000000000..c37471378
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchField.H
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::passiveProcessorFvPatchField
+
+Description
+    This patch field is used in parallel load balancing to communicate
+    future passiveProcessor data in parallel decomposition
+
+SourceFiles
+    passiveProcessorFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef passiveProcessorFvPatchField_H
+#define passiveProcessorFvPatchField_H
+
+#include "fvPatchField.H"
+#include "passiveProcessorFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class passiveProcessorFvPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class passiveProcessorFvPatchField
+:
+    public fvPatchField<Type>
+{
+public:
+
+    //- Runtime type information
+    TypeName(passiveProcessorFvPatch::typeName_());
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        passiveProcessorFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct from patch and internal field and patch field
+        passiveProcessorFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const Field<Type>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        passiveProcessorFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given passiveProcessorFvPatchField
+        //  onto a new patch
+        passiveProcessorFvPatchField
+        (
+            const passiveProcessorFvPatchField<Type>&,
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        passiveProcessorFvPatchField
+        (
+            const passiveProcessorFvPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<Type> > clone() const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new passiveProcessorFvPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        passiveProcessorFvPatchField
+        (
+            const passiveProcessorFvPatchField<Type>&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<Type> > clone
+        (
+            const DimensionedField<Type, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new passiveProcessorFvPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~passiveProcessorFvPatchField();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "passiveProcessorFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFields.C b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFields.C
new file mode 100644
index 000000000..263d356e1
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "passiveProcessorFvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(passiveProcessor);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFields.H b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFields.H
new file mode 100644
index 000000000..cb576005e
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFields.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef passiveProcessorFvPatchFields_H
+#define passiveProcessorFvPatchFields_H
+
+#include "passiveProcessorFvPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeFieldTypedefs(passiveProcessor)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFieldsFwd.H b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFieldsFwd.H
new file mode 100644
index 000000000..c21e87d14
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvPatchFields/passiveProcessor/passiveProcessorFvPatchFieldsFwd.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef passiveProcessorFvPatchFieldsFwd_H
+#define passiveProcessorFvPatchFieldsFwd_H
+
+#include "fvPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class passiveProcessorFvPatchField;
+
+makePatchTypeFieldTypedefs(passiveProcessor)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchField.C b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchField.C
new file mode 100644
index 000000000..cf25e6215
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchField.C
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "passiveProcessorFvsPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+passiveProcessorFvsPatchField<Type>::passiveProcessorFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF
+)
+:
+    fvsPatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+passiveProcessorFvsPatchField<Type>::passiveProcessorFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const Field<Type>& f
+)
+:
+    fvsPatchField<Type>(p, iF, f)
+{}
+
+
+// Construct by mapping given passiveProcessorFvsPatchField<Type>
+template<class Type>
+passiveProcessorFvsPatchField<Type>::passiveProcessorFvsPatchField
+(
+    const passiveProcessorFvsPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fvsPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+passiveProcessorFvsPatchField<Type>::passiveProcessorFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvsPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+passiveProcessorFvsPatchField<Type>::passiveProcessorFvsPatchField
+(
+    const passiveProcessorFvsPatchField<Type>& ptf
+)
+:
+    fvsPatchField<Type>(ptf)
+{}
+
+
+template<class Type>
+passiveProcessorFvsPatchField<Type>::passiveProcessorFvsPatchField
+(
+    const passiveProcessorFvsPatchField<Type>& ptf,
+    const DimensionedField<Type, surfaceMesh>& iF
+)
+:
+    fvsPatchField<Type>(ptf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+template<class Type>
+passiveProcessorFvsPatchField<Type>::~passiveProcessorFvsPatchField()
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchField.H b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchField.H
new file mode 100644
index 000000000..45a310a30
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchField.H
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::passiveProcessorFvsPatchField
+
+Description
+    This patch field is used in parallel load balancing to communicate
+    future processor data in parallel decomposition
+
+SourceFiles
+    passiveProcessorFvsPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef passiveProcessorFvsPatchField_H
+#define passiveProcessorFvsPatchField_H
+
+#include "fvsPatchField.H"
+#include "passiveProcessorFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class passiveProcessorFvsPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class passiveProcessorFvsPatchField
+:
+    public fvsPatchField<Type>
+{
+public:
+
+    //- Runtime type information
+    TypeName(passiveProcessorFvPatch::typeName_());
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        passiveProcessorFvsPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, surfaceMesh>&
+        );
+
+        //- Construct from patch and internal field and patch field
+        passiveProcessorFvsPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, surfaceMesh>&,
+            const Field<Type>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        passiveProcessorFvsPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, surfaceMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given passiveProcessorFvsPatchField
+        //  onto a new patch
+        passiveProcessorFvsPatchField
+        (
+            const passiveProcessorFvsPatchField<Type>&,
+            const fvPatch&,
+            const DimensionedField<Type, surfaceMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        passiveProcessorFvsPatchField
+        (
+            const passiveProcessorFvsPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvsPatchField<Type> > clone() const
+        {
+            return tmp<fvsPatchField<Type> >
+            (
+                new passiveProcessorFvsPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        passiveProcessorFvsPatchField
+        (
+            const passiveProcessorFvsPatchField<Type>&,
+            const DimensionedField<Type, surfaceMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvsPatchField<Type> > clone
+        (
+            const DimensionedField<Type, surfaceMesh>& iF
+        ) const
+        {
+            return tmp<fvsPatchField<Type> >
+            (
+                new passiveProcessorFvsPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~passiveProcessorFvsPatchField();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "passiveProcessorFvsPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFields.C b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFields.C
new file mode 100644
index 000000000..47c1216c9
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFields.C
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "passiveProcessorFvsPatchFields.H"
+#include "fvPatchFields.H"
+#include "fvsPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makeFvsPatchFields(passiveProcessor);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFields.H b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFields.H
new file mode 100644
index 000000000..5d34c1a87
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFields.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef passiveProcessorFvsPatchFields_H
+#define passiveProcessorFvsPatchFields_H
+
+#include "passiveProcessorFvsPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFvsPatchTypeFieldTypedefs(passiveProcessor)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFieldsFwd.H b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFieldsFwd.H
new file mode 100644
index 000000000..b1ceffbba
--- /dev/null
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatchFields/passiveFvsPatchFields/passiveProcessor/passiveProcessorFvsPatchFieldsFwd.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef passiveProcessorFvsPatchFieldsFwd_H
+#define passiveProcessorFvsPatchFieldsFwd_H
+
+#include "fvsPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class passiveProcessorFvsPatchField;
+
+makeFvsPatchTypeFieldTypedefs(passiveProcessor)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H
index a1482069c..92d97a10f 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H
@@ -153,57 +153,65 @@ public:
 
     // Member Functions
 
-        //- Reconstruct volume field data into a given field
-        //  If a PtrList slot is empty, it is skipped
-        template<class Type>
-        void reconstructFvVolumeField
-        (
-            GeometricField<Type, fvPatchField, volMesh>& reconField,
-            const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
-                procFields
-        ) const;
+        // Single field reconstruction
+    
+            //- Reconstruct volume field data into a given field
+            //  If a PtrList slot is empty, it is skipped
+            template<class Type>
+            void reconstructField
+            (
+                GeometricField<Type, fvPatchField, volMesh>& reconField,
+                const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+                    procFields
+            ) const;
 
-        //- Reconstruct volume field
-        template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> >
-        reconstructFvVolumeField
-        (
-            const IOobject& fieldIoObject
-        ) const;
+            //- Reconstruct volume field data into a given field
+            //  If a PtrList slot is empty, it is skipped
+            template<class Type>
+            void reconstructField
+            (
+                GeometricField<Type, fvsPatchField, surfaceMesh>& reconField,
+                const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+                    procFields
+            ) const;
 
-        //- Reconstruct volume field data into a given field
-        //  If a PtrList slot is empty, it is skipped
-        template<class Type>
-        void reconstructFvSurfaceField
-        (
-            GeometricField<Type, fvsPatchField, surfaceMesh>& reconField,
-            const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
-                procFields
-        ) const;
 
-        //- Reconstruct surface field
-        template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-        reconstructFvSurfaceField
-        (
-            const IOobject& fieldIoObject
-        ) const;
+        // Reconstruct and return a single field
+    
+            //- Reconstruct volume field
+            template<class Type>
+            tmp<GeometricField<Type, fvPatchField, volMesh> >
+            reconstructFvVolumeField
+            (
+                const IOobject& fieldIoObject
+            ) const;
 
-        //- Reconstruct and write all/selected volume fields
-        template<class Type>
-        void reconstructFvVolumeFields
-        (
-            const IOobjectList& objects,
-            const HashSet<word>& selectedFields
-        ) const;
+            //- Reconstruct surface field
+            template<class Type>
+            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+            reconstructFvSurfaceField
+            (
+                const IOobject& fieldIoObject
+            ) const;
 
-        //- Reconstruct and write all/selected volume fields
-        template<class Type>
-        void reconstructFvSurfaceFields
-        (
-            const IOobjectList& objects,
-            const HashSet<word>& selectedFields
-        ) const;
+
+        // Reconstruct and write all/selected fields
+    
+            //- Reconstruct and write all/selected volume fields
+            template<class Type>
+            void reconstructFvVolumeFields
+            (
+                const IOobjectList& objects,
+                const HashSet<word>& selectedFields
+            ) const;
+
+            //- Reconstruct and write all/selected volume fields
+            template<class Type>
+            void reconstructFvSurfaceFields
+            (
+                const IOobjectList& objects,
+                const HashSet<word>& selectedFields
+            ) const;
 };
 
 
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C
index 5d52249f1..77b2b9a9e 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructorReconstructFields.C
@@ -37,7 +37,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::fvFieldReconstructor::reconstructFvVolumeField
+void Foam::fvFieldReconstructor::reconstructField
 (
     GeometricField<Type, fvPatchField, volMesh>& reconField,
     const PtrList<GeometricField<Type, fvPatchField, volMesh> >& procFields
@@ -135,6 +135,124 @@ void Foam::fvFieldReconstructor::reconstructFvVolumeField
 }
 
 
+template<class Type>
+void Foam::fvFieldReconstructor::reconstructField
+(
+    GeometricField<Type, fvsPatchField, surfaceMesh>& reconField,
+    const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& procFields
+) const
+{
+    // Create the internalField
+    Field<Type>& iField = reconField.internalField();
+
+    typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+        GeometricBoundaryField& bouField = reconField.boundaryField();
+
+    forAll (procFields, procI)
+    {
+        if (procFields.set(procI))
+        {
+            const GeometricField<Type, fvsPatchField, surfaceMesh>& procField =
+                procFields[procI];
+
+            // Set the face values in the reconstructed field
+
+            // It is necessary to create a copy of the addressing array to
+            // take care of the face direction offset trick.
+            //
+            {
+                labelList curAddr(faceProcAddressing_[procI]);
+
+                forAll (curAddr, addrI)
+                {
+                    curAddr[addrI] -= 1;
+                }
+
+                iField.rmap
+                (
+                    procField.internalField(),
+                    curAddr
+                );
+            }
+
+            // Set the boundary patch values in the reconstructed field
+            forAll (boundaryProcAddressing_[procI], patchI)
+            {
+                // Get patch index of the original patch
+                const label curBPatch = boundaryProcAddressing_[procI][patchI];
+
+                // Get addressing slice for this patch
+                const labelList::subList cp =
+                    procMeshes_[procI].boundary()[patchI].patchSlice
+                    (
+                        faceProcAddressing_[procI]
+                    );
+
+                // Check if the boundary patch is not a processor patch
+                if (curBPatch >= 0)
+                {
+                    // Regular patch. Fast looping
+                    const label curPatchStart =
+                        mesh_.boundaryMesh()[curBPatch].start();
+
+                    labelList reverseAddressing(cp.size());
+
+                    forAll (cp, faceI)
+                    {
+                        // Subtract one to take into account offsets for
+                        // face direction.
+                        reverseAddressing[faceI] =
+                            cp[faceI] - 1 - curPatchStart;
+                    }
+
+                    bouField[curBPatch].rmap
+                    (
+                        procField.boundaryField()[patchI],
+                        reverseAddressing
+                    );
+                }
+                else
+                {
+                    const Field<Type>& curProcPatch =
+                        procField.boundaryField()[patchI];
+
+                    // In processor patches, there's a mix of internal faces
+                    // (some of them turned) and possible cyclics. Slow loop
+                    forAll (cp, faceI)
+                    {
+                        label curF = cp[faceI] - 1;
+
+                        // Is the face turned the right side round
+                        if (curF >= 0)
+                        {
+                            // Is the face on the boundary?
+                            if (curF >= mesh_.nInternalFaces())
+                            {
+                                label curBPatch =
+                                    mesh_.boundaryMesh().whichPatch(curF);
+
+                                // Add the face
+                                label curPatchFace =
+                                    mesh_.boundaryMesh()
+                                    [curBPatch].whichFace(curF);
+
+                                bouField[curBPatch][curPatchFace] =
+                                    curProcPatch[faceI];
+                            }
+                            else
+                            {
+                                // Internal face
+                                iField[curF] = curProcPatch[faceI];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
 template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::fvFieldReconstructor::reconstructFvVolumeField
@@ -262,7 +380,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
     );
 
     // Reconstruct field
-    reconstructFvVolumeField
+    this->reconstructField
     (
         treconField(),
         procFields
@@ -272,124 +390,6 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
 }
 
 
-template<class Type>
-void Foam::fvFieldReconstructor::reconstructFvSurfaceField
-(
-    GeometricField<Type, fvsPatchField, surfaceMesh>& reconField,
-    const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& procFields
-) const
-{
-    // Create the internalField
-    Field<Type>& iField = reconField.internalField();
-
-    typename GeometricField<Type, fvsPatchField, surfaceMesh>::
-        GeometricBoundaryField& bouField = reconField.boundaryField();
-
-    forAll (procFields, procI)
-    {
-        if (procFields.set(procI))
-        {
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& procField =
-                procFields[procI];
-
-            // Set the face values in the reconstructed field
-
-            // It is necessary to create a copy of the addressing array to
-            // take care of the face direction offset trick.
-            //
-            {
-                labelList curAddr(faceProcAddressing_[procI]);
-
-                forAll (curAddr, addrI)
-                {
-                    curAddr[addrI] -= 1;
-                }
-
-                iField.rmap
-                (
-                    procField.internalField(),
-                    curAddr
-                );
-            }
-
-            // Set the boundary patch values in the reconstructed field
-            forAll (boundaryProcAddressing_[procI], patchI)
-            {
-                // Get patch index of the original patch
-                const label curBPatch = boundaryProcAddressing_[procI][patchI];
-
-                // Get addressing slice for this patch
-                const labelList::subList cp =
-                    procMeshes_[procI].boundary()[patchI].patchSlice
-                    (
-                        faceProcAddressing_[procI]
-                    );
-
-                // Check if the boundary patch is not a processor patch
-                if (curBPatch >= 0)
-                {
-                    // Regular patch. Fast looping
-                    const label curPatchStart =
-                        mesh_.boundaryMesh()[curBPatch].start();
-
-                    labelList reverseAddressing(cp.size());
-
-                    forAll (cp, faceI)
-                    {
-                        // Subtract one to take into account offsets for
-                        // face direction.
-                        reverseAddressing[faceI] =
-                            cp[faceI] - 1 - curPatchStart;
-                    }
-
-                    bouField[curBPatch].rmap
-                    (
-                        procField.boundaryField()[patchI],
-                        reverseAddressing
-                    );
-                }
-                else
-                {
-                    const Field<Type>& curProcPatch =
-                        procField.boundaryField()[patchI];
-
-                    // In processor patches, there's a mix of internal faces
-                    // (some of them turned) and possible cyclics. Slow loop
-                    forAll (cp, faceI)
-                    {
-                        label curF = cp[faceI] - 1;
-
-                        // Is the face turned the right side round
-                        if (curF >= 0)
-                        {
-                            // Is the face on the boundary?
-                            if (curF >= mesh_.nInternalFaces())
-                            {
-                                label curBPatch =
-                                    mesh_.boundaryMesh().whichPatch(curF);
-
-                                // Add the face
-                                label curPatchFace =
-                                    mesh_.boundaryMesh()
-                                    [curBPatch].whichFace(curF);
-
-                                bouField[curBPatch][curPatchFace] =
-                                    curProcPatch[faceI];
-                            }
-                            else
-                            {
-                                // Internal face
-                                iField[curF] = curProcPatch[faceI];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-
 template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
 Foam::fvFieldReconstructor::reconstructFvSurfaceField
@@ -517,7 +517,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
     );
 
     // Reconstruct field
-    reconstructFvSurfaceField
+    reconstructField
     (
         treconField(),
         procFields

From cca5743dee8fb881a899cd935a349c7f0a21b931 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Wed, 2 May 2018 10:21:53 +0100
Subject: [PATCH 29/45] Bugfix: filter empty processor patches

---
 .../decomposeTools/finiteVolume/decomposeMesh.C | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
index 9cc673e28..5509f91f0 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
@@ -566,9 +566,6 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                         procPatchSize_[ownerProc][patchI]++;
                     }
                 }
-                
-                // Processor patch.  Skip it
-                continue;
             }
 
             else if (isA<cyclicFvPatch>(patches[patchI]))
@@ -793,6 +790,8 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             }
         }
 
+        Pout<< "procPatchSize_: " << procPatchSize_ << endl;
+        
         // Face zone treatment.  HJ, 27/Mar/2009
         // Face zones identified as global will be present on all CPUs
         List<SLList<label> > procZoneFaceList(nProcs_);
@@ -1047,7 +1046,17 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 
         forAll (oldPatchSizes, patchI)
         {
-            if (!filterEmptyPatches || oldPatchSizes[patchI] > 0)
+            // If filterEmptyPatches is set to true, or a patch is a
+            // processor patch, remove it
+            if
+            (
+                (filterEmptyPatches || isA<processorFvPatch>(patches[patchI]))
+             && oldPatchSizes[patchI] == 0
+            )
+            {
+                // Patch filtered: do nothing
+            }
+            else
             {
                 curBoundaryAddressing[nPatches] = patchI;
 

From 4612194654f956eceb6e7afd60fd9e6460c95c83 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Wed, 2 May 2018 12:24:08 +0100
Subject: [PATCH 30/45] Remove debug print statetment

---
 .../reconstructTools/finiteVolume/sharedPoints.C                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C
index b707cb2b9..af30fb647 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C
@@ -127,7 +127,7 @@ Foam::labelListList Foam::sharedPoints::procPatchPairs() const
             }
         }
     }
-    Info<< "patch pairs: " << patchPairs << endl;
+
     return patchPairs;
 }
 

From 88787665202f7477e30014ea6f2d1aad1b0f458c Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Wed, 9 May 2018 12:54:34 +0100
Subject: [PATCH 31/45] Bugfix: work with polyPatches only

---
 .../finiteVolume/decomposeMesh.C              | 57 ++++++++++---------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
index 5509f91f0..b4f8e77be 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
@@ -36,8 +36,8 @@ Description
 #include "boolList.H"
 #include "cellList.H"
 #include "primitiveMesh.H"
-#include "processorFvPatch.H"
-#include "cyclicFvPatch.H"
+#include "processorPolyPatch.H"
+#include "cyclicPolyPatch.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -52,7 +52,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
     Info<< "\nCalculating original mesh data" << endl;
 
     // Set references to the original mesh
-    const fvBoundaryMesh& patches = mesh_.boundary();
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
     // Access all faces to grab the zones
     const faceList& allFaces = mesh_.allFaces();
@@ -171,18 +171,18 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             // Check the processor patch for which neighbour data exists
             if
             (
-                isA<processorFvPatch>(patches[patchI])
+                isA<processorPolyPatch>(patches[patchI])
              && !patchNbrCellToProc_[patchI].empty()
             )
             {
-                const processorFvPatch& procPatch =
-                    refCast<const processorFvPatch>(patches[patchI]);
+                const processorPolyPatch& procPatch =
+                    refCast<const processorPolyPatch>(patches[patchI]);
 
                 // DO ONLY SLAVE SIDE
                 if (!procPatch.master())
                 {
                     // Get patch start
-                    const label patchStart = patches[patchI].patch().start();
+                    const label patchStart = patches[patchI].start();
 
                     // Get faceCells
                     const labelList& fc = patches[patchI].faceCells();
@@ -208,10 +208,12 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                         //  the existing processor face and added afterwards
                         if (ownerProc != neighbourProc)
                         {
-                            Pout<< "Slave: New proc from old proc["
+                            Pout<< "Slave: New proc from old proc ["
                                 << patchFaceI
                                 << "]: " << ownerProc << " " << neighbourProc
                                 << " face: " << patchStart + patchFaceI
+                                << " C: "
+                                << mesh_.faceCentres()[patchStart + patchFaceI]
                                 << endl;
 
                             // Search algorithm repeated in processor patches.
@@ -355,7 +357,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                         }
 
                         if (!neighbourFound)
-                        { 
+                        {
                             // Owner found (slave proc boundary), but neighbour
                             // not found: add it
                             interProcBoundaries[neighbourProc].append
@@ -401,18 +403,18 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             // Check the processor patch for which neighbour data exists
             if
             (
-                isA<processorFvPatch>(patches[patchI])
+                isA<processorPolyPatch>(patches[patchI])
              && !patchNbrCellToProc_[patchI].empty()
             )
             {
-                const processorFvPatch& procPatch =
-                    refCast<const processorFvPatch>(patches[patchI]);
+                const processorPolyPatch& procPatch =
+                    refCast<const processorPolyPatch>(patches[patchI]);
 
                 // DO ONLY MASTER SIDE
                 if (procPatch.master())
                 {
                     // Get patch start
-                    const label patchStart = patches[patchI].patch().start();
+                    const label patchStart = patches[patchI].start();
 
                     // Get faceCells
                     const labelList& fc = patches[patchI].faceCells();
@@ -438,10 +440,13 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                         //  the existing processor face and added afterwards
                         if (ownerProc != neighbourProc)
                         {
-                            Pout<< "Master: New proc from old proc["
+                            Pout<< "Master: New proc from old proc ["
                                 << patchFaceI << "]: "
                                 << ownerProc << " " << neighbourProc
-                                << " face: " << patchStart + patchFaceI << endl;
+                                << " face: " << patchStart + patchFaceI
+                                << " C: "
+                                << mesh_.faceCentres()[patchStart + patchFaceI]
+                                << endl;
 
                             // Search algorithm repeated in processor patches.
                             // HJ, 11/Apr/2018
@@ -487,7 +492,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                             {
                                 // inter - processor boundaries do not exist and
                                 // need to be created
-                                
+
                                 // set the new addressing information
 
                                 // Add to owner only!
@@ -522,13 +527,13 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                     procFaceList[procI].size();
             }
 
-            const label patchStart = patches[patchI].patch().start();
+            const label patchStart = patches[patchI].start();
 
             // Do normal patches.  Note that processor patches
             // have already been partially done and need special treatment
             if
             (
-                isA<processorFvPatch>(patches[patchI])
+                isA<processorPolyPatch>(patches[patchI])
              && !patchNbrCellToProc_[patchI].empty()
             )
             {
@@ -567,12 +572,11 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                     }
                 }
             }
-
-            else if (isA<cyclicFvPatch>(patches[patchI]))
+            else if (isA<cyclicPolyPatch>(patches[patchI]))
             {
                 // Cyclic patch special treatment
 
-                const fvPatch& cPatch = patches[patchI];
+                const polyPatch& cPatch = patches[patchI];
 
                 const label cycOffset = cPatch.size()/2;
 
@@ -774,7 +778,6 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             {
                 // Normal patch. Add faces to processor where the cell
                 // next to the face lives
-
                 const unallocLabelList& fc = patches[patchI].faceCells();
 
                 forAll (fc, patchFaceI)
@@ -791,7 +794,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
         }
 
         Pout<< "procPatchSize_: " << procPatchSize_ << endl;
-        
+
         // Face zone treatment.  HJ, 27/Mar/2009
         // Face zones identified as global will be present on all CPUs
         List<SLList<label> > procZoneFaceList(nProcs_);
@@ -962,7 +965,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                 curSize = 0;
 
                 // Add faces for this processor boundary
-
+                Pout<< "Proc: " << procI << " Patch: " << nProcPatches << endl;
                 for
                 (
                     SLList<label>::iterator curFacesIter =
@@ -972,7 +975,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                 )
                 {
                     // Add the face
-
+                    Pout<< "Adding " << curFacesIter() << endl;
                     // Remember to increment the index by one such that the
                     // turning index works properly.  HJ, 5/Dec/2001
                     if (cellToProc_[owner[curFacesIter()]] == procI)
@@ -1020,6 +1023,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
     // are omitted. For processor patches, set index to -1.
     // At the same time, filter the procPatchSize_ and procPatchStartIndex_
     // lists to exclude zero-size patches
+
     forAll (procPatchSize_, procI)
     {
         // Make a local copy of old lists
@@ -1050,11 +1054,12 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             // processor patch, remove it
             if
             (
-                (filterEmptyPatches || isA<processorFvPatch>(patches[patchI]))
+                (filterEmptyPatches || isA<processorPolyPatch>(patches[patchI]))
              && oldPatchSizes[patchI] == 0
             )
             {
                 // Patch filtered: do nothing
+                Pout<< "Filtered patch " << patchI << endl;
             }
             else
             {

From 2877964cb64ff8dfbfd6fe09232e9272a92f7350 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Wed, 9 May 2018 12:55:16 +0100
Subject: [PATCH 32/45] Global face index handling in passive processor patches

---
 .../finiteVolume/domainDecomposition.C        | 22 ++++++++++++--
 .../finiteVolume/domainDecomposition.H        |  4 +++
 .../passiveProcessorPolyPatch.C               | 29 +++++++++++++++----
 .../passiveProcessorPolyPatch.H               | 12 +++++++-
 4 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
index a873dceb2..ed03b62eb 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.C
@@ -32,7 +32,6 @@ License
 #include "fvMesh.H"
 #include "OSspecific.H"
 #include "Map.H"
-#include "globalMeshData.H"
 #include "DynamicList.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -52,6 +51,7 @@ Foam::domainDecomposition::domainDecomposition
     decompositionDict_(dict),
     nProcs_(readInt(decompositionDict_.lookup("numberOfSubdomains"))),
     distributed_(false),
+    gfIndex_(mesh_),
     cellToProc_(mesh_.nCells()),
     patchNbrCellToProc_(mesh_.boundaryMesh().size()),
     procPointAddressing_(nProcs_),
@@ -269,8 +269,25 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
 
     if (createPassiveProcPatches)
     {
+        // Creation of passiveProcessor patches requires a global face index
+
+        // Get global index
+        const labelList& globalIndex = gfIndex_.globalLabel();
+
         forAll (curProcessorPatchSizes, procPatchI)
         {
+            // Assemble the global face index for all passive processor patch
+            // faces
+            labelList patchGlobalIndex(curProcessorPatchSizes[procPatchI]);
+
+            const label curPatchStart = curProcessorPatchStarts[procPatchI];
+
+            forAll (patchGlobalIndex, fI)
+            {
+                patchGlobalIndex[fI] =
+                    globalIndex[mag(curFaceLabels[curPatchStart + fI]) - 1];
+            }
+
             procPatches[nPatches] =
                 new passiveProcessorPolyPatch
                 (
@@ -282,7 +299,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::domainDecomposition::processorMesh
                     nPatches,
                     procMesh.boundaryMesh(),
                     procI,
-                    curNeighbourProcessors[procPatchI]
+                    curNeighbourProcessors[procPatchI],
+                    patchGlobalIndex
                 );
 
             nPatches++;
diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
index 88f1fb572..baa87b319 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H
@@ -42,6 +42,7 @@ SourceFiles
 #include "SLList.H"
 #include "PtrList.H"
 #include "point.H"
+#include "globalProcFaceIndex.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,6 +69,9 @@ class domainDecomposition
         //- Is the decomposition data to be distributed for each processor
         bool distributed_;
 
+        //- Global face index
+        globalProcFaceIndex gfIndex_;
+    
         //- Processor label for each cell
         labelList cellToProc_;
 
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.C b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.C
index 5c445eef1..60c0f8638 100644
--- a/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.C
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.C
@@ -60,13 +60,25 @@ Foam::passiveProcessorPolyPatch::passiveProcessorPolyPatch
     const label index,
     const polyBoundaryMesh& bm,
     const int myProcNo,
-    const int neighbProcNo
+    const int neighbProcNo,
+    const labelList& globalFaceIndex
 )
 :
     polyPatch(name, size, start, index, bm),
     myProcNo_(myProcNo),
-    neighbProcNo_(neighbProcNo)
-{}
+    neighbProcNo_(neighbProcNo),
+    globalFaceIndex_(globalFaceIndex)
+{
+    if (globalFaceIndex.size() != size)
+    {
+        FatalErrorIn
+        (
+            "passiveProcessorPolyPatch::passiveProcessorPolyPatch(...)"
+        )   << "Bad global index list.  Patch size: " << this->size()
+            << " global index size: " << globalFaceIndex.size()
+            << abort(FatalError);
+    }
+}
 
 
 Foam::passiveProcessorPolyPatch::passiveProcessorPolyPatch
@@ -79,7 +91,8 @@ Foam::passiveProcessorPolyPatch::passiveProcessorPolyPatch
 :
     polyPatch(name, dict, index, bm),
     myProcNo_(readLabel(dict.lookup("myProcNo"))),
-    neighbProcNo_(readLabel(dict.lookup("neighbProcNo")))
+    neighbProcNo_(readLabel(dict.lookup("neighbProcNo"))),
+    globalFaceIndex_(dict.lookup("globalFaceIndex"))
 {}
 
 
@@ -91,7 +104,8 @@ Foam::passiveProcessorPolyPatch::passiveProcessorPolyPatch
 :
     polyPatch(pp, bm),
     myProcNo_(pp.myProcNo_),
-    neighbProcNo_(pp.neighbProcNo_)
+    neighbProcNo_(pp.neighbProcNo_),
+    globalFaceIndex_(pp.size(), -1)
 {}
 
 
@@ -106,7 +120,8 @@ Foam::passiveProcessorPolyPatch::passiveProcessorPolyPatch
 :
     polyPatch(pp, bm, index, newSize, newStart),
     myProcNo_(pp.myProcNo_),
-    neighbProcNo_(pp.neighbProcNo_)
+    neighbProcNo_(pp.neighbProcNo_),
+    globalFaceIndex_(newSize, -1)  // Cannot set global index.  HJ, 4/May/2018
 {}
 
 
@@ -125,6 +140,8 @@ void Foam::passiveProcessorPolyPatch::write(Ostream& os) const
         << token::END_STATEMENT << nl;
     os.writeKeyword("neighbProcNo") << neighbProcNo_
         << token::END_STATEMENT << nl;
+
+    globalFaceIndex_.writeEntry("globalFaceIndex", os);
 }
 
 
diff --git a/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.H b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.H
index 134fe30e2..9818cf479 100644
--- a/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.H
+++ b/src/decompositionMethods/decomposeReconstruct/passivePatches/passiveProcessorPolyPatch/passiveProcessorPolyPatch.H
@@ -65,6 +65,9 @@ class passiveProcessorPolyPatch
         //- Neighbour processor number
         int neighbProcNo_;
 
+        //- Global processor face index
+        labelList globalFaceIndex_;
+
 
 public:
 
@@ -83,7 +86,8 @@ public:
             const label index,
             const polyBoundaryMesh& bm,
             const int myProcNo,
-            const int neighbProcNo
+            const int neighbProcNo,
+            const labelList& globalFaceIndex
         );
 
         //- Construct from dictionary
@@ -161,6 +165,12 @@ public:
             return neighbProcNo_;
         }
 
+        //- Return global processor face index
+        const labelList& globalFaceIndex() const
+        {
+            return globalFaceIndex_;
+        }
+
         //- Write the polyPatch data as a dictionary
         virtual void write(Ostream&) const;
 };

From c42052063338253ecca634be186a15cb9d8971dc Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Wed, 9 May 2018 13:43:23 +0100
Subject: [PATCH 33/45] Fixes for targeted insertion of reconstructed meshes in
 load balancing

---
 .../finiteVolume/processorMeshesRebuild.C     | 314 ++++++++++++++++--
 1 file changed, 283 insertions(+), 31 deletions(-)

diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
index 2f1aa34f2..3566c5644 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
@@ -26,6 +26,7 @@ License
 #include "processorMeshesReconstructor.H"
 #include "processorPolyPatch.H"
 #include "passiveProcessorPolyPatch.H"
+#include "SortableList.H"
 #include "sharedPoints.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -648,6 +649,127 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
     // on the same processor
     sharedPoints sharedData(meshes_);
 
+    // Before assembling the meshes, create unique ordering for all passive
+    // processor patches that will be merged.  HJ, 6/May/2018
+
+    // This list gives insert order for every passive processor patch in the
+    // boundary mesh of every processor mesh.
+    // The index gives the location in the reconstructed patch where the
+    // face should be inserted
+    // For other patch types, the list is empty
+    labelListListList passivePatchInsertOrder(meshes_.size());
+
+
+    // Memory management
+    {
+        // This list provides inser offset for the patch to unpack the list
+        labelListList passivePatchInsertOffset(meshes_.size());
+
+        // This list records all global indices from passive faces
+        // (from multiple proc meshes and patches) that will end up together
+        // It refers to the new patches
+        labelListList globalIndexPerNewProcPatch(reconPatchTypes.size());
+
+        forAll (meshes_, procI)
+        {
+            if (meshes_.set(procI))
+            {
+                const polyBoundaryMesh& procPatches =
+                    meshes_[procI].boundaryMesh();
+
+                passivePatchInsertOrder[procI].setSize(procPatches.size());
+                passivePatchInsertOffset[procI].setSize(procPatches.size());
+
+                forAll (procPatches, patchI)
+                {
+                    if (isA<passiveProcessorPolyPatch>(procPatches[patchI]))
+                    {
+                        const passiveProcessorPolyPatch& curPatch =
+                            refCast<const passiveProcessorPolyPatch>
+                            (
+                                procPatches[patchI]
+                            );
+
+                        // Find new patch index in reconstructed boundary
+                        const label pnIndex = patchNameLookup.find
+                            (curPatch.name())();
+
+                        // Record offset
+                        passivePatchInsertOffset[procI][patchI] =
+                            globalIndexPerNewProcPatch[pnIndex].size();
+
+                        // Set or append the global index
+                        globalIndexPerNewProcPatch[pnIndex].append
+                        (
+                            curPatch.globalFaceIndex()
+                        );
+                    }
+                }
+            }
+        }
+
+        // Now all indices and offsets are collected.
+        // Sort each individual list and get sorted index order
+        // Note: this refers to the new patch
+        forAll (globalIndexPerNewProcPatch, newPatchI)
+        {
+            if (!globalIndexPerNewProcPatch[newPatchI].empty())
+            {
+                SortableList<label> sLabels
+                (
+                    globalIndexPerNewProcPatch[newPatchI]
+                );
+
+                // Note: on sort, indices are done the wrong way around:
+                // old index for new location: Re-pack them
+                const labelList& indices = sLabels.indices();
+
+                // Re-use the storage for the insertion index
+                labelList& invIndices = globalIndexPerNewProcPatch[newPatchI];
+
+                forAll (invIndices, i)
+                {
+                    invIndices[indices[i]] = i;
+                }
+            }
+        }
+
+        // Unpack the list for insertion
+        forAll (meshes_, procI)
+        {
+            if (meshes_.set(procI))
+            {
+                const polyBoundaryMesh& procPatches =
+                    meshes_[procI].boundaryMesh();
+
+                forAll (procPatches, patchI)
+                {
+                    if (isA<passiveProcessorPolyPatch>(procPatches[patchI]))
+                    {
+                        const passiveProcessorPolyPatch& curPatch =
+                            refCast<const passiveProcessorPolyPatch>
+                            (
+                                procPatches[patchI]
+                            );
+
+                        // Find new patch index in reconstructed boundary
+                        const label pnIndex = patchNameLookup.find
+                            (curPatch.name())();
+
+                        // Collect offset
+                        passivePatchInsertOrder[procI][patchI] =
+                            labelList::subList
+                            (
+                                globalIndexPerNewProcPatch[pnIndex],
+                                curPatch.size(),
+                                passivePatchInsertOffset[procI][patchI]
+                            );
+                    }
+                }
+            }
+        }
+    }
+
     // Dump first valid mesh without checking
     {
         const label fvmId = firstValidMesh();
@@ -706,7 +828,8 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         }
 
         // Go through all patches.  For regular patches
-        // dump the faces into patch lists
+        // dump the faces into patch lists and for processor make internal faces
+
         const polyBoundaryMesh& procPatches = curMesh.boundaryMesh();
 
         forAll (procPatches, patchI)
@@ -714,16 +837,18 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
             if (isA<processorPolyPatch>(procPatches[patchI]))
             {
                 // Processor patch: faces become internal faces
-                const processorPolyPatch& procPatch =
+                const processorPolyPatch& curPatch =
                     refCast<const processorPolyPatch>(procPatches[patchI]);
 
                 // Record boundary-processor addressing: unmapped patch
                 bpAddr[patchI] = -1;
 
+                const label patchStart = curPatch.start();
+
                 for
                 (
-                    label faceI = procPatch.start();
-                    faceI < procPatch.start() + procPatch.size();
+                    label faceI = patchStart;
+                    faceI < patchStart + curPatch.size();
                     faceI++
                 )
                 {
@@ -743,6 +868,56 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                     nReconFaces++;
                 }
             }
+            else if (isA<passiveProcessorPolyPatch>(procPatches[patchI]))
+            {
+                // For passive processor patch, faces need to be inserted in
+                // the increasing global face index
+                const passiveProcessorPolyPatch& curPatch =
+                    refCast<const passiveProcessorPolyPatch>
+                    (
+                        procPatches[patchI]
+                    );
+
+                // Find processor patch index in reconstructed boundary
+                const label pnIndex = patchNameLookup.find(curPatch.name())();
+
+                // Record boundary-processor addressing: mapped patch
+                bpAddr[patchI] = pnIndex;
+
+                faceList& curRpFaces = reconPatchFaces[pnIndex];
+                labelList& curRpfOwner = reconPatchOwner[pnIndex];
+                label& nRpf = reconPatchSizes[pnIndex];
+
+                const labelList& indices =
+                    passivePatchInsertOrder[fvmId][patchI];
+
+                const label patchStart = curPatch.start();
+
+                forAll (indices, i)
+                {
+                    // Location in reconstructed patch where the face
+                    // is inserted
+                    const label insertSlot = indices[i];
+
+                    // Calculate face index depending on the ordering
+                    const label faceI = patchStart + i;
+
+                    face newFace = curFaces[faceI];
+
+                    inplaceRenumber(ppAddr, newFace);
+
+                    // Insert into correct slot
+                    curRpFaces[insertSlot] = newFace;
+                    curRpfOwner[insertSlot] = curOwner[faceI];//+cellOffset[firstValidMesh()];
+
+                    // Temporarily record position of face in the patch.
+                    // Offset for nInternalFaces will be added in the end
+                    // when the complete list of faces is assembled
+                    // HJ, 16/Feb/2011
+                    fpAddr[faceI] = insertSlot + 1;
+                    nRpf++;
+                }
+            }
             else
             {
                 // Regular patch: dump faces into patch face list
@@ -759,10 +934,12 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                 labelList& curRpfOwner = reconPatchOwner[pnIndex];
                 label& nRpf = reconPatchSizes[pnIndex];
 
+                const label patchStart = curPatch.start();
+
                 for
                 (
-                    label faceI = curPatch.start();
-                    faceI < curPatch.start() + curPatch.size();
+                    label faceI = patchStart;
+                    faceI < patchStart + curPatch.size();
                     faceI++
                 )
                 {
@@ -788,20 +965,22 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         {
             cpAddr[cellI] = cellI; // + cellOffset[firstValidMesh()];
         }
+
+        // Set cell offset for the next mesh
+        if (cellOffset.size() > firstValidMesh() + 1)
+        {
+            cellOffset[firstValidMesh() + 1] = meshes_[firstValidMesh()].nCells();
+        }
     }
 
 
     // Dump all other meshes, merging the processor boundaries
 
-    for (label procI = 1; procI < meshes_.size(); procI++)
+    for (label procI = firstValidMesh() + 1; procI < meshes_.size(); procI++)
     {
-        // Grab cell offset from previous offset and mesh size
-        cellOffset[procI] =
-            cellOffset[procI - 1] + meshes_[procI - 1].nCells();
-
         if (meshes_.set(procI))
         {
-            Pout<< "Dump mesh " << procI << endl;
+            Pout<< "Dump mesh " << procI << " cell offset: " << cellOffset[procI] << endl;
 
             const polyMesh& curMesh = meshes_[procI];
             const polyBoundaryMesh& procPatches = curMesh.boundaryMesh();
@@ -968,20 +1147,22 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                 if (isA<processorPolyPatch>(procPatches[patchI]))
                 {
                     // Processor patch: faces become internal faces
-                    const processorPolyPatch& procPatch =
+                    const processorPolyPatch& curPatch =
                         refCast<const processorPolyPatch>(procPatches[patchI]);
 
                     // Record boundary-processor addressing: unmapped patch
                     bpAddr[patchI] = -1;
 
+                    const label patchStart = curPatch.start();
+
                     // If patch is a master, drop the faces and fill the
                     // owner side addressing
-                    if (procPatch.master())
+                    if (curPatch.master())
                     {
                         for
                         (
-                            label faceI = procPatch.start();
-                            faceI < procPatch.start() + procPatch.size();
+                            label faceI = patchStart;
+                            faceI < patchStart + curPatch.size();
                             faceI++
                         )
                         {
@@ -1005,16 +1186,16 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                     {
                         // Fill the addressing for the neighbour side
 
-                        const label masterProcID = procPatch.neighbProcNo();
+                        const label masterProcID = curPatch.neighbProcNo();
 
                         // Get local face-cell addressing: it will become
                         // a neighbour
                         // addressing for the already inserted faces
-                        const labelList procFaceCells = procPatch.faceCells();
+                        const labelList procFaceCells = curPatch.faceCells();
 
                         // Get the neighbour side patch
                         const processorPolyPatch& masterProcPatch =
-                            neighbourProcPatch(procPatch);
+                            neighbourProcPatch(curPatch);
 
                         // Find the addressing of the master side
                         // and insert the neighbour with offset
@@ -1024,12 +1205,12 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
                         for
                         (
-                            label faceI = procPatch.start();
-                            faceI < procPatch.start() + procPatch.size();
+                            label faceI = patchStart;
+                            faceI < patchStart + curPatch.size();
                             faceI++
                         )
                         {
-                            label faceInPatch = faceI - procPatch.start();
+                            label faceInPatch = faceI - patchStart;
 
                             // Calculate master index
                             label masterIndex = masterProcPatch.start()
@@ -1045,14 +1226,19 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                         }
                     }
                 }
-                else
+                else if (isA<passiveProcessorPolyPatch>(procPatches[patchI]))
                 {
-                    // Regular patch: dump faces into patch face list
-
-                    const polyPatch& curPatch = procPatches[patchI];
+                    // For passive processor patch, faces need to be inserted in
+                    // the increasing global face index
+                    const passiveProcessorPolyPatch& curPatch =
+                        refCast<const passiveProcessorPolyPatch>
+                        (
+                            procPatches[patchI]
+                        );
 
                     // Find processor patch index in reconstructed boundary
-                    const label pnIndex = patchNameLookup.find(curPatch.name())();
+                    const label pnIndex =
+                        patchNameLookup.find(curPatch.name())();
 
                     // Record boundary-processor addressing: mapped patch
                     bpAddr[patchI] = pnIndex;
@@ -1061,10 +1247,60 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                     labelList& curRpfOwner = reconPatchOwner[pnIndex];
                     label& nRpf = reconPatchSizes[pnIndex];
 
+                    const labelList& indices =
+                        passivePatchInsertOrder[procI][patchI];
+
+                    const label patchStart = curPatch.start();
+
+                    forAll (indices, i)
+                    {
+                        // Location in reconstructed patch where the face
+                        // is inserted
+                        const label insertSlot = indices[i];
+
+                        // Calculate face index depending on the ordering
+                        const label faceI = patchStart + i;
+
+                        face newFace = curFaces[faceI];
+
+                        inplaceRenumber(ppAddr, newFace);
+
+                        // Insert into correct slot
+                        curRpFaces[insertSlot] = newFace;
+                        curRpfOwner[insertSlot] =
+                            curOwner[faceI] + cellOffset[procI];
+
+                        // Temporarily record position of face in the patch.
+                        // Offset for nInternalFaces will be added in the end
+                        // when the complete list of faces is assembled
+                        // HJ, 16/Feb/2011
+                        fpAddr[faceI] = insertSlot + 1;
+                        nRpf++;
+                    }
+                }
+                else
+                {
+                    // Regular patch: dump faces into patch face list
+
+                    const polyPatch& curPatch = procPatches[patchI];
+
+                    // Find processor patch index in reconstructed boundary
+                    const label pnIndex =
+                        patchNameLookup.find(curPatch.name())();
+
+                    // Record boundary-processor addressing: mapped patch
+                    bpAddr[patchI] = pnIndex;
+
+                    faceList& curRpFaces = reconPatchFaces[pnIndex];
+                    labelList& curRpfOwner = reconPatchOwner[pnIndex];
+                    label& nRpf = reconPatchSizes[pnIndex];
+
+                    const label patchStart = curPatch.start();
+
                     for
                     (
-                        label faceI = curPatch.start();
-                        faceI < curPatch.start() + curPatch.size();
+                        label faceI = patchStart;
+                        faceI < patchStart + curPatch.size();
                         faceI++
                     )
                     {
@@ -1090,6 +1326,20 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
             {
                 cpAddr[cellI] = cellI + cellOffset[procI];
             }
+
+            // Set cell offset for the next mesh
+            if (cellOffset.size() > procI + 1)
+            {
+                cellOffset[procI + 1] = cellOffset[procI] + meshes_[procI].nCells();
+            }
+        }
+        else
+        {
+            // No valid mesh.  Propagate cell offset
+            if (cellOffset.size() > procI + 1)
+            {
+                cellOffset[procI + 1] = cellOffset[procI];
+            }
         }
     }
 
@@ -1168,10 +1418,12 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
 
                         const polyPatch& curPatch = procPatches[patchI];
 
+                        const label patchStart = curPatch.start();
+
                         for
                         (
-                            label faceI = curPatch.start();
-                            faceI < curPatch.start() + curPatch.size();
+                            label faceI = patchStart;
+                            faceI < patchStart + curPatch.size();
                             faceI++
                         )
                         {

From 20e6a816a2aadbf3d07158e6bde3ff0fdf86571f Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 10 May 2018 09:57:03 +0100
Subject: [PATCH 34/45] Bugfix: Added missing reduce in mesh quality checks

---
 .../primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/foam/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/foam/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 409058c55..3c03f752e 100644
--- a/src/foam/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/foam/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -165,6 +165,8 @@ bool Foam::primitiveMesh::checkClosedCells
         }
     }
 
+    reduce(nErrorClosed, sumOp<label>());
+    
     if (nErrorClosed > 0)
     {
         if (debug || report)
@@ -197,6 +199,8 @@ bool Foam::primitiveMesh::checkClosedCells
         }
     }
 
+    reduce(nErrorOwnNei, sumOp<label>());
+
     if (nErrorOwnNei > 0)
     {
         if (debug || report)

From 31adfb3200ff8c0e4d1e4d7c7e77a18f39bdd05f Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 10 May 2018 09:57:13 +0100
Subject: [PATCH 35/45] Added globalProcFaceIndex

---
 src/foam/Make/files                           |   1 +
 .../polyMesh/globalMeshData/globalIndex.H     |   7 +-
 .../polyMesh/globalMeshData/globalPoints.H    |   1 -
 .../globalMeshData/globalProcFaceIndex.C      | 190 ++++++++++++++++++
 .../globalMeshData/globalProcFaceIndex.H      | 140 +++++++++++++
 5 files changed, 332 insertions(+), 7 deletions(-)
 create mode 100644 src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.C
 create mode 100644 src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.H

diff --git a/src/foam/Make/files b/src/foam/Make/files
index 70a89b2f0..5efa24b53 100644
--- a/src/foam/Make/files
+++ b/src/foam/Make/files
@@ -427,6 +427,7 @@ globalMeshData = $(polyMesh)/globalMeshData
 $(globalMeshData)/globalMeshData.C
 $(globalMeshData)/globalPoints.C
 $(globalMeshData)/globalIndex.C
+$(globalMeshData)/globalProcFaceIndex.C
 
 $(polyMesh)/syncTools/syncTools.C
 
diff --git a/src/foam/meshes/polyMesh/globalMeshData/globalIndex.H b/src/foam/meshes/polyMesh/globalMeshData/globalIndex.H
index 157b47302..0fb1f227a 100644
--- a/src/foam/meshes/polyMesh/globalMeshData/globalIndex.H
+++ b/src/foam/meshes/polyMesh/globalMeshData/globalIndex.H
@@ -31,7 +31,6 @@ Description
     globalIndex globalFaces(mesh.nFaces());
     label globalFaceI = globalFaces.toGlobal(faceI);
 
-
 SourceFiles
     globalIndex.C
 
@@ -63,7 +62,7 @@ class globalIndex
 {
     // Private data
 
-        //- Start off procI + 1. (so like CompactListList)
+        //- Processor offsets
         labelList offsets_;
 
 
@@ -83,10 +82,6 @@ public:
 
     // Member Functions
 
-        ////- Start of procI+1 data
-        //inline const labelList& offsets() const;
-
-
         // Queries relating to my processor
 
             //- my local size
diff --git a/src/foam/meshes/polyMesh/globalMeshData/globalPoints.H b/src/foam/meshes/polyMesh/globalMeshData/globalPoints.H
index adbbce91a..70253c4f4 100644
--- a/src/foam/meshes/polyMesh/globalMeshData/globalPoints.H
+++ b/src/foam/meshes/polyMesh/globalMeshData/globalPoints.H
@@ -83,7 +83,6 @@ Description
         - mark indices for which information has changed
      endloop until nothing changes.
 
-
 SourceFiles
     globalPoints.C
 
diff --git a/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.C b/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.C
new file mode 100644
index 000000000..9efcefea0
--- /dev/null
+++ b/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.C
@@ -0,0 +1,190 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "globalProcFaceIndex.H"
+#include "processorPolyPatch.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::globalProcFaceIndex::calcFaceIndex()
+{
+    // Count number of unique faces on this processor
+    nUniqueFaces_[Pstream::myProcNo()] = mesh_.nInternalFaces();
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // Assing unique face label to all master processor faces
+
+    // Count faces and processor faces per processor
+    forAll (patches, patchI)
+    {
+        // Only skip slave processor patches
+        if (isA<processorPolyPatch>(patches[patchI]))
+        {
+            const processorPolyPatch& procPatch =
+                refCast<const processorPolyPatch>(patches[patchI]);
+
+            if (procPatch.master())
+            {
+                // Found unique faces
+                nUniqueFaces_[Pstream::myProcNo()] += procPatch.size();
+            }
+            // else Slave processor patch.  Skip it
+        }
+        else
+        {
+            // Regular patch.  Add faces to count
+            nUniqueFaces_[Pstream::myProcNo()] += patches[patchI].size();
+        }
+    }
+
+    // Gather data to master processor
+    Pstream::gatherList(nUniqueFaces_);
+    Pstream::scatterList(nUniqueFaces_);
+
+    // Adjust all lists to calculate offsets on the master processor only
+    if (Pstream::master())
+    {
+        for (label procI = 1; procI < procFaceOffset_.size(); procI++)
+        {
+            // Number of unique faces for this processor is equal to the number
+            // of faces on previous processor + number of local unique faces
+            procFaceOffset_[procI] =
+                procFaceOffset_[procI - 1] + nUniqueFaces_[procI - 1];
+        }
+    }
+
+    // Scatter offset data to all processors
+    Pstream::scatter(procFaceOffset_);
+
+    // Assemble global label list for mesh faces
+    label globalFaceIndex = procFaceOffset_[Pstream::myProcNo()];
+    
+    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+    {
+        globalLabel_[faceI] = globalFaceIndex;
+        globalFaceIndex++;
+    }
+
+    // Assign and send from master
+    forAll (patches, patchI)
+    {
+        const label patchSize = patches[patchI].size();
+        const label patchStart = patches[patchI].start();
+        
+        if (isA<processorPolyPatch>(patches[patchI]))
+        {
+            const processorPolyPatch& procPatch =
+                refCast<const processorPolyPatch>(patches[patchI]);
+
+            if (procPatch.master())
+            {
+                // Master processor patch: assign face index
+                for
+                (
+                    label patchFaceI = patchStart;
+                    patchFaceI < patchStart + patchSize;
+                    patchFaceI++
+                )
+                {
+                    globalLabel_[patchFaceI] = globalFaceIndex;
+                    globalFaceIndex++;
+                }
+
+                // Make a slice and send it
+                labelList curFaceLabels(procPatch.patchSlice(globalLabel_));
+
+                OPstream toProc
+                (
+                    Pstream::nonBlocking,
+                    procPatch.neighbProcNo()
+                );
+                toProc<< curFaceLabels;
+            }
+        }
+        else
+        {
+            // Regular patch: assign face index
+            for
+            (
+                label patchFaceI = patchStart;
+                patchFaceI < patchStart + patchSize;
+                patchFaceI++
+            )
+            {
+                globalLabel_[patchFaceI] = globalFaceIndex;
+                globalFaceIndex++;
+            }
+        }
+    }
+
+    // Receive on slave
+    forAll (patches, patchI)
+    {
+        if (isA<processorPolyPatch>(patches[patchI]))
+        {
+            const processorPolyPatch& procPatch =
+                refCast<const processorPolyPatch>(patches[patchI]);
+
+            if (!procPatch.master())
+            {
+                // Slave processor patch
+                // Receive the data from master and insert into the list
+                IPstream fromProc
+                (
+                    Pstream::nonBlocking,
+                    procPatch.neighbProcNo()
+                );
+
+                labelList masterFaceLabels(fromProc);
+
+                // Insert the data into the list
+                const label patchStart = patches[patchI].start();
+        
+                forAll (masterFaceLabels, patchFaceI)
+                {
+                    globalLabel_[patchStart + patchFaceI] =
+                        masterFaceLabels[patchFaceI];
+                }
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::globalProcFaceIndex::globalProcFaceIndex(const polyMesh& mesh)
+:
+    mesh_(mesh),
+    nUniqueFaces_(Pstream::nProcs(), 0),
+    procFaceOffset_(Pstream::nProcs(), 0),
+    globalLabel_(mesh_.nFaces())
+{
+    calcFaceIndex();
+}
+
+
+// ************************************************************************* //
diff --git a/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.H b/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.H
new file mode 100644
index 000000000..11bdd0796
--- /dev/null
+++ b/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::globalProcFaceIndex
+
+Description
+    The class creates a unique global face index for each processor face (pair)
+    in the mesh.  Master and slave processor face carry the same index.
+
+    The data is presented as a labelListList, which is set only for
+    processor patches.
+
+    Face offsets counts a number of unique faces on each processor,
+    excluding slave processor patch faces, which are given master face index.
+    If needed, global face indes from all faces can be derived from this data
+
+    Currently, faces are ordered with internal faces first, followed by patch
+    faces in patch order, excluding slave processor patches.
+    If needed, this can be changed to group processor faces with internal faces
+    to facilitate parallel I/O.  HJ, 4/May/2018
+
+Author
+    Hrvoje Jasak, Wikki Ltd.
+
+SourceFiles
+    globalProcFaceIndex.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef globalProcFaceIndex_H
+#define globalProcFaceIndex_H
+
+#include "polyMesh.H"
+#include "labelList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+
+/*---------------------------------------------------------------------------*\
+                      Class globalProcFaceIndex Declaration
+\*---------------------------------------------------------------------------*/
+
+class globalProcFaceIndex
+{
+    // Private data
+
+        //- Mesh reference
+        const polyMesh& mesh_;
+
+        //- Number of unique faces per processor
+        labelList nUniqueFaces_;
+
+        //- Processor face index offset
+        labelList procFaceOffset_;
+
+        //- Global face label for all faces of current mesh
+        //  Sized to number of live faces in the mesh
+        labelList globalLabel_;
+
+    
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        globalProcFaceIndex(const globalProcFaceIndex&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const globalProcFaceIndex&);
+
+        //- Calculate face index
+        void calcFaceIndex();
+
+
+public:
+
+    // Constructors
+
+        //- Construct from mesh
+        globalProcFaceIndex(const polyMesh&);
+
+
+    //- Destructor - default
+
+
+    // Member Functions
+
+        //- Return number of unique faces per processor
+        inline const labelList& nUniqueFaces() const
+        {
+            return nUniqueFaces_;
+        }
+
+        //- Return face index offset per processor
+        inline const labelList& procFaceOffset() const
+        {
+            return procFaceOffset_;
+        }
+
+        //- Return lobal face label for all faces of current mesh
+        //  Sized to number of live faces in the mesh
+        const labelList globalLabel() const
+        {
+            return globalLabel_;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From c1f86cba2dc7c70df53337423468b01e096aa467 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 11 May 2018 18:30:54 +0100
Subject: [PATCH 36/45] Remove print statements

---
 .../finiteVolume/decomposeMesh.C              | 27 +++----------------
 .../finiteVolume/processorMeshesRebuild.C     |  7 -----
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
index b4f8e77be..cd18e035f 100644
--- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
+++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/decomposeMesh.C
@@ -208,14 +208,6 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                         //  the existing processor face and added afterwards
                         if (ownerProc != neighbourProc)
                         {
-                            Pout<< "Slave: New proc from old proc ["
-                                << patchFaceI
-                                << "]: " << ownerProc << " " << neighbourProc
-                                << " face: " << patchStart + patchFaceI
-                                << " C: "
-                                << mesh_.faceCentres()[patchStart + patchFaceI]
-                                << endl;
-
                             // Search algorithm repeated in processor patches.
                             // HJ, 11/Apr/2018
                             SLList<label>::iterator curInterProcBdrsOwnIter =
@@ -440,14 +432,6 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                         //  the existing processor face and added afterwards
                         if (ownerProc != neighbourProc)
                         {
-                            Pout<< "Master: New proc from old proc ["
-                                << patchFaceI << "]: "
-                                << ownerProc << " " << neighbourProc
-                                << " face: " << patchStart + patchFaceI
-                                << " C: "
-                                << mesh_.faceCentres()[patchStart + patchFaceI]
-                                << endl;
-
                             // Search algorithm repeated in processor patches.
                             // HJ, 11/Apr/2018
                             SLList<label>::iterator curInterProcBdrsOwnIter =
@@ -564,9 +548,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                     {
                         // Add the face
                         procFaceList[ownerProc].append(patchStart + patchFaceI);
-                        Pout<< "Add proc face to proc patch.  Face "
-                            << patchStart + patchFaceI
-                            << endl;
+
                         // Increment the number of faces for this patch
                         procPatchSize_[ownerProc][patchI]++;
                     }
@@ -793,8 +775,6 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             }
         }
 
-        Pout<< "procPatchSize_: " << procPatchSize_ << endl;
-
         // Face zone treatment.  HJ, 27/Mar/2009
         // Face zones identified as global will be present on all CPUs
         List<SLList<label> > procZoneFaceList(nProcs_);
@@ -965,7 +945,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                 curSize = 0;
 
                 // Add faces for this processor boundary
-                Pout<< "Proc: " << procI << " Patch: " << nProcPatches << endl;
+
                 for
                 (
                     SLList<label>::iterator curFacesIter =
@@ -975,7 +955,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
                 )
                 {
                     // Add the face
-                    Pout<< "Adding " << curFacesIter() << endl;
+
                     // Remember to increment the index by one such that the
                     // turning index works properly.  HJ, 5/Dec/2001
                     if (cellToProc_[owner[curFacesIter()]] == procI)
@@ -1059,7 +1039,6 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
             )
             {
                 // Patch filtered: do nothing
-                Pout<< "Filtered patch " << patchI << endl;
             }
             else
             {
diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
index 3566c5644..a5ed04ee3 100644
--- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
+++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C
@@ -526,13 +526,6 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
         }
     }
 
-    Pout<< "Estimated max global mesh size (with duplicates): " << nl
-        << "    nPoints = " << nReconPoints << nl
-        << "    nFaces = " << nReconFaces << nl
-        << "    nCells = " << nReconCells << nl
-        << "    nPatches = " << nReconPatches << nl
-        << "    nPatchFaces = " << reconPatchSizes << endl;
-
     // Note: for easier debugging, set mapping, owner and neighbour to -1
     pointField reconPoints(nReconPoints);
     labelList globalPointMapping(nReconPoints, -1);

From a4617cca013ecd352264de9e3b550dd87cb8e750 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 11 May 2018 18:32:37 +0100
Subject: [PATCH 37/45] Refactoring of load balance: move function into
 topoChangerFvMesh

---
 src/dynamicMesh/loadBalanceFvMesh/Make/files  |   1 -
 .../loadBalanceFvMesh/Make/options            |  12 +-
 .../dynamicMeshLoadBalance.C                  | 288 ---------
 .../dynamicMeshLoadBalance.H                  | 145 -----
 .../loadBalanceFvMesh/loadBalanceFvMesh.C     | 586 +----------------
 .../loadBalanceFvMesh/loadBalanceFvMesh.H     |  50 +-
 src/dynamicMesh/topoChangerFvMesh/Make/files  |   1 +
 .../topoChangerFvMesh/Make/options            |   2 +
 .../topoChangerFvMesh/topoChangerFvMesh.H     |  58 +-
 .../topoChangerFvMeshLoadBalance.C            | 602 ++++++++++++++++++
 .../topoChangerFvMeshLoadBalanceTemplates.C}  |  20 +-
 11 files changed, 690 insertions(+), 1075 deletions(-)
 delete mode 100644 src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.C
 delete mode 100644 src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.H
 create mode 100644 src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalance.C
 rename src/dynamicMesh/{loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMeshTemplates.C => topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalanceTemplates.C} (94%)

diff --git a/src/dynamicMesh/loadBalanceFvMesh/Make/files b/src/dynamicMesh/loadBalanceFvMesh/Make/files
index c894e9601..f88f95e2c 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/Make/files
+++ b/src/dynamicMesh/loadBalanceFvMesh/Make/files
@@ -1,4 +1,3 @@
-dynamicMeshLoadBalance/dynamicMeshLoadBalance.C
 loadBalanceFvMesh/loadBalanceFvMesh.C
 
 LIB = $(FOAM_LIBBIN)/libloadBalanceFvMesh
diff --git a/src/dynamicMesh/loadBalanceFvMesh/Make/options b/src/dynamicMesh/loadBalanceFvMesh/Make/options
index f0e511327..d0f6118b4 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/Make/options
+++ b/src/dynamicMesh/loadBalanceFvMesh/Make/options
@@ -1,11 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/decompositionMethods/decomposeReconstruct/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/topoChangerFvMesh/lnInclude \
+    -I$(LIB_SRC)/decompositionMethods/decomposeReconstruct/lnInclude
 
-LIB_LIBS =  \
-    -ldecomposeReconstruct\
+LIB_LIBS = \
     -lfiniteVolume \
     -ldynamicMesh \
-    -ldynamicFvMesh
+    -ldynamicFvMesh \
+    -ltopoChangerFvMesh \
+    -ldecomposeReconstruct
diff --git a/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.C b/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.C
deleted file mode 100644
index 8ce1a1500..000000000
--- a/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.C
+++ /dev/null
@@ -1,288 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "dynamicMeshLoadBalance.H"
-#include "volFields.H"
-
-#include "domainDecomposition.H"
-#include "fvFieldDecomposer.H"
-
-#include "processorMeshesReconstructor.H"
-#include "fvFieldReconstructor.H"
-#include "mapPolyMesh.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// namespace Foam
-// {
-//     defineTypeNameAndDebug(dynamicMeshLoadBalance, 0);
-
-//     addToRunTimeSelectionTable
-//     (
-//         topoChangerFvMesh,
-//         dynamicFvMesh,
-//         IOobject
-//     );
-// }
-
-
-
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::dynamicMeshLoadBalance::dynamicMeshLoadBalance(dynamicFvMesh& mesh)
-:
-    mesh_(mesh),
-    dict_
-    (
-        IOdictionary
-        (
-            IOobject
-            (
-                "decomposeParDict",
-                mesh_.time().system(),
-                mesh_,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE,
-                false
-            )
-        )
-    ),
-    imbalanceTrigger_(readScalar(dict_.lookup("imbalanceTrigger")))
-{
-    // Check imbalance trigger
-    if (imbalanceTrigger_ < SMALL || imbalanceTrigger_ > 1)
-    {
-        WarningIn
-        (
-            "dynamicMeshLoadBalance::"
-            "dynamicMeshLoadBalance(dynamicFvMesh& mesh)"
-        )   << "Invalid imbalance trigger " << imbalanceTrigger_
-            << " Should be between 0 and 1.  Resetting to 0.8"
-            << endl;
-
-        imbalanceTrigger_ = 0.8;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::dynamicMeshLoadBalance::~dynamicMeshLoadBalance()
-{}
-
-
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::mapPolyMesh>
-Foam::dynamicMeshLoadBalance::updateMesh() const
-{
-    Info<< "Hello from dynamicMeshLoadBalance::updateMesh()" << endl;
-    
-    // Create a parallel decomposition
-    domainDecomposition meshDecomp
-    (
-        mesh_,
-        dict_
-    );
-
-    // Decompose the mesh based on processor data
-    meshDecomp.decomposeMesh(false);
-
-    // Analyse mesh decomposition to see how many cells are passed to which processor
-    labelListList migratedCells(meshDecomp.nProcs());
-
-    // Fill local list with number of local cells to be sent to each processor
-    // First index = my processor.  Second index = processor to send to
-    labelList& curMigratedCells = migratedCells[Pstream::myProcNo()];
-
-    curMigratedCells.setSize(Pstream::myProcNo(), 0);
-
-    const labelList& cellToProc = meshDecomp.cellToProc();
-
-    forAll (cellToProc, cellI)
-    {
-        curMigratedCells[cellToProc[cellI]]++;
-    }
-
-    // Now that each processor has filled in its own part, combine the data
-    Pstream::gatherList(migratedCells);
-    Pstream::scatterList(migratedCells);
-
-    // Reading through second index now tells how many cells will arrive
-    // from which processor
-
-
-    // Split the mesh and fields over processors and send
-    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
-    {
-        if (procI != Pstream::myProcNo())
-        {
-            Info<< "Processor " << procI << ": send mesh and fields"
-                << endl;
-
-            // Check if there is a mesh to send
-            if (curMigratedCells[procI] > 0)
-            {
-                // Send mesh and field to processor procI
-
-                // Get mesh from decomposition
-                autoPtr<fvMesh> procMeshPtr = meshDecomp.processorMesh
-                (
-                    procI,
-                    mesh_.time(),
-                    "processorPart" + name(procI)
-                );
-                fvMesh& procMesh = procMeshPtr();
-
-                // Create a field decomposer
-                fvFieldDecomposer fieldDecomposer
-                (
-                    mesh_,
-                    procMesh,
-                    meshDecomp.procFaceAddressing()[procI],
-                    meshDecomp.procCellAddressing()[procI],
-                    meshDecomp.procBoundaryAddressing()[procI]
-                );
-/*
-                // Simple test only: rebalance volScalarFields
-                HashTable<const volScalarField*> volScalarFields =
-                    mesh_.thisDb().lookupClass<volScalarField>();
-
-                for
-                (
-                    HashTable<const volScalarField*>::const_iterator iter =
-                        volScalarFields.begin();
-                    iter != volScalarFields.end();
-                    ++iter
-                )
-                {
-                    fieldDecomposer.decomposeField(*(iter()));
-                }
-*/
-
-                // Note: communication can be optimised.  HJ, 27/Feb/2018
-                OPstream toProc
-                (
-                    Pstream::nonBlocking,
-                    procI
-                );
-
-                // Send the mesh and fields to target processor
-                toProc << procMesh;
-            }
-        }
-    }
-
-
-    // Collect pieces of mesh and fields from other processors
-
-    // Create a list of processor meshes
-    // Create the reconstructor
-    processorMeshesReconstructor meshRecon("reconstructed");
-
-    PtrList<fvMesh>& procMeshes = meshRecon.meshes();
-    procMeshes.setSize(meshDecomp.nProcs());
-
-    List<PtrList<volScalarField*> > receiveVolScalarFields
-    (
-        meshDecomp.nProcs()
-    );
-
-    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
-    {
-        if (procI != Pstream::myProcNo())
-        {
-            // Check if there is a mesh to send
-            if (migratedCells[procI][Pstream::myProcNo()] > 0)
-            {
-                Info<< "Processor " << procI << ": receive mesh and fields"
-                    << endl;
-
-                // Note: communication can be optimised.  HJ, 27/Feb/2018
-                IPstream fromProc
-                (
-                    Pstream::nonBlocking,
-                    procI
-                );
-
-                // Receive the mesh
-                procMeshes.set
-                (
-                    procI,
-                    new fvMesh
-                    (
-                        IOobject
-                        (
-                            "processorPart" + name(procI),
-                            mesh_.time().timeName(),
-                            mesh_.time(),
-                            IOobject::NO_READ,
-                            IOobject::NO_WRITE
-                        ),
-                        fromProc,
-                        false             // Do not sync
-                    )
-                );
-
-                // Receive the fields
-            }
-        }
-        else
-        {
-            // Insert own mesh
-        }
-    }
-
-    // Create the reconstructed mesh
-    autoPtr<fvMesh> reconstructedMeshPtr =
-        meshRecon.reconstructMesh(mesh_.time());
-    const fvMesh& reconstructedMesh = reconstructedMeshPtr();
-
-    // Create field reconstructor
-    fvFieldReconstructor fieldReconstructor
-    (
-        mesh_,
-        procMeshes,
-        meshRecon.faceProcAddressing(),
-        meshRecon.cellProcAddressing(),
-        meshRecon.boundaryProcAddressing()
-    );
-
-    // Create mapPolyMesh
-
-    // DUMMY!!!
-    autoPtr<mapPolyMesh> tmpm(new mapPolyMesh(mesh_));
-
-    return tmpm;
-}
-
-
-// ************************************************************************* //
diff --git a/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.H b/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.H
deleted file mode 100644
index 8c746709c..000000000
--- a/src/dynamicMesh/loadBalanceFvMesh/dynamicMeshLoadBalance/dynamicMeshLoadBalance.H
+++ /dev/null
@@ -1,145 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend 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 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::dynamicMeshLoadBalance
-
-Description
-    Dynamic mesh load balance class.
-    The modifier will examine the weighted imbalance in the mesh to determine
-    when the load distribution is no longer satisfactory.
-    Imbalance is measured as a weighted field over all cells and is checked over
-    a parallel decomposition
-    When load balance is detected:
-    - parallel-aware decompositionMethod to receive the cell-to-processor
-    assignment on each processor
-    - polyMesh is split into parts and point, face, cell, boundary addressing
-    objects are created
-    - tools equivalent to decomposePar are used to split up the original mesh
-    into processor parts
-    - for each processor piece:
-        - the new mesh is built, ready to be transferred to a processor
-        - fields are subset onto each processor mesh
-        - mesh and fields are passed onto the target processor
-    - ALL DECOMPOSITION PIECES ARE CLEARED AFTER SEND, AND RE-USED ONTO RECEIVE
-    - processor pieces are received from all components
-    - new mesh is built by inserting processor pieces in order of processors
-    - for each processor piece:
-        - if different from myProcNo, point, face, cell, boundary addressing
-        objects are created
-        - if equal to myProcNo, a mapPolyMesh object is assembled
-    - once the complete mesh is built, updateMesh is called on the local
-    processor.  This will re-map local data and re-size the fields
-    - when completed, tools equivalent to reconstructPar are used to rebuild
-    the parts of fields from other processors
-
-SourceFiles
-    dynamicMeshLoadBalance.C
-    dynamicMeshLoadBalanceIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef dynamicMeshLoadBalance_H
-#define dynamicMeshLoadBalance_H
-
-#include "dynamicFvMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-
-/*---------------------------------------------------------------------------*\
-                     Class dynamicMeshLoadBalance Declaration
-\*---------------------------------------------------------------------------*/
-
-class dynamicMeshLoadBalance
-{
-    // Private data
-
-        //- Dynamic mesh reference
-        dynamicFvMesh& mesh_;
-
-        //- Decomposition dictionary
-        IOdictionary dict_;
-
-        //- Imbalance trigger 0 < imbalance < 1
-        scalar imbalanceTrigger_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        dynamicMeshLoadBalance(const dynamicMeshLoadBalance&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const dynamicMeshLoadBalance&);
-
-
-        //- Send mesh to other processor
-            static void sendMesh
-            (
-                const fvMesh& mesh,
-                Ostream& os
-            );
-    
-public:
-
-    // //- Runtime type information
-    // TypeName("testLoadBalanceFvMesh");
-
-
-    // Constructors
-
-        //- Construct from dynamic mesh
-        dynamicMeshLoadBalance(dynamicFvMesh&);
-
-
-    //- Destructor
-    ~dynamicMeshLoadBalance();
-
-
-    // Member Functions
-
-        //- Check balance.  Return true if re-balancing is required
-        bool checkLoadBalance(const scalarField& weights) const;
-
-        //- Update mesh
-        autoPtr<mapPolyMesh> updateMesh() const;
-
-        //- Update fields
-        void updateFields() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
index 3ee68ecd0..abbbf1334 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C
@@ -31,7 +31,7 @@ License
 #include "mapPolyMesh.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "GeoMesh.H"
+#include "passiveProcessorPolyPatch.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -82,8 +82,8 @@ bool Foam::loadBalanceFvMesh::checkLoadBalance
 
 Foam::loadBalanceFvMesh::loadBalanceFvMesh(const IOobject& io)
 :
-    dynamicFvMesh(io),
-    dynamicMeshCoeffs_
+    topoChangerFvMesh(io),
+    dict_
     (
         IOdictionary
         (
@@ -99,7 +99,7 @@ Foam::loadBalanceFvMesh::loadBalanceFvMesh(const IOobject& io)
     ),
     imbalanceTrigger_
     (
-        readScalar(dynamicMeshCoeffs_.lookup("imbalanceTrigger"))
+        readScalar(dict_.lookup("imbalanceTrigger"))
     )
 {
     // Check imbalance trigger
@@ -128,579 +128,17 @@ Foam::loadBalanceFvMesh::~loadBalanceFvMesh()
 
 bool Foam::loadBalanceFvMesh::update()
 {
-    if (!Pstream::parRun())
+    if (Pstream::parRun())
     {
-        InfoIn("bool loadBalanceFvMesh::update()")
-            << "Load balancing a serial run.  Skipping."
-            << endl;
-
+        // Decide when to balance here
+        
+        return loadBalance(dict_);
+    }
+    else
+    {
+        // Serial run: no balancing
         return false;
     }
-
-    // Check imbalance.  Note: add run-time selection for the imbalance
-    // weights criterion
-
-    // Create a parallel decomposition
-    domainDecomposition meshDecomp
-    (
-        *this,
-        dynamicMeshCoeffs_
-    );
-
-    // Decompose the mesh based on processor data
-    meshDecomp.decomposeMesh(false);
-
-    // Analyse mesh decomposition to see how many cells are passed
-    // to which processor
-    labelListList migratedCells(meshDecomp.nProcs());
-
-    // Fill local list with number of local cells to be sent to each processor
-    // First index = my processor.  Second index = processor to send to
-    labelList& curMigratedCells = migratedCells[Pstream::myProcNo()];
-
-    curMigratedCells.setSize(Pstream::nProcs(), 0);
-
-    const labelList& cellToProc = meshDecomp.cellToProc();
-
-    // Write as volScalarField for post-processing
-    volScalarField cellDist
-    (
-        IOobject
-        (
-            "cellDist",
-            time().timeName(),
-            *this,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        *this,
-        dimensionedScalar("cellDist", dimless, 0),
-        zeroGradientFvPatchScalarField::typeName
-    );
-
-    forAll(cellToProc, celli)
-    {
-       cellDist[celli] = cellToProc[celli];
-    }
-
-    cellDist.write();
-
-
-    forAll (cellToProc, cellI)
-    {
-        curMigratedCells[cellToProc[cellI]]++;
-    }
-
-    // Now that each processor has filled in its own part, combine the data
-    Pstream::gatherList(migratedCells);
-    Pstream::scatterList(migratedCells);
-
-    // Reading through second index now tells how many cells will arrive
-    // from which processor
-
-    // Find out which processor faces will become local internal faces
-    // by comparing decomposition index from the other side
-
-
-    // Split the mesh and fields over processors and send
-
-    // Prepare receiving side
-
-    // Create the reconstructor
-    processorMeshesReconstructor meshRecon("reconstructed");
-
-    PtrList<fvMesh>& procMeshes = meshRecon.meshes();
-    procMeshes.setSize(meshDecomp.nProcs());
-
-    // Collect local fields for decomposition
-    clearOut();
-    
-    // Collect fields for load balancing
-    HashTable<const volScalarField*> volScalarFields =
-        thisDb().lookupClass<volScalarField>();
-    Pout<< "volScalarFields: " << volScalarFields.sortedToc() << endl;
-    HashTable<const volVectorField*>volVectorFields =
-        thisDb().lookupClass<volVectorField>();
-    Pout<< "volVectorFields: " << volVectorFields.sortedToc() << endl;
-    HashTable<const surfaceScalarField*> surfaceScalarFields =
-        thisDb().lookupClass<surfaceScalarField>();
-    Pout<< "surfaceScalarFields: " << surfaceScalarFields.sortedToc() << endl;
-    //HJ, HERE: remove the fields that should not be load balanced
-
-    // Prepare fields for reconstruction
-    // First index: field index from volScalarFields
-    // Second index: processor entry for the field
-    List<PtrList<volScalarField> > receivedVolScalarFields
-    (
-        volScalarFields.size()
-    );
-
-    List<PtrList<volVectorField> > receivedVolVectorFields
-    (
-       volVectorFields.size()
-    );
-
-    List<PtrList<surfaceScalarField> > receivedSurfaceScalarFields
-    (
-        surfaceScalarFields.size()
-    );
-
-    forAll (receivedVolScalarFields, fieldI)
-    {
-        receivedVolScalarFields[fieldI].setSize(Pstream::nProcs());
-    }
-
-    forAll (receivedVolVectorFields, fieldI)
-    {
-        receivedVolVectorFields[fieldI].setSize(Pstream::nProcs());
-    }
-
-    forAll (receivedSurfaceScalarFields, fieldI)
-    {
-        receivedSurfaceScalarFields[fieldI].setSize(Pstream::nProcs());
-    }
-
-    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
-    {
-        // Check if there is a mesh to send
-        if (curMigratedCells[procI] > 0)
-        {
-            // Send mesh and field to processor procI
-
-            // Get mesh from decomposition
-            autoPtr<fvMesh> procMeshPtr = meshDecomp.processorMesh
-            (
-                procI,
-                time(),
-                "processorPart" + Foam::name(procI),
-                true    // Create passive processor patches
-            );
-            fvMesh& procMesh = procMeshPtr();
-
-            // Create a field decomposer
-            fvFieldDecomposer fieldDecomposer
-            (
-                *this,
-                procMesh,
-                meshDecomp.procFaceAddressing()[procI],
-                meshDecomp.procCellAddressing()[procI],
-                meshDecomp.procBoundaryAddressing()[procI]
-            );
-
-            if (procI != Pstream::myProcNo())
-            {
-                Pout<< "Send mesh and fields to processor " << procI << endl;
-
-                OPstream toProc
-                (
-                    Pstream::blocking,
-                    procI
-                );
-
-                // Send the mesh and fields to target processor
-                toProc << procMesh << nl;
-
-                // Send fields
-                sendFields(volScalarFields, fieldDecomposer, toProc);
-                sendFields(volVectorFields, fieldDecomposer, toProc);
-                sendFields(surfaceScalarFields, fieldDecomposer, toProc);
-            }
-            else
-            {
-                // My processor.  Grab mesh and fields
-                // Note: procI == Pstream::myProcNo()
-                // HJ, 26/Apr/2018
-
-                // Set local mesh piece
-                procMeshes.set
-                (
-                    procI,
-                    procMeshPtr
-                );
-
-                // Set local fields
-                // Note: first index is field index and second index is procI
-                insertFields
-                (
-                    volScalarFields,
-                    fieldDecomposer,
-                    receivedVolScalarFields
-                );
-
-                insertFields
-                (
-                    volVectorFields,
-                    fieldDecomposer,
-                    receivedVolVectorFields
-                );
-
-                insertFields
-                (
-                    surfaceScalarFields,
-                    fieldDecomposer,
-                    receivedSurfaceScalarFields
-                );
-            }
-        }
-    }
-
-
-    // Collect pieces of mesh and fields from other processors
-    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
-    {
-        if (procI != Pstream::myProcNo())
-        {
-            // Check if there is a mesh to send
-            if (migratedCells[procI][Pstream::myProcNo()] > 0)
-            {
-                Pout<< "Receive mesh and fields from " << procI
-                    << endl;
-
-                // Note: communication can be optimised.  HJ, 27/Feb/2018
-                IPstream fromProc
-                (
-                    Pstream::blocking,
-                    procI
-                );
-
-                // Receive the mesh
-                procMeshes.set
-                (
-                    procI,
-                    new fvMesh
-                    (
-                        IOobject
-                        (
-                            "processorPart" + Foam::name(procI),
-                            time().timeName(),
-                            time(),
-                            IOobject::NO_READ,
-                            IOobject::NO_WRITE
-                        ),
-                        fromProc,
-                        false             // Do not sync
-                    )
-                );
-
-                // Receive fields
-                // Note: first index is field index and second index is procI
-                receiveFields
-                (
-                    procI,
-                    receivedVolScalarFields,
-                    procMeshes[procI],
-                    fromProc
-                );
-
-                receiveFields
-                (
-                    procI,
-                    receivedVolVectorFields,
-                    procMeshes[procI],
-                    fromProc
-                );
-
-                receiveFields
-                (
-                    procI,
-                    receivedSurfaceScalarFields,
-                    procMeshes[procI],
-                    fromProc
-                );
-            }
-        }
-    }
-
-
-    // Create the reconstructed mesh
-    autoPtr<fvMesh> reconstructedMeshPtr =
-        meshRecon.reconstructMesh(time());
-    fvMesh& reconMesh = reconstructedMeshPtr();
-
-    Pout<< "Reconstructed mesh stats: "
-        << " nCells: " << reconMesh.nCells()
-        << " polyPatches: "
-        << reconMesh.boundaryMesh().size()
-        << " patches: "
-        << reconMesh.boundary().size()
-        << endl;
-
-    // Apply changes to the local mesh:
-    // - refactor the boundary to match new patches.  Note: processor
-    //   patch types may be added or removed
-    // - reset all primitives
-
-    // Use non-const access to boundaryMesh
-    polyBoundaryMesh& bMesh = const_cast<polyBoundaryMesh&>(boundaryMesh());
-
-    const polyBoundaryMesh& reconBMesh = reconMesh.boundaryMesh();
-
-    // Resize the existing boundary to match in the number of patches
-    if (bMesh.size() > reconBMesh.size())
-    {
-        // Decreasing in size: check patches that are due to disappear
-
-        // Check before resizing: only processor patches may be deleted
-        bool okToDelete = true;
-
-        for (label patchI = reconBMesh.size(); patchI < bMesh.size(); patchI++)
-        {
-            if (!isA<processorPolyPatch>(bMesh[patchI]))
-            {
-                okToDelete = false;
-                break;
-            }
-        }
-
-        if (!okToDelete)
-        {
-            FatalErrorIn("bool loadBalanceFvMesh::update()")
-                << "Boundary resizing error: deleting non-processor patches "
-                << bMesh.size() << " to " << reconBMesh.size() << nl
-                << "old patch types: " << bMesh.types() << nl
-                << "new patch types: " << reconBMesh.types() << nl
-                << "This is not allowed."
-                << abort(FatalError);
-        }
-
-        // Resize the boundary.  Patches hanging off the end of the list
-        // will be deleted by PtrList
-        bMesh.setSize(reconBMesh.size());
-    }
-    else if (bMesh.size() < reconBMesh.size())
-    {
-        // Increasing in size: check patches that are due to disappear
-        bMesh.setSize(reconBMesh.size());
-    }
-
-    // Delete processor patches from old boundary
-    boolList patchFlag(bMesh.size(), false);
-
-    forAll (bMesh, patchI)
-    {
-        // If the patch is not set, the slot is available for re-use
-        if (!bMesh.set(patchI))
-        {
-            patchFlag[patchI] = true;
-        }
-        else if (isA<processorPolyPatch>(bMesh[patchI]))
-        {
-            // If the patch is set and contains an "old" processor patch
-            // the old patch will be deleted and replaced with a new one
-            patchFlag[patchI] = true;
-        }
-    }
-
-    // Store the resetFvPatchFlag to indicate patches that will be rebuilt
-    // patchFlag will be used in further signalling
-    boolList resetFvPatchFlag = patchFlag;
-
-    // Check alignment and types of old and new boundary
-    // Insert new patches processor patches
-    // Collect patch sizes and starts
-
-    labelList reconPatchSizes(reconBMesh.size(), 0);
-
-    forAll (bMesh, patchI)
-    {
-        // If the patch is preserved, types need to match
-        if (!patchFlag[patchI])
-        {
-            const polyPatch& bPatch = bMesh[patchI];
-            const polyPatch& reconBPatch = reconBMesh[patchI];
-
-            // Check if the patch is matching
-            if
-            (
-                bPatch.type() != reconBPatch.type()
-             || bPatch.name() != reconBPatch.name()
-            )
-            {
-                FatalErrorIn("bool loadBalanceFvMesh::update()")
-                    << "Patch names or types not matching for index "
-                    << patchI << nl
-                    << "bMesh name: " << bPatch.name()
-                    << " type: " << bPatch.type() << nl
-                    << "reconBMesh name: " << reconBPatch.name()
-                    << "  type: " << reconBPatch.type() << nl
-                    << abort(FatalError);
-            }
-
-            // Record patch size
-            reconPatchSizes[patchI] = reconBMesh[patchI].size();
-        }
-    }
-
-    // Insert new processor patches
-    // Note:
-    // The code is set up so that any intermediate empty boundary patch
-    // slots are re-used.  It is expected that the new patches will be
-    // added at the end, so this is safety.
-    // As a result, patch sizes and starts need to be re-assembled
-    // rather than used directly from reconBMesh
-    // HJ, 16/Apr/2018
-    forAll (reconBMesh, reconPatchI)
-    {
-        if (isA<processorPolyPatch>(reconBMesh[reconPatchI]))
-        {
-            // Find a slot to insert into
-            label nextPatchSlot = 0;
-
-            for
-            (
-                nextPatchSlot = 0;
-                nextPatchSlot < patchFlag.size();
-                nextPatchSlot++
-            )
-            {
-                if (patchFlag[nextPatchSlot])
-                {
-                    // Found a patch slot
-                    break;
-                }
-            }
-
-            if (nextPatchSlot >= patchFlag.size())
-            {
-                FatalErrorIn("bool loadBalanceFvMesh::update()")
-                    << "Cannot find available patch slot: " << nextPatchSlot
-                    << abort(FatalError);
-            }
-
-            // Insert a patch
-            const processorPolyPatch& ppPatch =
-                refCast<const processorPolyPatch>
-                (
-                    reconBMesh[reconPatchI]
-                );
-
-            // Note:
-            // The new mesh has not been reset.  Therefore, sizes and starts
-            // cannot be set properly until the mesh is reset
-            // This is done in the resetPrimitives function
-            // HJ, 16/Apr/2018
-            bMesh.set
-            (
-                nextPatchSlot,
-                new processorPolyPatch
-                (
-                    // ppPatch.name(),
-                    "procBoundary" + Foam::name(ppPatch.myProcNo()) + "to"
-                    + Foam::name(ppPatch.neighbProcNo()),
-                    0,                  // dummy size
-                    nInternalFaces(),   // dummy start
-                    // ppPatch.size(),
-                    // ppPatch.start(),
-                    nextPatchSlot,
-                    bMesh,
-                    ppPatch.myProcNo(),
-                    ppPatch.neighbProcNo()
-                )
-            );
-
-            // Mark patch slot as used
-            patchFlag[nextPatchSlot] = false;
-
-            // Collect size
-            reconPatchSizes[nextPatchSlot] = reconBMesh[reconPatchI].size();
-        }
-    }
-
-    // Patch sizes are assembled.  Collect patch starts for the new mesh
-    labelList reconPatchStarts(reconBMesh.size(), 0);
-
-    if (!reconPatchStarts.empty())
-    {
-        reconPatchStarts[0] = reconMesh.nInternalFaces();
-
-        for (label i = 1; i < reconPatchStarts.size(); i++)
-        {
-            reconPatchStarts[i] =
-                reconPatchStarts[i - 1]
-              + reconPatchSizes[i - 1];
-        }
-    }
-
-    // Reset fvMesh and patches
-    resetFvPrimitives
-    (
-        xferCopy(reconMesh.allPoints()),
-        xferCopy(reconMesh.allFaces()),
-        xferCopy(reconMesh.faceOwner()),
-        xferCopy(reconMesh.faceNeighbour()),
-        reconPatchSizes,
-        reconPatchStarts,
-        resetFvPatchFlag,
-        true                       // Valid boundary
-    );
-
-    Pout<< "New mesh: points " << nPoints()
-        << " faces: " << nFaces()
-        << " internal: " << nInternalFaces()
-        << " cells: " << nCells()
-        << " patches: " << reconPatchSizes.size() << endl;
-
-    forAll (procMeshes, procI)
-    {
-        Pout<< "procMesh " << procI
-            << " points " << procMeshes[procI].nPoints()
-            << " faces: " << procMeshes[procI].nFaces()
-            << " internal: " << procMeshes[procI].nInternalFaces()
-            << " cells: " << procMeshes[procI].nCells()
-            << " patches: " << procMeshes[procI].boundary().size()
-            << endl;
-    }
-
-    // Pout<< "RECON face: " << meshRecon.faceProcAddressing() << nl
-    //     << " cell: " << meshRecon.cellProcAddressing() << nl
-    //     << " boundary: " << meshRecon.boundaryProcAddressing() << nl
-    //     << endl;
-
-
-    // To Do: build a reconstructor from addressing data
-    Pout<< nl << nl
-        << "FINISHED CYCLE" << nl << nl << nl
-        << endl;
-
-    // Create a dummy mapping object to re-size all fields
-
-    // Create field reconstructor
-    fvFieldReconstructor fieldReconstructor
-    (
-        *this,
-        procMeshes,
-        meshRecon.faceProcAddressing(),
-        meshRecon.cellProcAddressing(),
-        meshRecon.boundaryProcAddressing()
-    );
-
-    // Rebuild fields
-
-    rebuildFields
-    (
-        volScalarFields,
-        fieldReconstructor,
-        receivedVolScalarFields,
-        resetFvPatchFlag
-    );
-
-    rebuildFields
-    (
-        volVectorFields,
-        fieldReconstructor,
-        receivedVolVectorFields,
-        resetFvPatchFlag
-    );
-
-    rebuildFields
-    (
-        surfaceScalarFields,
-        fieldReconstructor,
-        receivedSurfaceScalarFields,
-        resetFvPatchFlag
-    );
-
-    return true;
 }
 
 
diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H
index a8d72c014..593e53419 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H
+++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.H
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef loadBalanceFvMesh_H
 #define loadBalanceFvMesh_H
 
-#include "dynamicFvMesh.H"
+#include "topoChangerFvMesh.H"
 #include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,12 +49,12 @@ namespace Foam
 
 class loadBalanceFvMesh
 :
-    public dynamicFvMesh
+    public topoChangerFvMesh
 {
     // Private data
 
         //- Dictionary of motion control parameters
-        dictionary dynamicMeshCoeffs_;
+        dictionary dict_;
 
         //- Imbalance trigger 0 < imbalance < 1
         scalar imbalanceTrigger_;
@@ -71,44 +71,6 @@ class loadBalanceFvMesh
         //- Check balance.  Return true if re-balancing is required
         bool checkLoadBalance(const scalarField& weights) const;
 
-        //- Send fields to other processor
-        template<class GeoField, class Decomposer>
-        void sendFields
-        (
-            const HashTable<const GeoField*>& geoFields,
-            const Decomposer& decomposer,
-            Ostream& toProc
-        ) const;
-
-        //- Insert local fields
-        template<class GeoField, class Decomposer>
-        void insertFields
-        (
-            const HashTable<const GeoField*>& geoFields,
-            const Decomposer& decomposer,
-            List<PtrList<GeoField> >& localFields
-        ) const;
-
-        //- Receive fields from other processor
-        template<class GeoMesh, class GeoField>
-        void receiveFields
-        (
-            const label procIndex,
-            List<PtrList<GeoField> >& receivedFields,
-            const GeoMesh& procMesh,
-            Istream& fromProc
-        ) const;
-
-        //- Resize and rebuild fields
-        template<class GeoField, class Reconstructor>
-        void rebuildFields
-        (
-            const HashTable<const GeoField*>& geoFields,
-            const Reconstructor& reconstructor,
-            const List<PtrList<GeoField> >& receivedFields,
-            const boolList& patchesToReplace
-        ) const;
-
 
 public:
 
@@ -133,12 +95,6 @@ public:
 };
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "loadBalanceFvMeshTemplates.C"
-#endif
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/dynamicMesh/topoChangerFvMesh/Make/files b/src/dynamicMesh/topoChangerFvMesh/Make/files
index 151654c9f..0a4c241fd 100644
--- a/src/dynamicMesh/topoChangerFvMesh/Make/files
+++ b/src/dynamicMesh/topoChangerFvMesh/Make/files
@@ -1,4 +1,5 @@
 topoChangerFvMesh/topoChangerFvMesh.C
+topoChangerFvMesh/topoChangerFvMeshLoadBalance.C
 
 attachDetachFvMesh/attachDetachFvMesh.C
 linearValveFvMesh/linearValveFvMesh.C
diff --git a/src/dynamicMesh/topoChangerFvMesh/Make/options b/src/dynamicMesh/topoChangerFvMesh/Make/options
index f5388862a..b055921e6 100644
--- a/src/dynamicMesh/topoChangerFvMesh/Make/options
+++ b/src/dynamicMesh/topoChangerFvMesh/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/decompositionMethods/decomposeReconstruct/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/meshMotion/solidBodyMotion/lnInclude \
     -I$(LIB_SRC)/tetFiniteElement/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/meshMotion/tetMotionSolver/lnInclude
@@ -12,6 +13,7 @@ LIB_LIBS = \
     -ldynamicFvMesh \
     -ldynamicMesh \
     -lmeshTools \
+    -ldecomposeReconstruct \
     -lsolidBodyMotion \
     -ltetFiniteElement \
     -ltetMotionSolver
diff --git a/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H b/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
index ea1230e44..2d7c72760 100644
--- a/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
+++ b/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
@@ -30,6 +30,8 @@ Description
 SourceFiles
     topoChangerFvMesh.C
     newTopoFvMesh.C
+    topoChangerFvMeshLoadBalance.C
+    topoChangerFvMeshLoadBalanceTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -61,10 +63,52 @@ class topoChangerFvMesh
         void operator=(const topoChangerFvMesh&);
 
 
+        // Load balancing functions
+
+            //- Send fields to other processor
+            template<class GeoField, class Decomposer>
+            void sendFields
+            (
+                const HashTable<const GeoField*>& geoFields,
+                const Decomposer& decomposer,
+                Ostream& toProc
+            ) const;
+
+            //- Insert local fields
+            template<class GeoField, class Decomposer>
+            void insertFields
+            (
+                const HashTable<const GeoField*>& geoFields,
+                const Decomposer& decomposer,
+                List<PtrList<GeoField> >& localFields
+            ) const;
+
+            //- Receive fields from other processor
+            template<class GeoMesh, class GeoField>
+            void receiveFields
+            (
+                const label procIndex,
+                List<PtrList<GeoField> >& receivedFields,
+                const GeoMesh& procMesh,
+                Istream& fromProc
+            ) const;
+
+            //- Resize and rebuild fields
+            template<class GeoField, class Reconstructor>
+            void rebuildFields
+            (
+                const HashTable<const GeoField*>& geoFields,
+                const Reconstructor& reconstructor,
+                const List<PtrList<GeoField> >& receivedFields,
+                const boolList& patchesToReplace
+            ) const;
+
+
 protected:
 
     // Protected Data
 
+        //- Topo changer
         polyTopoChanger topoChanger_;
 
 
@@ -106,18 +150,26 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~topoChangerFvMesh();
+    //- Destructor
+    virtual ~topoChangerFvMesh();
 
 
     // Member Functions
 
+        //- Load balance the mesh in parallel execution
+        bool loadBalance(const dictionary& dict);
+    
         //- Update the mesh for both mesh motion and topology change
         virtual bool update() = 0;
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "topoChangerFvMeshLoadBalanceTemplates.C"
+#endif
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalance.C b/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalance.C
new file mode 100644
index 000000000..4a689a1d8
--- /dev/null
+++ b/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalance.C
@@ -0,0 +1,602 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.0
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "topoChangerFvMesh.H"
+#include "domainDecomposition.H"
+#include "fvFieldDecomposer.H"
+#include "processorMeshesReconstructor.H"
+#include "fvFieldReconstructor.H"
+#include "mapPolyMesh.H"
+#include "addToRunTimeSelectionTable.H"
+
+#include "passiveProcessorPolyPatch.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
+{
+    if (!Pstream::parRun())
+    {
+        InfoIn("bool topoChangerFvMesh::loadBalance()")
+            << "Load balancing a serial run.  Skipping."
+            << endl;
+
+        return false;
+    }
+
+    // Check imbalance.  Note: add run-time selection for the imbalance
+    // weights criterion
+
+    // Create a parallel decomposition
+    domainDecomposition meshDecomp
+    (
+        *this,
+        decompDict
+    );
+
+    // Decompose the mesh based on processor data
+    meshDecomp.decomposeMesh(false);
+
+    // Analyse mesh decomposition to see how many cells are passed
+    // to which processor
+    labelListList migratedCells(meshDecomp.nProcs());
+
+    // Fill local list with number of local cells to be sent to each processor
+    // First index = my processor.  Second index = processor to send to
+    labelList& curMigratedCells = migratedCells[Pstream::myProcNo()];
+
+    curMigratedCells.setSize(Pstream::nProcs(), 0);
+
+    const labelList& cellToProc = meshDecomp.cellToProc();
+
+    // // Write as volScalarField for post-processing
+    // volScalarField cellDist
+    // (
+    //     IOobject
+    //     (
+    //         "cellDist",
+    //         time().timeName(),
+    //         *this,
+    //         IOobject::NO_READ,
+    //         IOobject::NO_WRITE
+    //     ),
+    //     *this,
+    //     dimensionedScalar("cellDist", dimless, 0),
+    //     zeroGradientFvPatchScalarField::typeName
+    // );
+
+    // forAll(cellToProc, celli)
+    // {
+    //    cellDist[celli] = cellToProc[celli];
+    // }
+
+    // cellDist.write();
+
+    // Count migrated cells
+    forAll (cellToProc, cellI)
+    {
+        curMigratedCells[cellToProc[cellI]]++;
+    }
+
+    // Now that each processor has filled in its own part, combine the data
+    Pstream::gatherList(migratedCells);
+    Pstream::scatterList(migratedCells);
+    Info<< "Migrated cells per processor: " << migratedCells << endl;
+    // Reading through second index now tells how many cells will arrive
+    // from which processor
+
+    // Find out which processor faces will become local internal faces
+    // by comparing decomposition index from the other side
+
+
+    // Split the mesh and fields over processors and send
+
+    // Prepare receiving side
+
+    // Create the reconstructor
+    processorMeshesReconstructor meshRecon("reconstructed");
+
+    PtrList<fvMesh>& procMeshes = meshRecon.meshes();
+    procMeshes.setSize(meshDecomp.nProcs());
+
+    // Collect local fields for decomposition
+    clearOut();
+
+    // Collect fields for load balancing
+    HashTable<const volScalarField*> volScalarFields =
+        thisDb().lookupClass<volScalarField>();
+
+    HashTable<const volVectorField*>volVectorFields =
+        thisDb().lookupClass<volVectorField>();
+
+    HashTable<const surfaceScalarField*> surfaceScalarFields =
+        thisDb().lookupClass<surfaceScalarField>();
+
+    //HJ, HERE: remove the fields that should not be load balanced
+
+    // Prepare fields for reconstruction
+    // First index: field index from volScalarFields
+    // Second index: processor entry for the field
+    List<PtrList<volScalarField> > receivedVolScalarFields
+    (
+        volScalarFields.size()
+    );
+
+    List<PtrList<volVectorField> > receivedVolVectorFields
+    (
+       volVectorFields.size()
+    );
+
+    List<PtrList<surfaceScalarField> > receivedSurfaceScalarFields
+    (
+        surfaceScalarFields.size()
+    );
+
+    forAll (receivedVolScalarFields, fieldI)
+    {
+        receivedVolScalarFields[fieldI].setSize(Pstream::nProcs());
+    }
+
+    forAll (receivedVolVectorFields, fieldI)
+    {
+        receivedVolVectorFields[fieldI].setSize(Pstream::nProcs());
+    }
+
+    forAll (receivedSurfaceScalarFields, fieldI)
+    {
+        receivedSurfaceScalarFields[fieldI].setSize(Pstream::nProcs());
+    }
+
+    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
+    {
+        // Check if there is a mesh to send
+        if (curMigratedCells[procI] > 0)
+        {
+            // Send mesh and field to processor procI
+
+            // Get mesh from decomposition
+            autoPtr<fvMesh> procMeshPtr = meshDecomp.processorMesh
+            (
+                procI,
+                time(),
+                "processorPart" + Foam::name(procI),
+                true    // Create passive processor patches
+            );
+            fvMesh& procMesh = procMeshPtr();
+
+            // Create a field decomposer
+            fvFieldDecomposer fieldDecomposer
+            (
+                *this,
+                procMesh,
+                meshDecomp.procFaceAddressing()[procI],
+                meshDecomp.procCellAddressing()[procI],
+                meshDecomp.procBoundaryAddressing()[procI]
+            );
+
+            if (procI != Pstream::myProcNo())
+            {
+                // Pout<< "Send mesh and fields to processor " << procI << endl;
+
+                OPstream toProc
+                (
+                    Pstream::blocking,
+                    procI
+                );
+
+                // Send the mesh and fields to target processor
+                toProc << procMesh << nl;
+
+                // Send fields
+                sendFields(volScalarFields, fieldDecomposer, toProc);
+                sendFields(volVectorFields, fieldDecomposer, toProc);
+                sendFields(surfaceScalarFields, fieldDecomposer, toProc);
+            }
+            else
+            {
+                // My processor.  Grab mesh and fields
+                // Note: procI == Pstream::myProcNo()
+                // HJ, 26/Apr/2018
+                // Pout<< "Set local mesh and fields" << endl;
+                // Set local mesh piece
+                procMeshes.set
+                (
+                    procI,
+                    procMeshPtr
+                );
+
+                // Set local fields
+                // Note: first index is field index and second index is procI
+                insertFields
+                (
+                    volScalarFields,
+                    fieldDecomposer,
+                    receivedVolScalarFields
+                );
+
+                insertFields
+                (
+                    volVectorFields,
+                    fieldDecomposer,
+                    receivedVolVectorFields
+                );
+
+                insertFields
+                (
+                    surfaceScalarFields,
+                    fieldDecomposer,
+                    receivedSurfaceScalarFields
+                );
+            }
+        }
+    }
+
+
+    // Collect pieces of mesh and fields from other processors
+    for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            // Check if there is a mesh to send
+            if (migratedCells[procI][Pstream::myProcNo()] > 0)
+            {
+                // Pout<< "Receive mesh and fields from " << procI
+                //     << endl;
+
+                // Note: communication can be optimised.  HJ, 27/Feb/2018
+                IPstream fromProc
+                (
+                    Pstream::blocking,
+                    procI
+                );
+
+                // Receive the mesh
+                procMeshes.set
+                (
+                    procI,
+                    new fvMesh
+                    (
+                        IOobject
+                        (
+                            "processorPart" + Foam::name(procI),
+                            time().timeName(),
+                            time(),
+                            IOobject::NO_READ,
+                            IOobject::NO_WRITE
+                        ),
+                        fromProc,
+                        false             // Do not sync
+                    )
+                );
+
+                // Receive fields
+                // Note: first index is field index and second index is procI
+                receiveFields
+                (
+                    procI,
+                    receivedVolScalarFields,
+                    procMeshes[procI],
+                    fromProc
+                );
+
+                receiveFields
+                (
+                    procI,
+                    receivedVolVectorFields,
+                    procMeshes[procI],
+                    fromProc
+                );
+
+                receiveFields
+                (
+                    procI,
+                    receivedSurfaceScalarFields,
+                    procMeshes[procI],
+                    fromProc
+                );
+            }
+        }
+    }
+
+    forAll (procMeshes, procI)
+    {
+        if (procMeshes.set(procI))
+        {
+            Pout<< "procMesh " << procI
+                << " points " << procMeshes[procI].nPoints()
+                << " faces: " << procMeshes[procI].nFaces()
+                << " internal: " << procMeshes[procI].nInternalFaces()
+                << " cells: " << procMeshes[procI].nCells()
+                << " patches: " << procMeshes[procI].boundary().size()
+                << endl;
+        }
+    }
+
+    // Create the reconstructed mesh
+    autoPtr<fvMesh> reconstructedMeshPtr =
+        meshRecon.reconstructMesh(time());
+    fvMesh& reconMesh = reconstructedMeshPtr();
+
+    Pout<< "Reconstructed mesh stats: "
+        << " nCells: " << reconMesh.nCells()
+        << " polyPatches: "
+        << reconMesh.boundaryMesh().size()
+        << " patches: "
+        << reconMesh.boundary().size()
+        << endl;
+
+    // Apply changes to the local mesh:
+    // - refactor the boundary to match new patches.  Note: processor
+    //   patch types may be added or removed
+    // - reset all primitives
+
+    // Use non-const access to boundaryMesh
+    polyBoundaryMesh& bMesh = const_cast<polyBoundaryMesh&>(boundaryMesh());
+
+    const polyBoundaryMesh& reconBMesh = reconMesh.boundaryMesh();
+
+    // Resize the existing boundary to match in the number of patches
+    if (bMesh.size() > reconBMesh.size())
+    {
+        // Decreasing in size: check patches that are due to disappear
+
+        // Check before resizing: only processor patches may be deleted
+        bool okToDelete = true;
+
+        for (label patchI = reconBMesh.size(); patchI < bMesh.size(); patchI++)
+        {
+            if (!isA<processorPolyPatch>(bMesh[patchI]))
+            {
+                okToDelete = false;
+                break;
+            }
+        }
+
+        if (!okToDelete)
+        {
+            FatalErrorIn("bool topoChangerFvMesh::loadBalance()")
+                << "Boundary resizing error: deleting non-processor patches "
+                << bMesh.size() << " to " << reconBMesh.size() << nl
+                << "old patch types: " << bMesh.types() << nl
+                << "new patch types: " << reconBMesh.types() << nl
+                << "This is not allowed."
+                << abort(FatalError);
+        }
+
+        // Resize the boundary.  Patches hanging off the end of the list
+        // will be deleted by PtrList
+        bMesh.setSize(reconBMesh.size());
+    }
+    else if (bMesh.size() < reconBMesh.size())
+    {
+        // Increasing in size: check patches that are due to disappear
+        bMesh.setSize(reconBMesh.size());
+    }
+
+    // Delete processor patches from old boundary
+    boolList patchFlag(bMesh.size(), false);
+
+    forAll (bMesh, patchI)
+    {
+        // If the patch is not set, the slot is available for re-use
+        if (!bMesh.set(patchI))
+        {
+            patchFlag[patchI] = true;
+        }
+        else if (isA<processorPolyPatch>(bMesh[patchI]))
+        {
+            // If the patch is set and contains an "old" processor patch
+            // the old patch will be deleted and replaced with a new one
+            patchFlag[patchI] = true;
+        }
+    }
+
+    // Store the resetFvPatchFlag to indicate patches that will be rebuilt
+    // patchFlag will be used in further signalling
+    boolList resetFvPatchFlag = patchFlag;
+
+    // Check alignment and types of old and new boundary
+    // Insert new patches processor patches
+    // Collect patch sizes and starts
+
+    labelList reconPatchSizes(reconBMesh.size(), 0);
+
+    forAll (bMesh, patchI)
+    {
+        // If the patch is preserved, types need to match
+        if (!patchFlag[patchI])
+        {
+            const polyPatch& bPatch = bMesh[patchI];
+            const polyPatch& reconBPatch = reconBMesh[patchI];
+
+            // Check if the patch is matching
+            if
+            (
+                bPatch.type() != reconBPatch.type()
+             || bPatch.name() != reconBPatch.name()
+            )
+            {
+                FatalErrorIn("bool topoChangerFvMesh::loadBalance()")
+                    << "Patch names or types not matching for index "
+                    << patchI << nl
+                    << "bMesh name: " << bPatch.name()
+                    << " type: " << bPatch.type() << nl
+                    << "reconBMesh name: " << reconBPatch.name()
+                    << "  type: " << reconBPatch.type() << nl
+                    << abort(FatalError);
+            }
+
+            // Record patch size
+            reconPatchSizes[patchI] = reconBMesh[patchI].size();
+        }
+    }
+
+    // Insert new processor patches
+    // Note:
+    // The code is set up so that any intermediate empty boundary patch
+    // slots are re-used.  It is expected that the new patches will be
+    // added at the end, so this is safety.
+    // As a result, patch sizes and starts need to be re-assembled
+    // rather than used directly from reconBMesh
+    // HJ, 16/Apr/2018
+    forAll (reconBMesh, reconPatchI)
+    {
+        if (isA<processorPolyPatch>(reconBMesh[reconPatchI]))
+        {
+            // Find a slot to insert into
+            label nextPatchSlot = 0;
+
+            for
+            (
+                nextPatchSlot = 0;
+                nextPatchSlot < patchFlag.size();
+                nextPatchSlot++
+            )
+            {
+                if (patchFlag[nextPatchSlot])
+                {
+                    // Found a patch slot
+                    break;
+                }
+            }
+
+            if (nextPatchSlot >= patchFlag.size())
+            {
+                FatalErrorIn("bool topoChangerFvMesh::loadBalance()")
+                    << "Cannot find available patch slot: " << nextPatchSlot
+                    << abort(FatalError);
+            }
+
+            // Insert a patch
+            const processorPolyPatch& ppPatch =
+                refCast<const processorPolyPatch>
+                (
+                    reconBMesh[reconPatchI]
+                );
+
+            // Note:
+            // The new mesh has not been reset.  Therefore, sizes and starts
+            // cannot be set properly until the mesh is reset
+            // This is done in the resetPrimitives function
+            // HJ, 16/Apr/2018
+            bMesh.set
+            (
+                nextPatchSlot,
+                new processorPolyPatch
+                (
+                    // ppPatch.name(),
+                    "procBoundary" + Foam::name(ppPatch.myProcNo()) + "to"
+                    + Foam::name(ppPatch.neighbProcNo()),
+                    0,                  // dummy size
+                    nInternalFaces(),   // dummy start
+                    // ppPatch.size(),
+                    // ppPatch.start(),
+                    nextPatchSlot,
+                    bMesh,
+                    ppPatch.myProcNo(),
+                    ppPatch.neighbProcNo()
+                )
+            );
+
+            // Mark patch slot as used
+            patchFlag[nextPatchSlot] = false;
+
+            // Collect size
+            reconPatchSizes[nextPatchSlot] = reconBMesh[reconPatchI].size();
+        }
+    }
+
+    // Patch sizes are assembled.  Collect patch starts for the new mesh
+    labelList reconPatchStarts(reconBMesh.size(), 0);
+
+    if (!reconPatchStarts.empty())
+    {
+        reconPatchStarts[0] = reconMesh.nInternalFaces();
+
+        for (label i = 1; i < reconPatchStarts.size(); i++)
+        {
+            reconPatchStarts[i] =
+                reconPatchStarts[i - 1]
+              + reconPatchSizes[i - 1];
+        }
+    }
+
+    // Reset fvMesh and patches
+    resetFvPrimitives
+    (
+        xferCopy(reconMesh.allPoints()),
+        xferCopy(reconMesh.allFaces()),
+        xferCopy(reconMesh.faceOwner()),
+        xferCopy(reconMesh.faceNeighbour()),
+        reconPatchSizes,
+        reconPatchStarts,
+        resetFvPatchFlag,
+        true                       // Valid boundary
+    );
+
+    // Create field reconstructor
+    fvFieldReconstructor fieldReconstructor
+    (
+        *this,
+        procMeshes,
+        meshRecon.faceProcAddressing(),
+        meshRecon.cellProcAddressing(),
+        meshRecon.boundaryProcAddressing()
+    );
+
+    // Rebuild fields
+
+    rebuildFields
+    (
+        volScalarFields,
+        fieldReconstructor,
+        receivedVolScalarFields,
+        resetFvPatchFlag
+    );
+
+    rebuildFields
+    (
+        volVectorFields,
+        fieldReconstructor,
+        receivedVolVectorFields,
+        resetFvPatchFlag
+    );
+
+    rebuildFields
+    (
+        surfaceScalarFields,
+        fieldReconstructor,
+        receivedSurfaceScalarFields,
+        resetFvPatchFlag
+    );
+
+    // Debug
+    checkMesh(true);
+
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMeshTemplates.C b/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalanceTemplates.C
similarity index 94%
rename from src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMeshTemplates.C
rename to src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalanceTemplates.C
index 75aa71569..992d1b6ac 100644
--- a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMeshTemplates.C
+++ b/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalanceTemplates.C
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "loadBalanceFvMesh.H"
+#include "topoChangerFvMesh.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class GeoField, class Decomposer>
-void Foam::loadBalanceFvMesh::sendFields
+void Foam::topoChangerFvMesh::sendFields
 (
     const HashTable<const GeoField*>& geoFields,
     const Decomposer& decomposer,
@@ -47,7 +47,6 @@ void Foam::loadBalanceFvMesh::sendFields
         iter
     )
     {
-        Pout<< "Sending field " << iter()->name() << " in slot " << fI << endl;
         // Encapsulate a field within a dictionary in order
         // to read it correctly on the receiving side
         toProc << iter()->name() << nl
@@ -62,7 +61,7 @@ void Foam::loadBalanceFvMesh::sendFields
 
 
 template<class GeoField, class Decomposer>
-void Foam::loadBalanceFvMesh::insertFields
+void Foam::topoChangerFvMesh::insertFields
 (
     const HashTable<const GeoField*>& geoFields,
     const Decomposer& decomposer,
@@ -96,15 +95,13 @@ void Foam::loadBalanceFvMesh::insertFields
             decomposer.decomposeField(*(iter()))
         );
 
-        Pout<< "Setting field " << localFields[fI][Pstream::myProcNo()].name()
-            << " in slot " << fI << endl;
         fI++;
     }
 }
 
 
 template<class GeoMesh, class GeoField>
-void Foam::loadBalanceFvMesh::receiveFields
+void Foam::topoChangerFvMesh::receiveFields
 (
     const label procIndex,
     List<PtrList<GeoField> >& receivedFields,
@@ -130,7 +127,6 @@ void Foam::loadBalanceFvMesh::receiveFields
     forAll (receivedFields, fI)
     {
         word fieldName(fromProc);
-        Pout<< "Receiving field " << fieldName << " in slot " << fI << endl;
 
         dictionary dict(fromProc);
 
@@ -156,7 +152,7 @@ void Foam::loadBalanceFvMesh::receiveFields
 
 
 template<class GeoField, class Reconstructor>
-void Foam::loadBalanceFvMesh::rebuildFields
+void Foam::topoChangerFvMesh::rebuildFields
 (
     const HashTable<const GeoField*>& geoFields,
     const Reconstructor& reconstructor,
@@ -220,7 +216,7 @@ void Foam::loadBalanceFvMesh::rebuildFields
         {
             FatalErrorIn
             (
-                "loadBalanceFvMesh::rebuildFields\n"
+                "topoChangerFvMesh::rebuildFields\n"
                 "(\n"
                 "    const HashTable<const GeoField*>& geoFields,\n"
                 "    const Reconstructor& reconstructor,\n"
@@ -234,7 +230,7 @@ void Foam::loadBalanceFvMesh::rebuildFields
         {
             FatalErrorIn
             (
-                "loadBalanceFvMesh::rebuildFields\n"
+                "topoChangerFvMesh::rebuildFields\n"
                 "(\n"
                 "    const HashTable<const GeoField*>& geoFields,\n"
                 "    const Reconstructor& reconstructor,\n"
@@ -323,7 +319,7 @@ void Foam::loadBalanceFvMesh::rebuildFields
                     << masterField.mesh().boundary()[patchI].size()
                     << endl;
 
-                patchFields[patchI].setSize
+                patchFields[patchI].resetSize
                 (
                     masterField.mesh().boundary()[patchI].size()
                 );

From 0469dc6287f12cdcf5efd3513216eeafb885365a Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 11 May 2018 18:33:27 +0100
Subject: [PATCH 38/45] Formatting

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

diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 3d4d18a49..975c4f809 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -338,7 +338,7 @@ autoPtr<mapPolyMesh> reorderMesh
     (
         new mapPolyMesh
         (
-            mesh,                       //const polyMesh& mesh,
+            mesh,                       // const polyMesh& mesh,
             mesh.nPoints(),             // nOldPoints,
             mesh.nFaces(),              // nOldFaces,
             mesh.nCells(),              // nOldCells,

From 5f8851bb50066a3eec44de3caa18c166cfe1a53d Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 14 May 2018 09:27:41 +0100
Subject: [PATCH 39/45] Fix resetPatch flag copy

---
 src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
index 57b7037fd..0087c4043 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
@@ -97,7 +97,8 @@ public:
             faceMap_(mpm),
             cellMap_(mpm),
             surfaceMap_(mesh, faceMap_),
-            boundaryMap_(mesh, faceMap_)
+            boundaryMap_(mesh, faceMap_),
+            resetPatchFlag_(mpm.resetPatchFlag())
         {}
 
 

From d6ae24615122f1fbb6e753252ba7518c2b085de9 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 15 May 2018 10:38:36 +0100
Subject: [PATCH 40/45] Bugfix: Initialisation of child array

---
 src/lduSolvers/amg/amgPolicy/pamgPolicy.C | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/lduSolvers/amg/amgPolicy/pamgPolicy.C b/src/lduSolvers/amg/amgPolicy/pamgPolicy.C
index 7dfcf61ec..ea0440099 100644
--- a/src/lduSolvers/amg/amgPolicy/pamgPolicy.C
+++ b/src/lduSolvers/amg/amgPolicy/pamgPolicy.C
@@ -64,7 +64,6 @@ void Foam::pamgPolicy::calcChild()
     if (matrix().diagonal())
     {
         // Diag only matrix.  Reset and return
-        child_ = 0;
         nCoarseEqns_ = 1;
 
         return;
@@ -152,14 +151,7 @@ void Foam::pamgPolicy::calcChild()
     {
         magOffDiag = mag(matrix().upper());
     }
-    else
-    {
-        // Diag only matrix.  Reset and return
-        child_ = 0;
-        nCoarseEqns_ = 1;
-
-        return;
-    }
+    // Diag only matrix already handled.  HJ, 21/Feb/2018
 
     nCoarseEqns_ = 0;
 
@@ -349,7 +341,7 @@ Foam::pamgPolicy::pamgPolicy
         groupSize,
         minCoarseEqns
     ),
-    child_(matrix.lduAddr().size()),
+    child_(),
     nSolo_(0),
     nCoarseEqns_(0),
     coarsen_(false)

From 84a5199d89f900375b879b8212e4b88e86166284 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 15 May 2018 10:43:07 +0100
Subject: [PATCH 41/45] Formatting

---
 .../decompositionMethod/decompositionMethod.C | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
index 49c47a009..111cca4e5 100644
--- a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -494,22 +494,24 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
 void Foam::decompositionMethod::loadExternalLibraries()
 {
     wordList libNames(3);
-    libNames[0]=word("scotchDecomp");
-    libNames[1]=word("metisDecomp");
-    libNames[2]=word("parMetisDecomp");
+    
+    libNames[0] = word("scotchDecomp");
+    libNames[1] = word("metisDecomp");
+    libNames[2] = word("parMetisDecomp");
 
-    forAll(libNames,i) {
+    forAll (libNames,i)
+    {
         const word libName("lib"+libNames[i]+".so");
 
-        //        Info << "Loading " << libName << endl;
+        bool ok = dlLibraryTable::open(libName);
 
-        bool ok=dlLibraryTable::open(libName);
-        if(!ok) {
+        if (!ok)
+        {
             WarningIn("decompositionMethod::loadExternalLibraries()")
                 << "Loading of decomposition library " << libName
-                    << " unsuccesful. Some decomposition methods may not be "
-                    << " available"
-                    << endl;
+                << " unsuccesful. Some decomposition methods may not be "
+                << "available"
+                << endl;
         }
     }
 }

From 0585614ac4f86b2d0847ed888dca4857396238b3 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 15 May 2018 10:43:31 +0100
Subject: [PATCH 42/45] Bugfix: explicit fvBoundaryMesh constructor

---
 src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
index e6a420db3..2974b5d78 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
@@ -93,7 +93,7 @@ public:
     // Constructors
 
         //- Construct from polyBoundaryMesh
-        fvBoundaryMesh(const fvMesh&);
+        explicit fvBoundaryMesh(const fvMesh&);
 
 
     // Destructor - default

From 0749aa16706375525d35bf4bb18e093f7777fd4e Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 15 May 2018 10:46:19 +0100
Subject: [PATCH 43/45] Compressible solver robustness improvements

---
 .../solvers/compressible/sonicDyMFoam/UEqn.H  |  5 +++-
 .../solvers/compressible/sonicFoam/pEqn.H     |  2 --
 .../engine/sonicTurbDyMEngineFoam/UEqn.H      |  5 +++-
 .../engine/sonicTurbDyMEngineFoam/hEqn.H      |  4 ++++
 .../engine/sonicTurbDyMEngineFoam/pEqn.H      |  4 ----
 .../sonicTurbDyMEngineFoam.C                  | 24 +++++++------------
 6 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/applications/solvers/compressible/sonicDyMFoam/UEqn.H b/applications/solvers/compressible/sonicDyMFoam/UEqn.H
index 54edd4e23..a6908756c 100644
--- a/applications/solvers/compressible/sonicDyMFoam/UEqn.H
+++ b/applications/solvers/compressible/sonicDyMFoam/UEqn.H
@@ -7,7 +7,10 @@
 
     UEqn.relax
     (
-        mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
+        mesh.solutionDict().equationRelaxationFactor
+        (
+            U.select(pimple.finalIter())
+        )
     );
 
     solve(UEqn == -fvc::grad(p));
diff --git a/applications/solvers/compressible/sonicFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/pEqn.H
index 686acebaa..bd9dab41a 100644
--- a/applications/solvers/compressible/sonicFoam/pEqn.H
+++ b/applications/solvers/compressible/sonicFoam/pEqn.H
@@ -27,8 +27,6 @@
             fvm::ddt(psis, p)
           + fvm::div(phid, p)
             // Convective flux relaxation terms
-          + fvm::SuSp(-divPhid, p)
-          + divPhid*p
           + fvc::div(phid2)
           - fvm::laplacian(rho*rUA, p)
         );
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H
index 9c11a3332..32bd0e614 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H
@@ -8,7 +8,10 @@
 
     UEqn.relax
     (
-        mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
+        mesh.solutionDict().equationRelaxationFactor
+        (
+            U.select(pimple.finalIter())
+        )
     );
 
     solve(UEqn == -fvc::grad(p));
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/hEqn.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/hEqn.H
index 530b4ef30..261366d08 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/hEqn.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/hEqn.H
@@ -12,4 +12,8 @@
     hEqn.solve();
 
     thermo.correct();
+
+    // Recalculate density
+    rho = thermo.rho();
+    rho.correctBoundaryConditions();
 }
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H
index 45d692a63..dd396282e 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H
@@ -1,6 +1,4 @@
 {
-    rho = thermo.rho();
-
     rUA = 1.0/UEqn.A();
     U = rUA*UEqn.H();
 
@@ -56,12 +54,10 @@
         p.relax();
     }
 
-#   include "rhoEqn.H"
 #   include "compressibleContinuityErrs.H"
 
     U -= rUA*fvc::grad(p);
     U.correctBoundaryConditions();
 
     DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
-    dpdt = fvc::ddt(p);
 }
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C b/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
index 587c19dc6..dd8707474 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
@@ -79,14 +79,15 @@ int main(int argc, char *argv[])
 
         Info<< "Crank angle = " << runTime.theta() << " CA-deg" << endl;
 
-        // Make flux absolute
-        phi += meshFlux;
+        // Make the fluxes absolute (using the ddt(rho, U) scheme)
+        phi += fvc::interpolate(rho)*fvc::meshPhi(rho, U);
 
         bool meshChanged = mesh.update();
 
 #       include "volContinuity.H"
 
-        mesh.setBoundaryVelocity(U);
+        // Make the fluxes relative (using the ddt(rho, U) scheme)
+        phi -= fvc::interpolate(rho)*fvc::meshPhi(rho, U);
 
         if (meshChanged)
         {
@@ -95,14 +96,7 @@ int main(int argc, char *argv[])
             rho.correctBoundaryConditions();
         }
 
-        meshFlux = fvc::interpolate(rho)*fvc::meshPhi(rho, U);
-
-        phi = fvc::interpolate(rho)
-            *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U));
-
-        DpDt = dpdt + fvc::div(phi/fvc::interpolate(rho), p)
-            - fvc::div(phi/fvc::interpolate(rho) + fvc::meshPhi(U))*p;
-
+        if (meshChanged)
         {
 #           include "compressibleCourantNo.H"
         }
@@ -111,22 +105,20 @@ int main(int argc, char *argv[])
         while (pimple.loop())
         {
 #           include "rhoEqn.H"
+#           include "hEqn.H"
 #           include "UEqn.H"
 
             // --- PISO loop
             while (pimple.correct())
             {
 #               include "pEqn.H"
-#               include "hEqn.H"
             }
+
+            turbulence->correct();
         }
 
-        turbulence->correct();
-
 #       include "logSummary.H"
 
-        rho = thermo.rho();
-
         runTime.write();
 
 #       include "infoDataOutput.H"

From 18f62ca66ae1f617098869e8e21a286832b35269 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 15 May 2018 10:53:12 +0100
Subject: [PATCH 44/45] Revert change: use fvMesh C for immersed boundary

---
 src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
index fc99a18f6..fe4f88f1d 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
@@ -146,8 +146,8 @@ tmp<vectorField> fvPatch::Cn() const
     // Get reference to global cell centres
     // Bugfix: access cell centres from fvMesh data, not polyMesh.
     // HJ, 30/Nov/2017
-    // const vectorField& gcc = boundaryMesh().mesh().C().internalField();
-    const vectorField& gcc = boundaryMesh().mesh().cellCentres();
+    const vectorField& gcc = boundaryMesh().mesh().C().internalField();
+    // const vectorField& gcc = boundaryMesh().mesh().cellCentres();
 
     forAll (faceCells, faceI)
     {

From 511d68e98a71493fa8d71d34595ac2024947563f Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 15 May 2018 10:53:40 +0100
Subject: [PATCH 45/45] Formatting and clean-up

---
 .../engineMesh/layeredEngineMesh/layeredEngineMesh.H       | 7 +++----
 src/engine/engineValve/engineValve.H                       | 1 +
 src/engine/engineVerticalValve/engineVerticalValve.C       | 3 +--
 src/engine/engineVerticalValve/engineVerticalValve.H       | 6 +-----
 src/engine/simpleEnginePiston/simpleEnginePiston.H         | 2 +-
 src/engine/simpleEngineTopoFvMesh/simpleEngineTopoFvMesh.H | 7 +++----
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
index 6b52bf01b..c54f42c14 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
+++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class layeredEngineMesh Declaration
+                    Class layeredEngineMesh Declaration
 \*---------------------------------------------------------------------------*/
 
 class layeredEngineMesh
@@ -77,9 +77,8 @@ public:
         layeredEngineMesh(const IOobject& io);
 
 
-    // Destructor
-
-        ~layeredEngineMesh();
+    //- Destructor
+    virtual ~layeredEngineMesh();
 
 
     // Member Functions
diff --git a/src/engine/engineValve/engineValve.H b/src/engine/engineValve/engineValve.H
index 1add80281..7c192018b 100644
--- a/src/engine/engineValve/engineValve.H
+++ b/src/engine/engineValve/engineValve.H
@@ -143,6 +143,7 @@ class engineValve
         //- Adjust crank angle to drop within the limits of the lift profile
         scalar adjustCrankAngle(const scalar theta) const;
 
+
 public:
 
     // Static data members
diff --git a/src/engine/engineVerticalValve/engineVerticalValve.C b/src/engine/engineVerticalValve/engineVerticalValve.C
index c8e4fcc19..a69c517a9 100644
--- a/src/engine/engineVerticalValve/engineVerticalValve.C
+++ b/src/engine/engineVerticalValve/engineVerticalValve.C
@@ -128,12 +128,11 @@ void Foam::engineVerticalValve::writeDict(Ostream& os) const
 {
     engineValve::writeDict(os);
 
-
     os  << "headPatch " << valveHeadPatch_.name() << token::END_STATEMENT << nl
         << "bottomLayerOffset " << bottomLayerOffset_
         << token::END_STATEMENT << nl
         << "bottomLayerOffsetayerTol " << bottomLayerTol_
-       << token::END_STATEMENT << nl
+        << token::END_STATEMENT << nl
         << "topLayerOffset " << topLayerOffset_ << token::END_STATEMENT << nl
         << "topLayerTol " << topLayerTol_ << token::END_STATEMENT << nl
         << "detachDistance " << detachDistance_ << token::END_STATEMENT << nl
diff --git a/src/engine/engineVerticalValve/engineVerticalValve.H b/src/engine/engineVerticalValve/engineVerticalValve.H
index 1fab38b4a..e8a6978fe 100644
--- a/src/engine/engineVerticalValve/engineVerticalValve.H
+++ b/src/engine/engineVerticalValve/engineVerticalValve.H
@@ -51,7 +51,7 @@ class polyMesh;
 class engineTime;
 
 /*---------------------------------------------------------------------------*\
-                          Class engineVerticalValve Declaration
+                    Class engineVerticalValve Declaration
 \*---------------------------------------------------------------------------*/
 
 class engineVerticalValve
@@ -93,12 +93,8 @@ class engineVerticalValve
         void operator=(const engineVerticalValve&);
 
 
-
 public:
 
-    // Static data members
-
-
     // Constructors
 
         //- Construct from components
diff --git a/src/engine/simpleEnginePiston/simpleEnginePiston.H b/src/engine/simpleEnginePiston/simpleEnginePiston.H
index 1bae20836..48ae5a4ad 100644
--- a/src/engine/simpleEnginePiston/simpleEnginePiston.H
+++ b/src/engine/simpleEnginePiston/simpleEnginePiston.H
@@ -47,7 +47,7 @@ class polyMesh;
 class engineTime;
 
 /*---------------------------------------------------------------------------*\
-                           Class simpleEnginePiston Declaration
+                     Class simpleEnginePiston Declaration
 \*---------------------------------------------------------------------------*/
 
 class simpleEnginePiston
diff --git a/src/engine/simpleEngineTopoFvMesh/simpleEngineTopoFvMesh.H b/src/engine/simpleEngineTopoFvMesh/simpleEngineTopoFvMesh.H
index fb348dbbb..91777a8f4 100644
--- a/src/engine/simpleEngineTopoFvMesh/simpleEngineTopoFvMesh.H
+++ b/src/engine/simpleEngineTopoFvMesh/simpleEngineTopoFvMesh.H
@@ -105,10 +105,9 @@ public:
         explicit simpleEngineTopoFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~simpleEngineTopoFvMesh()
-        {}
+    //- Destructor
+    virtual ~simpleEngineTopoFvMesh()
+    {}
 
 
     // Member Functions