From e518ed21eec3f55983585d3909af490ca4f158a8 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 20 Mar 2020 14:00:53 +0000
Subject: [PATCH] Bugfix: change the way function objects are updated on topo
 change

---
 src/foam/meshes/polyMesh/polyMesh.C      |  4 ++++
 src/foam/meshes/polyMesh/polyMeshClear.C | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/foam/meshes/polyMesh/polyMesh.C b/src/foam/meshes/polyMesh/polyMesh.C
index 38a004391..2a5fe16c5 100644
--- a/src/foam/meshes/polyMesh/polyMesh.C
+++ b/src/foam/meshes/polyMesh/polyMesh.C
@@ -895,6 +895,10 @@ Foam::polyMesh::~polyMesh()
 {
     clearOut();
     resetMotion();
+
+    // Clear mesh objects.  See clearGeom()
+    // HJ, 12/Feb/2020
+    meshObjectBase::allDelete(*this);
 }
 
 
diff --git a/src/foam/meshes/polyMesh/polyMeshClear.C b/src/foam/meshes/polyMesh/polyMeshClear.C
index 48f79b03f..aee60aefe 100644
--- a/src/foam/meshes/polyMesh/polyMeshClear.C
+++ b/src/foam/meshes/polyMesh/polyMeshClear.C
@@ -91,9 +91,9 @@ void Foam::polyMesh::clearGeom()
     solutionD_ = Vector<label>::zero;
 
     // Move points all mesh objects.  HJ, 13/Oct/2010
-    // This is a problem, because it is called in a destructor.
-    meshObjectBase::allDelete(*this);
-//     meshObjectBase::allMovePoints(*this);
+    // Functionality update: losing mesh objects on topo change, which should
+    // not happen.  HJ, 12/Feb/2020
+    meshObjectBase::allMovePoints(*this);
 }
 
 
@@ -116,6 +116,10 @@ void Foam::polyMesh::clearAddressing()
     // Reset valid directions
     geometricD_ = Vector<label>::zero;
     solutionD_ = Vector<label>::zero;
+
+    // Update mesh objects?
+    // HJ, 12/Feb/2020
+    meshObjectBase::allMovePoints(*this);
 }
 
 
@@ -129,6 +133,10 @@ void Foam::polyMesh::clearPrimitives()
     neighbour_.setSize(0);
 
     clearedPrimitives_ = true;
+
+    // Clear mesh objects.  See clearGeom()
+    // HJ, 12/Feb/2020
+    meshObjectBase::allDelete(*this);
 }