From 3a8a7cc6d4972c4342b8d87297d9acbb0c45eb85 Mon Sep 17 00:00:00 2001
From: mattijs <>
Date: Wed, 9 Mar 2022 11:30:46 +0000
Subject: [PATCH] ENH: snappyHexMesh: remove any left-over mesh data before
 topo change

---
 .../meshRefinement/meshRefinement.C           | 20 ++++++++++++++++
 .../meshRefinement/meshRefinementBaffles.C    | 20 ++++++++++++++++
 .../meshRefinement/meshRefinementMerge.C      | 24 +++++++++++++++++++
 .../meshRefinement/meshRefinementRefine.C     |  8 +++++++
 4 files changed, 72 insertions(+)

diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 7ae55ea74e..de014919c6 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1135,6 +1135,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemoveCells
         meshMod
     );
 
+    // Remove any unnecessary fields
+    mesh_.clearOut();
+    mesh_.moving(false);
+
     // Change the mesh (no inflation)
     autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
     mapPolyMesh& map = *mapPtr;
@@ -1327,6 +1331,10 @@ Foam::label Foam::meshRefinement::splitFacesUndo
         // Insert the mesh changes
         doSplitFaces(splitFaces, splits, meshMod);
 
+        // Remove any unnecessary fields
+        mesh_.clearOut();
+        mesh_.moving(false);
+
         // Change the mesh (no inflation)
         autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
         mapPolyMesh& map = *mapPtr;
@@ -1339,6 +1347,10 @@ Foam::label Foam::meshRefinement::splitFacesUndo
         {
             mesh_.movePoints(map.preMotionPoints());
         }
+        else
+        {
+            mesh_.clearOut();
+        }
 
         // Reset the instance for if in overwrite mode
         mesh_.setInstance(timeName());
@@ -1550,6 +1562,10 @@ Foam::label Foam::meshRefinement::splitFacesUndo
         nSplit -= n;
 
 
+        // Remove any unnecessary fields
+        mesh_.clearOut();
+        mesh_.moving(false);
+
         // Change the mesh (no inflation)
         autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
         mapPolyMesh& map = *mapPtr;
@@ -1562,6 +1578,10 @@ Foam::label Foam::meshRefinement::splitFacesUndo
         {
             mesh_.movePoints(map.preMotionPoints());
         }
+        else
+        {
+            mesh_.clearOut();
+        }
 
         // Reset the instance for if in overwrite mode
         mesh_.setInstance(timeName());
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index c4b4f6e3d4..82b357e796 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -600,6 +600,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
     autoPtr<mapPolyMesh> mapPtr;
     if (returnReduce(nBaffles, sumOp<label>()))
     {
+        // Remove any unnecessary fields
+        mesh_.clearOut();
+        mesh_.moving(false);
+
         // Change the mesh (no inflation, parallel sync)
         mapPtr = meshMod.changeMesh(mesh_, false, true);
         mapPolyMesh& map = *mapPtr;
@@ -1314,6 +1318,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeBaffles
         }
 
 
+        // Remove any unnecessary fields
+        mesh_.clearOut();
+        mesh_.moving(false);
+
         // Change the mesh (no inflation)
         mapPtr = meshMod.changeMesh(mesh_, false, true);
         mapPolyMesh& map = *mapPtr;
@@ -5346,6 +5354,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints
         // Insert changes into meshMod
         pointDuplicator.setRefinement(regionSide, meshMod);
 
+        // Remove any unnecessary fields
+        mesh_.clearOut();
+        mesh_.moving(false);
+
         // Change the mesh (no inflation, parallel sync)
         mapPtr = meshMod.changeMesh(mesh_, false, true);
         mapPolyMesh& map = *mapPtr;
@@ -5421,6 +5433,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergePoints
         // Insert changes
         polyMeshAdder::mergePoints(mesh_, pointToMaster, meshMod);
 
+        // Remove any unnecessary fields
+        mesh_.clearOut();
+        mesh_.moving(false);
+
         // Change the mesh (no inflation, parallel sync)
         mapPtr = meshMod.changeMesh(mesh_, false, true);
         mapPolyMesh& map = *mapPtr;
@@ -5988,6 +6004,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
         meshMod
     );
 
+    // Remove any unnecessary fields
+    mesh_.clearOut();
+    mesh_.moving(false);
+
     // Change the mesh (no inflation, parallel sync)
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
index 92aa22b468..8d8fd6456e 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
@@ -108,6 +108,10 @@ Foam::label Foam::meshRefinement::mergePatchFaces
         // unused points.
         faceCombiner.setRefinement(mergeSets, meshMod);
 
+        // Remove any unnecessary fields
+        mesh_.clearOut();
+        mesh_.moving(false);
+
         // Change the mesh (no inflation)
         autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
         mapPolyMesh& map = *mapPtr;
@@ -197,6 +201,10 @@ Foam::label Foam::meshRefinement::mergePatchFaces
 //
 //        pointRemover.setRefinement(pointCanBeDeleted, meshMod);
 //
+//        // Remove any unnecessary fields
+//        mesh_.clearOut();
+//        mesh_.moving(false);
+//
 //        // Change the mesh (no inflation)
 //        map = meshMod.changeMesh(mesh_, false, true);
 //
@@ -359,6 +367,10 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
             labelList(0)                        // cells to store
         );
 
+        // Remove any unnecessary fields
+        mesh_.clearOut();
+        mesh_.moving(false);
+
         // Change the mesh (no inflation)
         autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
 
@@ -544,6 +556,10 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
                 restoredCells
             );
 
+            // Remove any unnecessary fields
+            mesh_.clearOut();
+            mesh_.moving(false);
+
             // Change the mesh (no inflation)
             autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
 
@@ -629,6 +645,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemovePoints
 
     pointRemover.setRefinement(pointCanBeDeleted, meshMod);
 
+    // Remove any unnecessary fields
+    mesh_.clearOut();
+    mesh_.moving(false);
+
     // Change the mesh (no inflation)
     autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
     mapPolyMesh& map = *mapPtr;
@@ -702,6 +722,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRestorePoints
         meshMod
     );
 
+    // Remove any unnecessary fields
+    mesh_.clearOut();
+    mesh_.moving(false);
+
     // Change the mesh (no inflation)
     autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
     mapPolyMesh& map = *mapPtr;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index e8d9e30836..14f6ab6432 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -2352,6 +2352,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::refine
     // Play refinement commands into mesh changer.
     meshCutter_.setRefinement(cellsToRefine, meshMod);
 
+    // Remove any unnecessary fields
+    mesh_.clearOut();
+    mesh_.moving(false);
+
     // Create mesh (no inflation), return map from old to new mesh.
     autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false);
     mapPolyMesh& map = *mapPtr;
@@ -2774,6 +2778,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::directionalRefine
     // Insert mesh refinement into polyTopoChange.
     meshRefiner.setRefinement(cuts, meshMod);
 
+    // Remove any unnecessary fields
+    mesh_.clearOut();
+    mesh_.moving(false);
+
     autoPtr<mapPolyMesh> morphMap = meshMod.changeMesh(mesh_, false);
 
     // Update fields