From 867badc02421c2359b0010511100fa3ab73ca227 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 10 Jun 2022 16:50:41 +0100
Subject: [PATCH] polyMesh, fvMesh: The moving and topoChanged flags are now
 maintained by fvMesh

avoiding problems with mesh generation, pre/post-processing applications
etc. triggering inappropriate changes to the moving and topoChanged states which
are only needed for updates in solvers corresponding to mesh changes.
---
 applications/test/hexRef8/Test-hexRef8.C      |  4 --
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       | 20 +++++-----
 src/OpenFOAM/meshes/polyMesh/polyMesh.H       | 40 ++++++++-----------
 .../meshes/polyMesh/polyMeshFromShapeMesh.C   | 12 +++---
 .../fvMeshDistribute/fvMeshDistribute.C       |  6 ---
 .../polyTopoChange/polyTopoChange.C           |  3 --
 src/finiteVolume/Make/files                   |  1 +
 src/finiteVolume/fvMesh/fvMesh.C              | 10 +++--
 src/finiteVolume/fvMesh/fvMesh.H              |  9 ++++-
 .../list/fvMeshTopoChangersList.C             |  2 +-
 .../list/fvMeshTopoChangersList.H             |  0
 src/fvMeshTopoChangers/Make/files             |  1 -
 src/parallel/parallel/domainDecomposition.C   |  2 -
 13 files changed, 47 insertions(+), 63 deletions(-)
 rename src/{ => finiteVolume/fvMesh}/fvMeshTopoChangers/list/fvMeshTopoChangersList.C (98%)
 rename src/{ => finiteVolume/fvMesh}/fvMeshTopoChangers/list/fvMeshTopoChangersList.H (100%)

diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index 9bb3065f10..19bf5ff71e 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -191,10 +191,6 @@ int main(int argc, char *argv[])
         }
 
 
-        mesh.moving(false);
-        mesh.topoChanged(false);
-
-
         label action = rndGen.sampleAB<label>(0, 6);
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index a9e9ede30a..97d837505d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -287,12 +287,12 @@ Foam::polyMesh::polyMesh(const IOobject& io)
         *this
     ),
     globalMeshDataPtr_(nullptr),
-    moving_(false),
-    topoChanged_(false),
     curMotionTimeIndex_(-1),
     oldPointsPtr_(nullptr),
     oldCellCentresPtr_(nullptr),
-    storeOldCellCentres_(false)
+    storeOldCellCentres_(false),
+    moving_(false),
+    topoChanged_(false)
 {
     if (!owner_.headerClassName().empty())
     {
@@ -471,12 +471,12 @@ Foam::polyMesh::polyMesh
         PtrList<cellZone>()
     ),
     globalMeshDataPtr_(nullptr),
-    moving_(false),
-    topoChanged_(false),
     curMotionTimeIndex_(-1),
     oldPointsPtr_(nullptr),
     oldCellCentresPtr_(nullptr),
-    storeOldCellCentres_(false)
+    storeOldCellCentres_(false),
+    moving_(false),
+    topoChanged_(false)
 {
     // Check if the faces and cells are valid
     forAll(faces_, facei)
@@ -625,12 +625,12 @@ Foam::polyMesh::polyMesh
         0
     ),
     globalMeshDataPtr_(nullptr),
-    moving_(false),
-    topoChanged_(false),
     curMotionTimeIndex_(-1),
     oldPointsPtr_(nullptr),
     oldCellCentresPtr_(nullptr),
-    storeOldCellCentres_(false)
+    storeOldCellCentres_(false),
+    moving_(false),
+    topoChanged_(false)
 {
     // Check if faces are valid
     forAll(faces_, facei)
@@ -1228,8 +1228,6 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
             << " index " << time().timeIndex() << endl;
     }
 
-    moving(true);
-
     // Pick up old points and cell centres
     if (curMotionTimeIndex_ != time().timeIndex())
     {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 83e47f5f95..aa33522dad 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -174,13 +174,7 @@ private:
         mutable autoPtr<globalMeshData> globalMeshDataPtr_;
 
 
-        // Mesh motion related data
-
-            //- Is the mesh moving
-            bool moving_;
-
-            //- Is the mesh topology changing
-            bool topoChanged_;
+        // Mesh motion related dat
 
             //- Current time index for mesh motion
             mutable label curMotionTimeIndex_;
@@ -303,6 +297,20 @@ private:
                 labelHashSet* setPtr
             ) const;
 
+
+protected:
+
+    // Protected Member Data
+
+        //- Member data pending transfer to fvMesh
+
+            //- Is the mesh moving
+            bool moving_;
+
+            //- Is the mesh topology changing
+            bool topoChanged_;
+
+
 public:
 
     // Public Typedefs
@@ -520,32 +528,16 @@ public:
                 return moving_;
             }
 
-            //- Set the mesh to be moving
-            bool moving(const bool m)
-            {
-                bool m0 = moving_;
-                moving_ = m;
-                return m0;
-            }
-
             //- Is mesh topology changing
             bool topoChanged() const
             {
                 return topoChanged_;
             }
 
-            //- Set the mesh topology to be changing
-            bool topoChanged(const bool c)
-            {
-                bool c0 = topoChanged_;
-                topoChanged_ = c;
-                return c0;
-            }
-
             //- Is mesh changing (topology changing and/or moving)
             bool changing() const
             {
-                return moving()||topoChanged();
+                return moving() || topoChanged();
             }
 
             //- Move points, returns volumes swept by faces in motion
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 2f426d48f0..c54c4f9f1f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -518,12 +518,12 @@ Foam::polyMesh::polyMesh
         0
     ),
     globalMeshDataPtr_(nullptr),
-    moving_(false),
-    topoChanged_(false),
     curMotionTimeIndex_(-1),
     oldPointsPtr_(nullptr),
     oldCellCentresPtr_(nullptr),
-    storeOldCellCentres_(false)
+    storeOldCellCentres_(false),
+    moving_(false),
+    topoChanged_(false)
 {
     if (debug)
     {
@@ -807,12 +807,12 @@ Foam::polyMesh::polyMesh
         0
     ),
     globalMeshDataPtr_(nullptr),
-    moving_(false),
-    topoChanged_(false),
     curMotionTimeIndex_(-1),
     oldPointsPtr_(nullptr),
     oldCellCentresPtr_(nullptr),
-    storeOldCellCentres_(false)
+    storeOldCellCentres_(false),
+    moving_(false),
+    topoChanged_(false)
 {
     if (debug)
     {
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index eebed4b008..6d8814a6a8 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -1754,8 +1754,6 @@ Foam::autoPtr<Foam::polyDistributionMap> Foam::fvMeshDistribute::distribute
     const labelList& distribution
 )
 {
-    const bool topoChanged = mesh_.topoChanged();
-
     // Some checks on distribution
     if (distribution.size() != mesh_.nCells())
     {
@@ -3013,10 +3011,6 @@ Foam::autoPtr<Foam::polyDistributionMap> Foam::fvMeshDistribute::distribute
 
     mesh_.setInstance(mesh_.time().timeName());
 
-    // Reset the topoChanged state of the mesh
-    // Distribution is not a topology change
-    mesh_.topoChanged(topoChanged);
-
     // Print a bit
     if (debug)
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 5fbdc3af98..51a92fa3a0 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -3223,8 +3223,6 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChange::changeMesh
             patchStarts,
             syncParallel
         );
-
-        mesh.topoChanged(true);
     }
     else
     {
@@ -3239,7 +3237,6 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChange::changeMesh
             patchStarts,
             syncParallel
         );
-        mesh.topoChanged(true);
     }
 
     // Clear out primitives
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 35d4c331e8..fb36ced287 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -104,6 +104,7 @@ fvMeshTopoChangers = fvMesh/fvMeshTopoChangers
 $(fvMeshTopoChangers)/fvMeshTopoChanger/fvMeshTopoChanger.C
 $(fvMeshTopoChangers)/fvMeshTopoChanger/fvMeshTopoChangerNew.C
 $(fvMeshTopoChangers)/none/fvMeshTopoChangersNone.C
+$(fvMeshTopoChangers)/list/fvMeshTopoChangersList.C
 
 fvMeshDistributors = fvMesh/fvMeshDistributors
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 1a904fb66d..18fd5aad8f 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -588,10 +588,10 @@ bool Foam::fvMesh::update()
         deleteDemandDrivenData(V0Ptr_);
     }
 
-    // Set topoChanged false before any mesh change
-    topoChanged(false);
+    // Set topoChanged_ false before any mesh change
+    topoChanged_ = false;
     bool updated = topoChanger_->update();
-    topoChanged(updated);
+    topoChanged_ = updated;
 
     // Register V0 for distribution
     if (V0Ptr_)
@@ -1087,6 +1087,10 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
     meshObject::movePoints<fvMesh>(*this);
     meshObject::movePoints<lduMesh>(*this);
 
+    // Set moving_ true
+    // Note: once set it remains true for the rest of the run
+    moving_ = true;
+
     return tsweptVols;
 }
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index b36bf2ab21..69856e0594 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -83,6 +83,12 @@ class GeometricBoundaryField;
 template<class Type>
 class UCompactListList;
 
+namespace fvMeshTopoChangers
+{
+    class list;
+}
+
+
 /*---------------------------------------------------------------------------*\
                            Class fvMesh Declaration
 \*---------------------------------------------------------------------------*/
@@ -94,8 +100,6 @@ class fvMesh
     public surfaceInterpolation,
     public data
 {
-private:
-
     // Private Data
 
         //- Boundary mesh
@@ -261,6 +265,7 @@ public:
         typedef fvMesh Mesh;
         typedef fvBoundaryMesh BoundaryMesh;
 
+        friend fvMeshTopoChangers::list;
 
     // Declare name of the class and its debug switch
     ClassName("fvMesh");
diff --git a/src/fvMeshTopoChangers/list/fvMeshTopoChangersList.C b/src/finiteVolume/fvMesh/fvMeshTopoChangers/list/fvMeshTopoChangersList.C
similarity index 98%
rename from src/fvMeshTopoChangers/list/fvMeshTopoChangersList.C
rename to src/finiteVolume/fvMesh/fvMeshTopoChangers/list/fvMeshTopoChangersList.C
index b91585d91e..3684c860f6 100644
--- a/src/fvMeshTopoChangers/list/fvMeshTopoChangersList.C
+++ b/src/finiteVolume/fvMesh/fvMeshTopoChangers/list/fvMeshTopoChangersList.C
@@ -80,7 +80,7 @@ bool Foam::fvMeshTopoChangers::list::update()
     forAllIter(PtrDictionary<fvMeshTopoChanger>, list_, iter)
     {
         updated = iter().update() || updated;
-        mesh().topoChanged(updated);
+        mesh().topoChanged_ = updated;
     }
 
     return updated;
diff --git a/src/fvMeshTopoChangers/list/fvMeshTopoChangersList.H b/src/finiteVolume/fvMesh/fvMeshTopoChangers/list/fvMeshTopoChangersList.H
similarity index 100%
rename from src/fvMeshTopoChangers/list/fvMeshTopoChangersList.H
rename to src/finiteVolume/fvMesh/fvMeshTopoChangers/list/fvMeshTopoChangersList.H
diff --git a/src/fvMeshTopoChangers/Make/files b/src/fvMeshTopoChangers/Make/files
index d9f0d9bc89..bab2e82fe2 100644
--- a/src/fvMeshTopoChangers/Make/files
+++ b/src/fvMeshTopoChangers/Make/files
@@ -1,5 +1,4 @@
 refiner/fvMeshTopoChangersRefiner.C
 movingCone/fvMeshTopoChangersMovingCone.C
-list/fvMeshTopoChangersList.C
 
 LIB = $(FOAM_LIBBIN)/libfvMeshTopoChangers
diff --git a/src/parallel/parallel/domainDecomposition.C b/src/parallel/parallel/domainDecomposition.C
index 978f8fc28a..843a262adc 100644
--- a/src/parallel/parallel/domainDecomposition.C
+++ b/src/parallel/parallel/domainDecomposition.C
@@ -69,7 +69,6 @@ void Foam::domainDecomposition::decomposePoints()
                     procPointAddressing_[proci]
                 )
             );
-            procMesh.moving(false);
         }
     }
 }
@@ -96,7 +95,6 @@ void Foam::domainDecomposition::reconstructPoints()
         }
 
         completeMesh_->movePoints(completePoints);
-        completeMesh_->moving(false);
     }
 }