From ae3d2f4d5757aa76220331966c5c087ed1ed4d72 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 16 Nov 2016 14:58:46 +0000
Subject: [PATCH] ENH: topoSet: clear sets upon writing modified mesh. Fixes
 #129.

---
 .../utilities/mesh/advanced/PDRMesh/PDRMesh.C |  97 +++++++++++++++-
 .../advanced/combinePatchFaces/Make/options   |   2 +
 .../combinePatchFaces/combinePatchFaces.C     |   6 +-
 .../mesh/advanced/modifyMesh/Make/options     |   3 +
 .../mesh/advanced/modifyMesh/modifyMesh.C     |  10 +-
 .../mesh/advanced/refineHexMesh/Make/options  |   5 +-
 .../advanced/refineHexMesh/refineHexMesh.C    |   5 +-
 .../advanced/refineWallLayer/Make/options     |   3 +
 .../refineWallLayer/refineWallLayer.C         |   5 +-
 .../mesh/advanced/removeFaces/Make/options    |   2 +
 .../mesh/advanced/removeFaces/removeFaces.C   |   5 +-
 .../extrude/extrudeMesh/Make/options          |   2 +
 .../extrude/extrudeMesh/extrudeMesh.C         |   5 +-
 .../extrude/extrudeToRegionMesh/Make/options  |   2 +
 .../extrudeToRegionMesh/extrudeToRegionMesh.C |   7 +-
 .../generation/extrude2DMesh/Make/options     |   3 +
 .../extrude2DMesh/extrude2DMeshApp.C          |   6 +-
 .../generation/snappyHexMesh/Make/options     |   2 +
 .../generation/snappyHexMesh/snappyHexMesh.C  |   6 +
 .../manipulation/createBaffles/Make/options   |   2 +
 .../createBaffles/createBaffles.C             |   6 +-
 .../manipulation/createPatch/Make/options     |   3 +
 .../manipulation/createPatch/createPatch.C    |   5 +-
 .../manipulation/mergeMeshes/Make/options     |   7 +-
 .../manipulation/mergeMeshes/mergeMeshes.C    |   6 +-
 .../mergeOrSplitBaffles/Make/options          |   4 +-
 .../mergeOrSplitBaffles/mergeOrSplitBaffles.C |   5 +-
 .../manipulation/polyDualMesh/Make/options    |   2 +
 .../polyDualMesh/polyDualMeshApp.C            |   6 +-
 .../manipulation/renumberMesh/renumberMesh.C  |  75 +++----------
 .../renumberMesh/renumberMeshDict             |   3 -
 .../mesh/manipulation/splitMesh/Make/options  |   3 +
 .../mesh/manipulation/splitMesh/splitMesh.C   |   6 +-
 .../splitMeshRegions/Make/options             |   6 +-
 .../splitMeshRegions/splitMeshRegions.C       |   5 +-
 .../mesh/manipulation/subsetMesh/Make/options |   5 +-
 .../mesh/manipulation/subsetMesh/subsetMesh.C | 105 +++++++++++++++++-
 .../reconstructParMesh/reconstructParMesh.C   |   4 +-
 .../redistributePar/redistributePar.C         |  52 +++++++++
 src/meshTools/sets/topoSets/cellSet.C         |  34 +++++-
 src/meshTools/sets/topoSets/cellSet.H         |   7 +-
 src/meshTools/sets/topoSets/faceSet.C         |  34 +++++-
 src/meshTools/sets/topoSets/faceSet.H         |   5 +-
 src/meshTools/sets/topoSets/pointSet.C        |  34 +++++-
 src/meshTools/sets/topoSets/pointSet.H        |   5 +-
 src/meshTools/sets/topoSets/topoSet.C         |  22 +++-
 src/meshTools/sets/topoSets/topoSet.H         |  29 ++++-
 .../sets/topoSets/topoSetTemplates.C          |  59 ++++++++++
 .../reconstruct/reconstruct/processorMeshes.C |  58 +++++++++-
 .../reconstruct/reconstruct/processorMeshes.H |   9 +-
 50 files changed, 674 insertions(+), 108 deletions(-)
 create mode 100644 src/meshTools/sets/topoSets/topoSetTemplates.C

diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 25c536e103..a8e1b3d89d 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +56,9 @@ Description
 #include "mapPolyMesh.H"
 #include "faceSet.H"
 #include "cellSet.H"
+#include "pointSet.H"
 #include "syncTools.H"
+#include "ReadFields.H"
 #include "polyTopoChange.H"
 #include "polyModifyFace.H"
 #include "polyAddFace.H"
@@ -315,6 +317,59 @@ void initCreatedPatches
 }
 
 
+template<class TopoSet>
+void subsetTopoSets
+(
+    const fvMesh& mesh,
+    const IOobjectList& objectsList,
+    const labelList& map,
+    const fvMesh& subMesh,
+    PtrList<TopoSet>& subSets
+)
+{
+    // Read original sets
+    PtrList<TopoSet> sets;
+    ReadFields<TopoSet>(objectsList, sets);
+
+    subSets.setSize(sets.size());
+    forAll(sets, i)
+    {
+        TopoSet& set = sets[i];
+
+        Info<< "Subsetting " << set.type() << " " << set.name() << endl;
+
+        // Map the data
+        PackedBoolList isSet(set.maxSize(mesh));
+        forAllConstIter(labelHashSet, set, iter)
+        {
+            isSet[iter.key()] = true;
+        }
+        label nSet = 0;
+        forAll(map, i)
+        {
+            if (isSet[map[i]])
+            {
+                nSet++;
+            }
+        }
+
+        subSets.set
+        (
+            i,
+            new TopoSet(subMesh, set.name(), nSet, IOobject::AUTO_WRITE)
+        );
+        TopoSet& subSet = subSets[i];
+        forAll(map, i)
+        {
+            if (isSet[map[i]])
+            {
+                subSet.insert(i);
+            }
+        }
+    }
+}
+
+
 void createCoupledBaffles
 (
     fvMesh& mesh,
@@ -923,6 +978,41 @@ int main(int argc, char *argv[])
         surfTensorFlds
     );
 
+
+    // Set handling
+    PtrList<cellSet> cellSets;
+    PtrList<faceSet> faceSets;
+    PtrList<pointSet> pointSets;
+    {
+        IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
+        subsetTopoSets
+        (
+            mesh,
+            objects,
+            subsetter.cellMap(),
+            subsetter.subMesh(),
+            cellSets
+        );
+        subsetTopoSets
+        (
+            mesh,
+            objects,
+            subsetter.faceMap(),
+            subsetter.subMesh(),
+            faceSets
+        );
+        subsetTopoSets
+        (
+            mesh,
+            objects,
+            subsetter.pointMap(),
+            subsetter.subMesh(),
+            pointSets
+        );
+    }
+
+
+
     if (!overwrite)
     {
         runTime++;
@@ -1134,6 +1224,11 @@ int main(int argc, char *argv[])
         Zero
     );
 
+    // Update numbering of topoSets
+    topoSet::updateMesh(subsetter.subMesh().facesInstance(), map, cellSets);
+    topoSet::updateMesh(subsetter.subMesh().facesInstance(), map, faceSets);
+    topoSet::updateMesh(subsetter.subMesh().facesInstance(), map, pointSets);
+
 
     // Move mesh (since morphing might not do this)
     if (map().hasMotionPoints())
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
index 3da3443a27..ff07063590 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
@@ -1,9 +1,11 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
 
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lreconstruct \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index 2666d4c9de..66cb396c81 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,6 +60,8 @@ Description
 #include "mapPolyMesh.H"
 #include "unitConversion.H"
 #include "motionSmoother.H"
+#include "topoSet.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -450,6 +452,8 @@ int main(int argc, char *argv[])
         Info<< "Writing morphed mesh to time " << runTime.timeName() << endl;
 
         mesh.write();
+        topoSet::removeFiles(mesh);
+        processorMeshes::removeFiles(mesh);
     }
     else
     {
diff --git a/applications/utilities/mesh/advanced/modifyMesh/Make/options b/applications/utilities/mesh/advanced/modifyMesh/Make/options
index 70c838b774..4e67ae71f1 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/Make/options
+++ b/applications/utilities/mesh/advanced/modifyMesh/Make/options
@@ -1,7 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
+    -lreconstruct \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index 661811afa8..f9b0e4ef2d 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,6 +62,8 @@ Description
 #include "meshTools.H"
 #include "Pair.H"
 #include "globalIndex.H"
+#include "topoSet.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -567,6 +569,8 @@ int main(int argc, char *argv[])
         // Write resulting mesh
         Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
         mesh.write();
+        topoSet::removeFiles(mesh);
+        processorMeshes::removeFiles(mesh);
     }
     else if (edgeToPos.size())
     {
@@ -641,6 +645,8 @@ int main(int argc, char *argv[])
         // Write resulting mesh
         Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
         mesh.write();
+        topoSet::removeFiles(mesh);
+        processorMeshes::removeFiles(mesh);
     }
     else
     {
@@ -684,6 +690,8 @@ int main(int argc, char *argv[])
         // Write resulting mesh
         Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
         mesh.write();
+        topoSet::removeFiles(mesh);
+        processorMeshes::removeFiles(mesh);
     }
 
 
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/Make/options b/applications/utilities/mesh/advanced/refineHexMesh/Make/options
index baa7b45f00..554d59b25d 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/Make/options
+++ b/applications/utilities/mesh/advanced/refineHexMesh/Make/options
@@ -1,11 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
-
 EXE_LIBS = \
+    -lreconstruct \
     -ldynamicMesh \
-    -lmeshTools \
-    -lfiniteVolume \
     -lgenericPatchFields
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index fcdd7ec8f1..bfa6dadce6 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,6 +49,7 @@ Description
 #include "surfaceFields.H"
 #include "pointFields.H"
 #include "ReadFields.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -197,6 +198,8 @@ int main(int argc, char *argv[])
 
     mesh.write();
     meshCutter.write();
+    topoSet::removeFiles(mesh);
+    processorMeshes::removeFiles(mesh);
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/Make/options b/applications/utilities/mesh/advanced/refineWallLayer/Make/options
index 7349856cab..19716ca4ec 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/Make/options
+++ b/applications/utilities/mesh/advanced/refineWallLayer/Make/options
@@ -1,7 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 EXE_LIBS = \
     -ldynamicMesh \
+    -lreconstruct \
     -lmeshTools
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index 2fc8f5ec3e..e8d84ab180 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,6 +53,7 @@ Description
 #include "cellCuts.H"
 #include "cellSet.H"
 #include "meshCutter.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -257,6 +258,8 @@ int main(int argc, char *argv[])
     Info<< "Writing refined mesh to time " << runTime.timeName() << endl;
 
     mesh.write();
+    topoSet::removeFiles(mesh);
+    processorMeshes::removeFiles(mesh);
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/mesh/advanced/removeFaces/Make/options b/applications/utilities/mesh/advanced/removeFaces/Make/options
index 63c5dc5d78..b23c26cceb 100644
--- a/applications/utilities/mesh/advanced/removeFaces/Make/options
+++ b/applications/utilities/mesh/advanced/removeFaces/Make/options
@@ -1,10 +1,12 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
     -ldynamicMesh \
     -lfiniteVolume \
+    -lreconstruct \
     -lgenericPatchFields
diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
index ca82886601..31989eca13 100644
--- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
+++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,6 +44,7 @@ Description
 #include "ReadFields.H"
 #include "volFields.H"
 #include "surfaceFields.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -179,6 +180,8 @@ int main(int argc, char *argv[])
     // Take over refinement levels and write to new time directory.
     Pout<< "Writing mesh to time " << runTime.timeName() << endl;
     mesh.write();
+    topoSet::removeFiles(mesh);
+    processorMeshes::removeFiles(mesh);
 
     Pout<< "End\n" << endl;
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
index 94b355be3c..517a98473f 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
@@ -4,6 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 EXE_LIBS = \
@@ -11,4 +12,5 @@ EXE_LIBS = \
     -lsurfMesh \
     -lmeshTools \
     -ldynamicMesh \
+    -lreconstruct \
     -lextrudeModel
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index f4a01a7f89..c1d35e4a51 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,6 +56,7 @@ Description
 #include "wedgePolyPatch.H"
 #include "planeExtrusion.H"
 #include "emptyPolyPatch.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -1058,6 +1059,8 @@ int main(int argc, char *argv[])
         FatalErrorInFunction
             << exit(FatalError);
     }
+    // Remove any left-over files
+    processorMeshes::removeFiles(mesh);
 
     // Need writing cellSet
     label nAdded = returnReduce(addedCellsSet.size(), sumOp<label>());
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
index 49cad25f21..c34e494c47 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 EXE_LIBS = \
@@ -10,4 +11,5 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -ldynamicMesh \
+    -lreconstruct \
     -lextrudeModel
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index e19eecd753..2bbbf4a9f9 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -141,6 +141,7 @@ Notes:
 #include "fvMeshTools.H"
 #include "OBJstream.H"
 #include "PatchTools.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -2646,6 +2647,8 @@ int main(int argc, char *argv[])
             << " at location " << regionMesh.facesInstance()
             << exit(FatalError);
     }
+    topoSet::removeFiles(regionMesh);
+    processorMeshes::removeFiles(regionMesh);
 
 
     // See if we need to extrude coordinates as well
@@ -2847,6 +2850,8 @@ int main(int argc, char *argv[])
                 << " at location " << mesh.facesInstance()
                 << exit(FatalError);
         }
+        topoSet::removeFiles(mesh);
+        processorMeshes::removeFiles(mesh);
     }
 
     Info << "End\n" << endl;
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/Make/options b/applications/utilities/mesh/generation/extrude2DMesh/Make/options
index 3be2f34c18..afc245ed1d 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude2DMesh/Make/options
@@ -2,11 +2,14 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -Iextrude2DMesh/lnInclude \
     -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 EXE_LIBS = \
     -lsurfMesh \
     -ldynamicMesh \
+    -lreconstruct \
     -lextrude2DMesh \
     -lextrudeModel
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index 7a7cdadbb6..f10a593a29 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,6 +47,8 @@ Note
 #include "addPatchCellLayer.H"
 #include "patchToPoly2DMesh.H"
 #include "globalIndex.H"
+#include "topoSet.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -323,6 +325,8 @@ int main(int argc, char *argv[])
         << nl << endl;
 
     mesh().write();
+    topoSet::removeFiles(mesh());
+    processorMeshes::removeFiles(mesh());
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index 465393696a..40ccd9c2ce 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -9,6 +9,7 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
@@ -22,4 +23,5 @@ EXE_LIBS = \
     -lfileFormats \
     -ldynamicMesh \
     -ldecompose \
+    -lreconstruct \
     -lsnappyHexMesh
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 1f4414fcbd..3dbbcbcb65 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -63,6 +63,7 @@ Description
 #include "decompositionModel.H"
 #include "fvMeshTools.H"
 #include "profiling.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -673,6 +674,11 @@ void writeMesh
         meshRefinement::writeType(writeLevel | meshRefinement::WRITEMESH),
         mesh.time().path()/meshRefiner.timeName()
     );
+    processorMeshes::removeFiles(mesh);
+    if (!debugLevel)
+    {
+        topoSet::removeFiles(mesh);
+    }
     Info<< "Wrote mesh in = "
         << mesh.time().cpuTimeIncrement() << " s." << endl;
 }
diff --git a/applications/utilities/mesh/manipulation/createBaffles/Make/options b/applications/utilities/mesh/manipulation/createBaffles/Make/options
index 3c8db28129..e0ff9c1f82 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/Make/options
+++ b/applications/utilities/mesh/manipulation/createBaffles/Make/options
@@ -2,10 +2,12 @@ EXE_INC = \
     -IfaceSelection \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -ldynamicMesh \
     -lmeshTools \
     -lfiniteVolume \
+    -lreconstruct \
     -lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 0b0c06681d..7c7e02da96 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,6 +53,8 @@ Description
 #include "faceSelection.H"
 
 #include "fvMeshTools.H"
+#include "topoSet.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -978,6 +980,8 @@ int main(int argc, char *argv[])
     Info<< "Writing mesh to " << runTime.timeName() << endl;
 
     mesh.write();
+    topoSet::removeFiles(mesh);
+    processorMeshes::removeFiles(mesh);
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/mesh/manipulation/createPatch/Make/options b/applications/utilities/mesh/manipulation/createPatch/Make/options
index 73f34b0f85..3d7ac99ffe 100644
--- a/applications/utilities/mesh/manipulation/createPatch/Make/options
+++ b/applications/utilities/mesh/manipulation/createPatch/Make/options
@@ -1,7 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -ldynamicMesh \
+    -lreconstruct \
     -lmeshTools
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index e6b2d1b733..6228382d99 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,6 +52,7 @@ Description
 #include "polyTopoChange.H"
 #include "polyModifyFace.H"
 #include "wordReList.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -900,6 +901,8 @@ int main(int argc, char *argv[])
     // Write resulting mesh
     Info<< "Writing repatched mesh to " << runTime.timeName() << nl << endl;
     mesh.write();
+    topoSet::removeFiles(mesh);
+    processorMeshes::removeFiles(mesh);
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/Make/options b/applications/utilities/mesh/manipulation/mergeMeshes/Make/options
index 21b17b14c9..74135665e2 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/Make/options
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/Make/options
@@ -1,6 +1,9 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
 
 EXE_LIBS = \
     -ldynamicMesh \
-    -lmeshTools
+    -lreconstruct
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index cb80039e79..67eb9f5c7b 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,6 +35,8 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "mergePolyMesh.H"
+#include "topoSet.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -163,6 +165,8 @@ int main(int argc, char *argv[])
     }
 
     masterMesh.write();
+    topoSet::removeFiles(masterMesh);
+    processorMeshes::removeFiles(masterMesh);
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
index 523fc41d30..6a553ef8da 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
@@ -1,10 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
     -lgenericPatchFields \
-    -lmeshTools \
+    -lreconstruct \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index ab692d4706..aa1450c452 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -63,6 +63,7 @@ Description
 #include "ReadFields.H"
 #include "volFields.H"
 #include "surfaceFields.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -362,6 +363,8 @@ int main(int argc, char *argv[])
     }
     Pout<< "Writing mesh to time " << runTime.timeName() << endl;
     mesh.write();
+    topoSet::removeFiles(mesh);
+    processorMeshes::removeFiles(mesh);
 
     // Dump duplicated points (if any)
     if (split)
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/Make/options b/applications/utilities/mesh/manipulation/polyDualMesh/Make/options
index f3d9c89aac..5000500541 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/Make/options
@@ -1,10 +1,12 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lgenericPatchFields \
     -ldynamicMesh \
+    -lreconstruct \
     -lmeshTools
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
index 58e4499c12..4dcb38ae11 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -74,6 +74,8 @@ Note
 #include "ReadFields.H"
 #include "volFields.H"
 #include "surfaceFields.H"
+#include "topoSet.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -552,6 +554,8 @@ int main(int argc, char *argv[])
     Info<< "Writing dual mesh to " << runTime.timeName() << endl;
 
     mesh.write();
+    topoSet::removeFiles(mesh);
+    processorMeshes::removeFiles(mesh);
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 1e324be2ed..32d0d87db9 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -696,7 +696,6 @@ int main(int argc, char *argv[])
     bool writeMaps = false;
     bool orderPoints = false;
     label blockSize = 0;
-    bool renumberSets = true;
 
     // Construct renumberMethod
     autoPtr<IOdictionary> renumberDictPtr;
@@ -756,8 +755,6 @@ int main(int argc, char *argv[])
             Info<< "Writing renumber maps (new to old) to polyMesh." << nl
                 << endl;
         }
-
-        renumberSets = renumberDict.lookupOrDefault("renumberSets", true);
     }
     else
     {
@@ -884,46 +881,12 @@ int main(int argc, char *argv[])
     PtrList<cellSet> cellSets;
     PtrList<faceSet> faceSets;
     PtrList<pointSet> pointSets;
-    if (renumberSets)
     {
         // Read sets
         IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
-        {
-            IOobjectList cSets(objects.lookupClass(cellSet::typeName));
-            if (cSets.size())
-            {
-                Info<< "Reading cellSets:" << endl;
-                forAllConstIter(IOobjectList, cSets, iter)
-                {
-                    cellSets.append(new cellSet(*iter()));
-                    Info<< "    " << cellSets.last().name() << endl;
-                }
-            }
-        }
-        {
-            IOobjectList fSets(objects.lookupClass(faceSet::typeName));
-            if (fSets.size())
-            {
-                Info<< "Reading faceSets:" << endl;
-                forAllConstIter(IOobjectList, fSets, iter)
-                {
-                    faceSets.append(new faceSet(*iter()));
-                    Info<< "    " << faceSets.last().name() << endl;
-                }
-            }
-        }
-        {
-            IOobjectList pSets(objects.lookupClass(pointSet::typeName));
-            if (pSets.size())
-            {
-                Info<< "Reading pointSets:" << endl;
-                forAllConstIter(IOobjectList, pSets, iter)
-                {
-                    pointSets.append(new pointSet(*iter()));
-                    Info<< "    " << pointSets.last().name() << endl;
-                }
-            }
-        }
+        ReadFields(objects, cellSets);
+        ReadFields(objects, faceSets);
+        ReadFields(objects, pointSets);
     }
 
 
@@ -1288,9 +1251,18 @@ int main(int argc, char *argv[])
     {
         mesh.setInstance(oldInstance);
     }
+    else
+    {
+        mesh.setInstance(runTime.timeName());
+    }
+
 
     Info<< "Writing mesh to " << mesh.facesInstance() << endl;
 
+    topoSet::updateMesh(mesh.facesInstance(), map(), cellSets);
+    topoSet::updateMesh(mesh.facesInstance(), map(), faceSets);
+    topoSet::updateMesh(mesh.facesInstance(), map(), pointSets);
+
     mesh.write();
 
     if (cellProcAddressing.headerOk())
@@ -1437,27 +1409,6 @@ int main(int argc, char *argv[])
         ).write();
     }
 
-    if (renumberSets)
-    {
-        forAll(cellSets, i)
-        {
-            cellSets[i].updateMesh(map());
-            cellSets[i].instance() = mesh.facesInstance();
-            cellSets[i].write();
-        }
-        forAll(faceSets, i)
-        {
-            faceSets[i].updateMesh(map());
-            faceSets[i].instance() = mesh.facesInstance();
-            faceSets[i].write();
-        }
-        forAll(pointSets, i)
-        {
-            pointSets[i].updateMesh(map());
-            pointSets[i].instance() = mesh.facesInstance();
-            pointSets[i].write();
-        }
-    }
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
index db31243bfe..c6321991cc 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
@@ -34,9 +34,6 @@ sortCoupledFaceCells false;
 // Optional entry: sort points into internal and boundary points
 //orderPoints false;
 
-// Optional: suppress renumbering cellSets,faceSets,pointSets
-//renumberSets false;
-
 
 method          CuthillMcKee;
 //method          Sloan;
diff --git a/applications/utilities/mesh/manipulation/splitMesh/Make/options b/applications/utilities/mesh/manipulation/splitMesh/Make/options
index 73f34b0f85..3d7ac99ffe 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/splitMesh/Make/options
@@ -1,7 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -ldynamicMesh \
+    -lreconstruct \
     -lmeshTools
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index 536cf41c10..166ffae4f5 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,6 +56,7 @@ Description
 #include "attachPolyTopoChanger.H"
 #include "regionSide.H"
 #include "primitiveFacePatch.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -287,6 +288,9 @@ int main(int argc, char *argv[])
             << "Failed writing polyMesh."
             << exit(FatalError);
     }
+    topoSet::removeFiles(mesh);
+    processorMeshes::removeFiles(mesh);
+
 
     Info<< nl << "End" << nl << endl;
 
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options b/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
index da1b9c5016..554d59b25d 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
@@ -1,10 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
-    -lgenericPatchFields \
+    -lreconstruct \
     -ldynamicMesh \
-    -lmeshTools
+    -lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 3c8dc794f7..2359e1c39c 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -107,6 +107,7 @@ Description
 #include "mappedWallPolyPatch.H"
 #include "fvMeshTools.H"
 #include "zeroGradientFvPatchFields.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -941,6 +942,8 @@ void createAndWriteRegion
 
     newMesh().setInstance(newMeshInstance);
     newMesh().write();
+    topoSet::removeFiles(newMesh());
+    processorMeshes::removeFiles(newMesh());
 
     // Write addressing files like decomposePar
     Info<< "Writing addressing to base mesh" << endl;
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/Make/options b/applications/utilities/mesh/manipulation/subsetMesh/Make/options
index c92e38fddf..a6ea0aba6c 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/subsetMesh/Make/options
@@ -1,9 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
 
 EXE_LIBS = \
     -ldynamicMesh \
-    -ldynamicMesh \
+    -lreconstruct \
     -lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 7af8edb75a..4e03eb9cc8 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,11 +41,15 @@ Description
 
 #include "fvMeshSubset.H"
 #include "argList.H"
-#include "cellSet.H"
 #include "IOobjectList.H"
 #include "volFields.H"
 #include "topoDistanceData.H"
 #include "FaceCellWave.H"
+#include "cellSet.H"
+#include "faceSet.H"
+#include "pointSet.H"
+#include "ReadFields.H"
+#include "processorMeshes.H"
 
 using namespace Foam;
 
@@ -262,6 +266,59 @@ void subsetDimensionedFields
 }
 
 
+template<class TopoSet>
+void subsetTopoSets
+(
+    const fvMesh& mesh,
+    const IOobjectList& objectsList,
+    const labelList& map,
+    const fvMesh& subMesh,
+    PtrList<TopoSet>& subSets
+)
+{
+    // Read original sets
+    PtrList<TopoSet> sets;
+    ReadFields<TopoSet>(objectsList, sets);
+
+    subSets.setSize(sets.size());
+    forAll(sets, i)
+    {
+        TopoSet& set = sets[i];
+
+        Info<< "Subsetting " << set.type() << " " << set.name() << endl;
+
+        // Map the data
+        PackedBoolList isSet(set.maxSize(mesh));
+        forAllConstIter(labelHashSet, set, iter)
+        {
+            isSet[iter.key()] = true;
+        }
+        label nSet = 0;
+        forAll(map, i)
+        {
+            if (isSet[map[i]])
+            {
+                nSet++;
+            }
+        }
+
+        subSets.set
+        (
+            i,
+            new TopoSet(subMesh, set.name(), nSet, IOobject::AUTO_WRITE)
+        );
+        TopoSet& subSet = subSets[i];
+        forAll(map, i)
+        {
+            if (isSet[map[i]])
+            {
+                subSet.insert(i);
+            }
+        }
+    }
+}
+
+
 
 int main(int argc, char *argv[])
 {
@@ -557,6 +614,43 @@ int main(int argc, char *argv[])
     subsetDimensionedFields(subsetter, tensorDimNames, tensorDimFlds);
 
 
+    // topoSets and subset
+    // ~~~~~~~~~~~~~~~~~~~
+
+    PtrList<cellSet> cellSets;
+    PtrList<faceSet> faceSets;
+    PtrList<pointSet> pointSets;
+    {
+        IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
+        objects.remove(currentSet);
+        subsetTopoSets
+        (
+            mesh,
+            objects,
+            subsetter.cellMap(),
+            subsetter.subMesh(),
+            cellSets
+        );
+        subsetTopoSets
+        (
+            mesh,
+            objects,
+            subsetter.faceMap(),
+            subsetter.subMesh(),
+            faceSets
+        );
+        subsetTopoSets
+        (
+            mesh,
+            objects,
+            subsetter.pointMap(),
+            subsetter.subMesh(),
+            pointSets
+        );
+    }
+
+
+
     // Write mesh and fields to new time
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -564,15 +658,22 @@ int main(int argc, char *argv[])
     {
         runTime.setTime(instant(fieldsInstance), 0);
         subsetter.subMesh().setInstance(meshInstance);
+        topoSet::setInstance(meshInstance, cellSets);
+        topoSet::setInstance(meshInstance, faceSets);
+        topoSet::setInstance(meshInstance, pointSets);
     }
     else
     {
         runTime++;
+        subsetter.subMesh().setInstance(runTime.timeName());
     }
 
+
+
     Info<< "Writing subsetted mesh and fields to time " << runTime.timeName()
         << endl;
     subsetter.subMesh().write();
+    processorMeshes::removeFiles(subsetter.subMesh());
 
 
     // Subsetting adds 'subset' prefix. Rename field to be like original.
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index cfc68418e3..251b6523f4 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,6 +53,7 @@ Description
 #include "fvMeshAdder.H"
 #include "polyTopoChange.H"
 #include "extrapolatedCalculatedFvPatchFields.H"
+#include "topoSet.H"
 
 using namespace Foam;
 
@@ -731,6 +732,7 @@ int main(int argc, char *argv[])
                     << "Failed writing polyMesh."
                     << exit(FatalError);
             }
+            topoSet::removeFiles(masterMesh);
 
             if (writeCellDist)
             {
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 65ebbc1c6f..25030ac9c1 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -75,6 +75,7 @@ Usage
 #include "processorFvPatchField.H"
 #include "zeroGradientFvPatchFields.H"
 #include "decompositionModel.H"
+#include "topoSet.H"
 
 #include "parFvFieldReconstructor.H"
 #include "parLagrangianRedistributor.H"
@@ -1136,6 +1137,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
             runTime.TimePaths::caseName() = baseRunTime.caseName();
 
             mesh.write();
+            topoSet::removeFiles(mesh);
 
             // Now we've written all. Reset caseName on master
             Info<< "Restoring caseName to " << proc0CaseName << endl;
@@ -1145,6 +1147,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
     else
     {
         mesh.write();
+        topoSet::removeFiles(mesh);
     }
     Info<< "Written redistributed mesh to " << mesh.facesInstance() << nl
         << endl;
@@ -1209,6 +1212,55 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
         }
     }
 
+    //// Sets. Disabled for now.
+    //{
+    //    // Read sets
+    //    if (Pstream::master() && decompose)
+    //    {
+    //        runTime.TimePaths::caseName() = baseRunTime.caseName();
+    //    }
+    //    IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
+    //
+    //    PtrList<cellSet> cellSets;
+    //    ReadFields(objects, cellSets);
+    //
+    //    if (Pstream::master() && decompose)
+    //    {
+    //        runTime.TimePaths::caseName() = proc0CaseName;
+    //    }
+    //
+    //    forAll(cellSets, i)
+    //    {
+    //        cellSets[i].distribute(map);
+    //    }
+    //
+    //    if (nDestProcs == 1)
+    //    {
+    //        if (Pstream::master())
+    //        {
+    //            Info<< "Setting caseName to " << baseRunTime.caseName()
+    //                << " to write reconstructed refinement data." << endl;
+    //            runTime.TimePaths::caseName() = baseRunTime.caseName();
+    //
+    //            forAll(cellSets, i)
+    //            {
+    //                cellSets[i].distribute(map);
+    //            }
+    //
+    //            // Now we've written all. Reset caseName on master
+    //            Info<< "Restoring caseName to " << proc0CaseName << endl;
+    //            runTime.TimePaths::caseName() = proc0CaseName;
+    //        }
+    //    }
+    //    else
+    //    {
+    //        forAll(cellSets, i)
+    //        {
+    //            cellSets[i].distribute(map);
+    //        }
+    //    }
+    //}
+
 
     return autoPtr<mapDistributePolyMesh>
     (
diff --git a/src/meshTools/sets/topoSets/cellSet.C b/src/meshTools/sets/topoSets/cellSet.C
index 956e07714d..c38bb209c6 100644
--- a/src/meshTools/sets/topoSets/cellSet.C
+++ b/src/meshTools/sets/topoSets/cellSet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +28,7 @@ License
 #include "polyMesh.H"
 #include "Time.H"
 #include "addToRunTimeSelectionTable.H"
+#include "mapDistributePolyMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -228,6 +229,37 @@ void cellSet::updateMesh(const mapPolyMesh& morphMap)
 }
 
 
+void cellSet::distribute(const mapDistributePolyMesh& map)
+{
+    boolList inSet(map.nOldCells());
+    forAllConstIter(cellSet, *this, iter)
+    {
+        inSet[iter.key()] = true;
+    }
+    map.distributeCellData(inSet);
+
+    // Count
+    label n = 0;
+    forAll(inSet, celli)
+    {
+        if (inSet[celli])
+        {
+            n++;
+        }
+    }
+
+    clear();
+    resize(n);
+    forAll(inSet, celli)
+    {
+        if (inSet[celli])
+        {
+            insert(celli);
+        }
+    }
+}
+
+
 void Foam::cellSet::writeDebug
 (
     Ostream& os,
diff --git a/src/meshTools/sets/topoSets/cellSet.H b/src/meshTools/sets/topoSets/cellSet.H
index e7974486e4..4f02b2cdb6 100644
--- a/src/meshTools/sets/topoSets/cellSet.H
+++ b/src/meshTools/sets/topoSets/cellSet.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -147,9 +147,12 @@ public:
         //- Return max index+1.
         virtual label maxSize(const polyMesh& mesh) const;
 
-        //- Update any stored data for new labels
+        //- Update any stored data for new labels.
         virtual void updateMesh(const mapPolyMesh& morphMap);
 
+        //- Update any stored data for mesh redistribution.
+        virtual void distribute(const mapDistributePolyMesh&);
+
         //- Write maxLen items with label and coordinates.
         virtual void writeDebug
         (
diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index 52622b3dc6..7049f36a66 100644
--- a/src/meshTools/sets/topoSets/faceSet.C
+++ b/src/meshTools/sets/topoSets/faceSet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,7 @@ License
 #include "mapPolyMesh.H"
 #include "polyMesh.H"
 #include "syncTools.H"
+#include "mapDistributePolyMesh.H"
 
 #include "addToRunTimeSelectionTable.H"
 
@@ -161,6 +162,37 @@ void faceSet::updateMesh(const mapPolyMesh& morphMap)
 }
 
 
+void faceSet::distribute(const mapDistributePolyMesh& map)
+{
+    boolList inSet(map.nOldFaces());
+    forAllConstIter(faceSet, *this, iter)
+    {
+        inSet[iter.key()] = true;
+    }
+    map.distributeFaceData(inSet);
+
+    // Count
+    label n = 0;
+    forAll(inSet, facei)
+    {
+        if (inSet[facei])
+        {
+            n++;
+        }
+    }
+
+    clear();
+    resize(n);
+    forAll(inSet, facei)
+    {
+        if (inSet[facei])
+        {
+            insert(facei);
+        }
+    }
+}
+
+
 void faceSet::writeDebug
 (
     Ostream& os,
diff --git a/src/meshTools/sets/topoSets/faceSet.H b/src/meshTools/sets/topoSets/faceSet.H
index 7586a9c87e..75b5f817d1 100644
--- a/src/meshTools/sets/topoSets/faceSet.H
+++ b/src/meshTools/sets/topoSets/faceSet.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -116,6 +116,9 @@ public:
         //- Update any stored data for new labels
         virtual void updateMesh(const mapPolyMesh& morphMap);
 
+        //- Update any stored data for mesh redistribution.
+        virtual void distribute(const mapDistributePolyMesh&);
+
         //- Write maxLen items with label and coordinates.
         virtual void writeDebug
         (
diff --git a/src/meshTools/sets/topoSets/pointSet.C b/src/meshTools/sets/topoSets/pointSet.C
index 925de24908..e9d3542cf7 100644
--- a/src/meshTools/sets/topoSets/pointSet.C
+++ b/src/meshTools/sets/topoSets/pointSet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,7 @@ License
 #include "mapPolyMesh.H"
 #include "polyMesh.H"
 #include "syncTools.H"
+#include "mapDistributePolyMesh.H"
 
 #include "addToRunTimeSelectionTable.H"
 
@@ -156,6 +157,37 @@ void pointSet::updateMesh(const mapPolyMesh& morphMap)
 }
 
 
+void pointSet::distribute(const mapDistributePolyMesh& map)
+{
+    boolList inSet(map.nOldPoints());
+    forAllConstIter(pointSet, *this, iter)
+    {
+        inSet[iter.key()] = true;
+    }
+    map.distributePointData(inSet);
+
+    // Count
+    label n = 0;
+    forAll(inSet, pointi)
+    {
+        if (inSet[pointi])
+        {
+            n++;
+        }
+    }
+
+    clear();
+    resize(n);
+    forAll(inSet, pointi)
+    {
+        if (inSet[pointi])
+        {
+            insert(pointi);
+        }
+    }
+}
+
+
 void pointSet::writeDebug
 (
     Ostream& os,
diff --git a/src/meshTools/sets/topoSets/pointSet.H b/src/meshTools/sets/topoSets/pointSet.H
index 2bd396de85..e5f92b1205 100644
--- a/src/meshTools/sets/topoSets/pointSet.H
+++ b/src/meshTools/sets/topoSets/pointSet.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -119,6 +119,9 @@ public:
         //- Update any stored data for new labels
         //virtual void updateMesh(const polyTopoChange& meshMod);
 
+        //- Update any stored data for mesh redistribution.
+        virtual void distribute(const mapDistributePolyMesh&);
+
         //- Write maxLen items with label and coordinates.
         virtual void writeDebug
         (
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 23127c2358..d5c2491a1d 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -550,6 +550,26 @@ void Foam::topoSet::updateMesh(const mapPolyMesh&)
 }
 
 
+void Foam::topoSet::removeFiles(const polyMesh& mesh)
+{
+    IOobject io
+    (
+        "dummy",
+        mesh.facesInstance(),
+        mesh.meshSubDir/"sets",
+        mesh
+    );
+    fileName setsDir(io.path());
+
+    if (debug) DebugVar(setsDir);
+
+    if (isDir(setsDir))
+    {
+        rmDir(setsDir);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 void Foam::topoSet::operator=(const topoSet& rhs)
diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/sets/topoSets/topoSet.H
index ffdc64ca48..3d0ec883b9 100644
--- a/src/meshTools/sets/topoSets/topoSet.H
+++ b/src/meshTools/sets/topoSets/topoSet.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +32,7 @@ Description
 
 SourceFiles
     topoSet.C
+    topoSetTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -54,6 +55,7 @@ namespace Foam
 class mapPolyMesh;
 class polyMesh;
 class primitiveMesh;
+class mapDistributePolyMesh;
 
 /*---------------------------------------------------------------------------*\
                            Class topoSet Declaration
@@ -297,9 +299,28 @@ public:
         //- Update any stored data for new labels. Not implemented.
         virtual void updateMesh(const mapPolyMesh& morphMap);
 
+        //- Update any stored data for mesh redistribution.
+        virtual void distribute(const mapDistributePolyMesh&) = 0;
+
         //- Return max allowable index (+1). Not implemented.
         virtual label maxSize(const polyMesh& mesh) const = 0;
 
+        //- Helper: call updateMesh on all sets in container (and
+        //  updates instance)
+        template<class Container>
+        static void updateMesh
+        (
+            const fileName& instance,
+            const mapPolyMesh&,
+            Container&
+        );
+
+        //- Helper: set instance on all sets in container
+        template<class Container>
+        static void setInstance(const fileName& instance, Container&);
+
+        //- Helper: remove all sets files from mesh instance
+        static void removeFiles(const polyMesh&);
 
 
     // Member operators
@@ -316,6 +337,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+    #include "topoSetTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/meshTools/sets/topoSets/topoSetTemplates.C b/src/meshTools/sets/topoSets/topoSetTemplates.C
new file mode 100644
index 0000000000..58f62c50cf
--- /dev/null
+++ b/src/meshTools/sets/topoSets/topoSetTemplates.C
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Container>
+void Foam::topoSet::setInstance
+(
+    const fileName& instance,
+    Container& lst
+)
+{
+    forAll(lst, i)
+    {
+        lst[i].instance() = instance;
+    }
+}
+
+
+template<class Container>
+void Foam::topoSet::updateMesh
+(
+    const fileName& instance,
+    const mapPolyMesh& map,
+    Container& lst
+)
+{
+    forAll(lst, i)
+    {
+        lst[i].instance() = instance;
+        lst[i].updateMesh(map);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C
index 47bd1166d0..b678c4f654 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.C
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,14 @@ License
 #include "Time.H"
 #include "primitiveMesh.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(processorMeshes, 0);
+}
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::processorMeshes::read()
@@ -259,4 +267,52 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
 }
 
 
+void Foam::processorMeshes::removeFiles(const polyMesh& mesh)
+{
+    fileName pointPath
+    (
+        IOobject
+        (
+            "pointProcAddressing",
+            mesh.facesInstance(),
+            mesh.meshSubDir,
+            mesh
+        ).objectPath()
+    );
+    if (debug) DebugVar(pointPath);
+    rm(pointPath);
+
+    rm
+    (
+        IOobject
+        (
+            "faceProcAddressing",
+            mesh.facesInstance(),
+            mesh.meshSubDir,
+            mesh
+        ).objectPath()
+    );
+    rm
+    (
+        IOobject
+        (
+            "cellProcAddressing",
+            mesh.facesInstance(),
+            mesh.meshSubDir,
+            mesh
+        ).objectPath()
+    );
+    rm
+    (
+        IOobject
+        (
+            "boundaryProcAddressing",
+            mesh.facesInstance(),
+            mesh.meshSubDir,
+            mesh
+        ).objectPath()
+    );
+}
+
+
 // ************************************************************************* //
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.H b/src/parallel/reconstruct/reconstruct/processorMeshes.H
index f9ffbc182f..4f33212656 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.H
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,6 +89,10 @@ class processorMeshes
 
 public:
 
+    //- Runtime type information
+    ClassName("processorMeshes");
+
+
     // Constructors
 
         //- Construct from components
@@ -133,7 +137,8 @@ public:
             return boundaryProcAddressing_;
         }
 
-
+        //- Helper: remove all procAddressing files from mesh instance
+        static void removeFiles(const polyMesh& mesh);
 };