From d54f5ab9ad160b9f9662e815ed6fc18c297dceb6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 10 Jun 2022 12:01:28 +0100
Subject: [PATCH] polyMesh: Changed topoChanging -> topoChanged

The topoChanged flag now indicates that the mesh topology has changed at the
start of the current time-step rather than it is changing during the run, for
subsequent time-steps without topology change it is set false until the next
topology change.
---
 .../compressibleInterFoam/compressibleInterFoam.C  |  2 +-
 .../solvers/multiphase/interFoam/interFoam.C       |  2 +-
 .../multiphaseEulerFoam/multiphaseEulerFoam.C      |  2 +-
 applications/test/hexRef8/Test-hexRef8.C           |  4 ++--
 src/OpenFOAM/meshes/polyMesh/polyMesh.C            |  6 +++---
 src/OpenFOAM/meshes/polyMesh/polyMesh.H            | 14 +++++++-------
 .../meshes/polyMesh/polyMeshFromShapeMesh.C        |  4 ++--
 .../fvMeshDistribute/fvMeshDistribute.C            |  6 +++---
 .../displacement/points0/points0MotionSolver.C     |  2 +-
 .../polyTopoChange/polyTopoChange/polyTopoChange.C |  4 ++--
 src/finiteVolume/cfdTools/general/MRF/MRFZone.C    |  2 +-
 .../cfdTools/general/MRF/MRFZoneList.C             |  2 +-
 src/finiteVolume/fvMesh/fvMesh.C                   |  6 +++---
 .../list/fvMeshTopoChangersList.C                  |  2 +-
 src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C |  2 +-
 .../refiner/fvMeshTopoChangersRefiner.C            |  2 +-
 16 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 1faeb863a3..c1ae4f5517 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
         // same divergence
         tmp<volScalarField> divU;
 
-        if (correctPhi && mesh.topoChanging())
+        if (correctPhi && mesh.topoChanged())
         {
             // Construct and register divU for mapping
             divU = new volScalarField
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 67507e2a16..db2366bc86 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
         (
             correctPhi
          && !isType<twoPhaseChangeModels::noPhaseChange>(phaseChange)
-         && mesh.topoChanging()
+         && mesh.topoChanged()
         )
         {
             // Construct and register divU for correctPhi
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C
index 0a91bcd129..129516d125 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
         // has the same divergence
         tmp<volScalarField> divU;
 
-        if (correctPhi && mesh.topoChanging())
+        if (correctPhi && mesh.topoChanged())
         {
             // Construct and register divU for mapping
             divU = new volScalarField
diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index 3b1a03d73d..9bb3065f10 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
 
 
         mesh.moving(false);
-        mesh.topoChanging(false);
+        mesh.topoChanged(false);
 
 
         label action = rndGen.sampleAB<label>(0, 6);
@@ -293,7 +293,7 @@ int main(int argc, char *argv[])
 
 
         Info<< nl<< "-- Mesh : moving:" << mesh.moving()
-            << " topoChanging:" << mesh.topoChanging()
+            << " topoChanged:" << mesh.topoChanged()
             << " changing:" << mesh.changing()
             << endl;
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 60f6ccf00a..a9e9ede30a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -288,7 +288,7 @@ Foam::polyMesh::polyMesh(const IOobject& io)
     ),
     globalMeshDataPtr_(nullptr),
     moving_(false),
-    topoChanging_(false),
+    topoChanged_(false),
     curMotionTimeIndex_(-1),
     oldPointsPtr_(nullptr),
     oldCellCentresPtr_(nullptr),
@@ -472,7 +472,7 @@ Foam::polyMesh::polyMesh
     ),
     globalMeshDataPtr_(nullptr),
     moving_(false),
-    topoChanging_(false),
+    topoChanged_(false),
     curMotionTimeIndex_(-1),
     oldPointsPtr_(nullptr),
     oldCellCentresPtr_(nullptr),
@@ -626,7 +626,7 @@ Foam::polyMesh::polyMesh
     ),
     globalMeshDataPtr_(nullptr),
     moving_(false),
-    topoChanging_(false),
+    topoChanged_(false),
     curMotionTimeIndex_(-1),
     oldPointsPtr_(nullptr),
     oldCellCentresPtr_(nullptr),
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index cfd22c9075..83e47f5f95 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -180,7 +180,7 @@ private:
             bool moving_;
 
             //- Is the mesh topology changing
-            bool topoChanging_;
+            bool topoChanged_;
 
             //- Current time index for mesh motion
             mutable label curMotionTimeIndex_;
@@ -529,23 +529,23 @@ public:
             }
 
             //- Is mesh topology changing
-            bool topoChanging() const
+            bool topoChanged() const
             {
-                return topoChanging_;
+                return topoChanged_;
             }
 
             //- Set the mesh topology to be changing
-            bool topoChanging(const bool c)
+            bool topoChanged(const bool c)
             {
-                bool c0 = topoChanging_;
-                topoChanging_ = c;
+                bool c0 = topoChanged_;
+                topoChanged_ = c;
                 return c0;
             }
 
             //- Is mesh changing (topology changing and/or moving)
             bool changing() const
             {
-                return moving()||topoChanging();
+                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 3472587a3b..2f426d48f0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -519,7 +519,7 @@ Foam::polyMesh::polyMesh
     ),
     globalMeshDataPtr_(nullptr),
     moving_(false),
-    topoChanging_(false),
+    topoChanged_(false),
     curMotionTimeIndex_(-1),
     oldPointsPtr_(nullptr),
     oldCellCentresPtr_(nullptr),
@@ -808,7 +808,7 @@ Foam::polyMesh::polyMesh
     ),
     globalMeshDataPtr_(nullptr),
     moving_(false),
-    topoChanging_(false),
+    topoChanged_(false),
     curMotionTimeIndex_(-1),
     oldPointsPtr_(nullptr),
     oldCellCentresPtr_(nullptr),
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 73e6bd7d1d..eebed4b008 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -1754,7 +1754,7 @@ Foam::autoPtr<Foam::polyDistributionMap> Foam::fvMeshDistribute::distribute
     const labelList& distribution
 )
 {
-    const bool topoChanging = mesh_.topoChanging();
+    const bool topoChanged = mesh_.topoChanged();
 
     // Some checks on distribution
     if (distribution.size() != mesh_.nCells())
@@ -3013,9 +3013,9 @@ Foam::autoPtr<Foam::polyDistributionMap> Foam::fvMeshDistribute::distribute
 
     mesh_.setInstance(mesh_.time().timeName());
 
-    // Reset the topoChanging state of the mesh
+    // Reset the topoChanged state of the mesh
     // Distribution is not a topology change
-    mesh_.topoChanging(topoChanging);
+    mesh_.topoChanged(topoChanged);
 
     // Print a bit
     if (debug)
diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
index 7236544b5c..0e2d412102 100644
--- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
@@ -173,7 +173,7 @@ void Foam::points0MotionSolver::distribute
 
 bool Foam::points0MotionSolver::write() const
 {
-    if (mesh().topoChanging())
+    if (mesh().topoChanged())
     {
         points0_.instance() = mesh().time().timeName();
         points0_.write();
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 6dd6a6f52b..5fbdc3af98 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -3224,7 +3224,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChange::changeMesh
             syncParallel
         );
 
-        mesh.topoChanging(true);
+        mesh.topoChanged(true);
     }
     else
     {
@@ -3239,7 +3239,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChange::changeMesh
             patchStarts,
             syncParallel
         );
-        mesh.topoChanging(true);
+        mesh.topoChanged(true);
     }
 
     // Clear out primitives
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index 839cdc3e1d..063f426507 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -631,7 +631,7 @@ bool Foam::MRFZone::read(const dictionary& dict)
 
 void Foam::MRFZone::update()
 {
-    if (mesh_.topoChanging())
+    if (mesh_.topoChanged())
     {
         setMRFFaces();
     }
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index 755762123c..14919330d6 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -389,7 +389,7 @@ void Foam::MRFZoneList::correctBoundaryVelocity(volVectorField& U) const
 
 void Foam::MRFZoneList::update()
 {
-    if (mesh_.topoChanging())
+    if (mesh_.topoChanged())
     {
         forAll(*this, i)
         {
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 119a5b7fca..1a904fb66d 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -588,10 +588,10 @@ bool Foam::fvMesh::update()
         deleteDemandDrivenData(V0Ptr_);
     }
 
-    // Set topoChanging false before any mesh change
-    topoChanging(false);
+    // Set topoChanged false before any mesh change
+    topoChanged(false);
     bool updated = topoChanger_->update();
-    topoChanging(updated);
+    topoChanged(updated);
 
     // Register V0 for distribution
     if (V0Ptr_)
diff --git a/src/fvMeshTopoChangers/list/fvMeshTopoChangersList.C b/src/fvMeshTopoChangers/list/fvMeshTopoChangersList.C
index c6a1287c94..b91585d91e 100644
--- a/src/fvMeshTopoChangers/list/fvMeshTopoChangersList.C
+++ b/src/fvMeshTopoChangers/list/fvMeshTopoChangersList.C
@@ -80,7 +80,7 @@ bool Foam::fvMeshTopoChangers::list::update()
     forAllIter(PtrDictionary<fvMeshTopoChanger>, list_, iter)
     {
         updated = iter().update() || updated;
-        mesh().topoChanging(updated);
+        mesh().topoChanged(updated);
     }
 
     return updated;
diff --git a/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C b/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C
index e07e96055d..8a7dd0d387 100644
--- a/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C
+++ b/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C
@@ -63,7 +63,7 @@ bool Foam::fvMeshTopoChangers::raw::update()
     Info<< "raw : Checking for topology changes..."
         << endl;
 
-    // Do any topology changes. Sets topoChanging (through polyTopoChange)
+    // Do any topology changes. Sets topoChanged (through polyTopoChange)
     autoPtr<polyTopoChangeMap> topoChangeMap = topoChanger_.changeMesh(true);
 
     bool hasChanged = topoChangeMap.valid();
diff --git a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
index 5961c146d4..fc7b270efd 100644
--- a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
+++ b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
@@ -1678,7 +1678,7 @@ void Foam::fvMeshTopoChangers::refiner::distribute
 
 bool Foam::fvMeshTopoChangers::refiner::write(const bool write) const
 {
-    if (mesh().topoChanging())
+    if (mesh().topoChanged())
     {
         // Force refinement data to go to the current time directory.
         const_cast<hexRef8&>(meshCutter_).setInstance(mesh().time().timeName());