diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index b98611e785..5441e564ca 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -627,6 +627,13 @@ public:
             //- Clear geometry
             void clearGeom();
 
+            //- Update geometry; keep topology. Optional new face decomposition
+            void updateGeom
+            (
+                pointIOField& newPoints,
+                autoPtr<labelIOList>& newTetBasePtIsPtr
+            );
+
             //- Clear addressing
             void clearAddressing(const bool isMeshUpdate = false);
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
index 9a27d99cab..6c247e03c4 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
@@ -76,6 +76,86 @@ void Foam::polyMesh::clearGeom()
 }
 
 
+void Foam::polyMesh::updateGeom
+(
+    pointIOField& newPoints,
+    autoPtr<labelIOList>& newTetBasePtIsPtr
+)
+{
+    if (debug)
+    {
+        InfoInFunction << "Updating geometric data with newPoints:"
+            << newPoints.size() << " newTetBasePtIs:"
+            << newTetBasePtIsPtr.valid() << endl;
+    }
+
+    if (points_.size() != 0 && points_.size() != newPoints.size())
+    {
+        FatalErrorInFunction
+            << "Point motion detected but number of points "
+            << newPoints.size() << " in "
+            << newPoints.objectPath() << " does not correspond to "
+            << " current " << points_.size()
+            << exit(FatalError);
+    }
+
+    // Clear all geometric mesh objects that are not 'moveable'
+    meshObject::clearUpto
+    <
+        pointMesh,
+        TopologicalMeshObject,
+        MoveableMeshObject
+    >
+    (
+        *this
+    );
+    meshObject::clearUpto
+    <
+        polyMesh,
+        TopologicalMeshObject,
+        MoveableMeshObject
+    >
+    (
+        *this
+    );
+
+    primitiveMesh::clearGeom();
+
+    boundary_.clearGeom();
+
+    // Reset valid directions (could change with rotation)
+    geometricD_ = Zero;
+    solutionD_ = Zero;
+
+    // Remove the cell tree
+    cellTreePtr_.clear();
+
+    // Update local data
+    points_.instance() = newPoints.instance();
+    points_.transfer(newPoints);
+
+    // Optional new tet base points
+    if (newTetBasePtIsPtr.valid())
+    {
+        tetBasePtIsPtr_ = std::move(newTetBasePtIsPtr);
+    }
+
+    // Calculate the geometry for the patches (transformation tensors etc.)
+    boundary_.calcGeometry();
+
+    // Derived info
+    bounds_ = boundBox(points_);
+
+    // Rotation can cause direction vector to change
+    geometricD_ = Zero;
+    solutionD_ = Zero;
+
+    // Update all 'moveable' objects
+    meshObject::movePoints<polyMesh>(*this);
+    meshObject::movePoints<pointMesh>(*this);
+}
+
+
 void Foam::polyMesh::clearAddressing(const bool isMeshUpdate)
 {
     if (debug)
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index b16ae66cdb..cf26d49c0a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -29,7 +29,6 @@ License
 #include "polyMesh.H"
 #include "Time.H"
 #include "cellIOList.H"
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::polyMesh::setInstance
@@ -422,13 +421,6 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             Info<< "Point motion" << endl;
         }
 
-        clearGeom();
-
-
-        label nOldPoints = points_.size();
-
-        points_.clear();
-
         pointIOField newPoints
         (
             IOobject
@@ -443,35 +435,11 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             )
         );
 
-        if (nOldPoints != 0 && nOldPoints != newPoints.size())
-        {
-            FatalErrorInFunction
-                << "Point motion detected but number of points "
-                << newPoints.size() << " in "
-                << newPoints.objectPath() << " does not correspond to "
-                << " current " << nOldPoints
-                << exit(FatalError);
-        }
-
-        points_.transfer(newPoints);
-        points_.instance() = pointsInst;
-
         // Re-read tet base points
         autoPtr<labelIOList> newTetBasePtIsPtr = readTetBasePtIs();
-        if (newTetBasePtIsPtr.valid())
-        {
-            tetBasePtIsPtr_ = std::move(newTetBasePtIsPtr);
-        }
 
-        // Calculate the geometry for the patches (transformation tensors etc.)
-        boundary_.calcGeometry();
-
-        // Derived info
-        bounds_ = boundBox(points_);
-
-        // Rotation can cause direction vector to change
-        geometricD_ = Zero;
-        solutionD_ = Zero;
+        // Update all geometry
+        updateGeom(newPoints, newTetBasePtIsPtr);
 
         return polyMesh::POINTS_MOVED;
     }