From 4a77294c7c12bde16990f0b3219dd18fce4c0e67 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 5 Dec 2016 15:24:52 +0000
Subject: [PATCH] ENH: renumberMesh: remove old files

---
 .../mesh/generation/snappyHexMesh/snappyHexMesh.C    | 12 +++++++-----
 .../mesh/manipulation/renumberMesh/Make/options      |  4 +++-
 .../mesh/manipulation/renumberMesh/renumberMesh.C    |  5 +++++
 .../reconstruct/reconstruct/processorMeshes.C        | 10 ++++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 3dbbcbcb65..d921c02b03 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -659,6 +659,13 @@ void writeMesh
     meshRefiner.printMeshInfo(debugLevel, msg);
     Info<< "Writing mesh to time " << meshRefiner.timeName() << endl;
 
+    processorMeshes::removeFiles(mesh);
+    if (!debugLevel)
+    {
+        topoSet::removeFiles(mesh);
+    }
+    refinementHistory::removeFiles(mesh);
+
     //label flag = meshRefinement::MESH;
     //if (writeLevel)
     //{
@@ -674,11 +681,6 @@ 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/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
index 49a1c3d2e3..3d8b7225d9 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@@ -6,7 +6,8 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/renumber/renumberMethods/lnInclude \
     -I$(LIB_SRC)/renumber/zoltanRenumber/lnInclude \
-    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
@@ -14,5 +15,6 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lgenericPatchFields \
     -lrenumberMethods \
+    -lreconstruct \
     $(LINK_FLAGS) \
     -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 32d0d87db9..fa7c026e11 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -52,6 +52,8 @@ Description
 #include "cellSet.H"
 #include "faceSet.H"
 #include "pointSet.H"
+#include "processorMeshes.H"
+#include "hexRef8.H"
 
 #ifdef FOAM_USE_ZOLTAN
     #include "zoltanRenumber.H"
@@ -1146,6 +1148,7 @@ int main(int argc, char *argv[])
     }
 
 
+
     // Move mesh (since morphing might not do this)
     if (map().hasMotionPoints())
     {
@@ -1259,6 +1262,8 @@ int main(int argc, char *argv[])
 
     Info<< "Writing mesh to " << mesh.facesInstance() << endl;
 
+    processorMeshes::removeFiles(mesh);
+    hexRef8::removeFiles(mesh);
     topoSet::updateMesh(mesh.facesInstance(), map(), cellSets);
     topoSet::updateMesh(mesh.facesInstance(), map(), faceSets);
     topoSet::updateMesh(mesh.facesInstance(), map(), pointSets);
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C
index 2ecfee034b..4ded906e95 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.C
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.C
@@ -313,6 +313,16 @@ void Foam::processorMeshes::removeFiles(const polyMesh& mesh)
             mesh
         ).objectPath()
     );
+    rm
+    (
+        IOobject
+        (
+            "procAddressing",
+            mesh.facesInstance(),
+            mesh.meshSubDir,
+            mesh
+        ).objectPath()
+    );
 }