From f0d3be60da41a35c6fe293a7c9df491340f42c2f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 14 Jun 2022 14:09:06 +0100
Subject: [PATCH] utilities: Updated moveMesh -> setPoints

Mesh manipulation utilities do not need to generate or use mesh-motion fluxes so
it is more efficient to use setPoints rather than moveMesh.
---
 applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C    | 2 +-
 .../mesh/advanced/autoRefineMesh/autoRefineMesh.C         | 2 +-
 .../mesh/advanced/combinePatchFaces/combinePatchFaces.C   | 6 +++---
 .../utilities/mesh/advanced/modifyMesh/modifyMesh.C       | 8 ++++----
 .../utilities/mesh/advanced/refineHexMesh/refineHexMesh.C | 2 +-
 .../mesh/advanced/refineWallLayer/refineWallLayer.C       | 2 +-
 .../utilities/mesh/advanced/removeFaces/removeFaces.C     | 2 +-
 .../utilities/mesh/advanced/splitCells/splitCells.C       | 2 +-
 .../mesh/generation/extrude/extrudeMesh/extrudeMesh.C     | 8 ++++----
 .../extrude/extrudeToRegionMesh/extrudeToRegionMesh.C     | 2 +-
 .../mesh/generation/extrude2DMesh/extrude2DMesh.C         | 2 +-
 .../mesh/manipulation/createBaffles/createBaffles.C       | 2 +-
 .../utilities/mesh/manipulation/createPatch/createPatch.C | 4 ++--
 .../mesh/manipulation/mergeBaffles/mergeBaffles.C         | 2 +-
 .../utilities/mesh/manipulation/moveMesh/moveMesh.C       | 2 +-
 .../mesh/manipulation/polyDualMesh/polyDualMesh.C         | 2 +-
 .../mesh/manipulation/renumberMesh/renumberMesh.C         | 2 +-
 .../mesh/manipulation/splitBaffles/splitBaffles.C         | 2 +-
 .../utilities/mesh/manipulation/stitchMesh/stitchMesh.C   | 2 +-
 .../dataConversion/foamToEnsightParts/moveMesh.H          | 2 +-
 .../postProcessing/dataConversion/foamToGMV/moveMesh.H    | 2 +-
 21 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index ef6b064ac3..57e6bbadd2 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -1145,7 +1145,7 @@ int main(int argc, char *argv[])
     // Move mesh (since morphing might not do this)
     if (map().hasMotionPoints())
     {
-        subsetter.subMesh().movePoints(map().preMotionPoints());
+        subsetter.subMesh().setPoints(map().preMotionPoints());
     }
 
     Info<< "Writing mesh with split blockedFaces to time "
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 2a5501b814..e3979bf9af 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -517,7 +517,7 @@ void subsetMesh
 
     if (map().hasMotionPoints())
     {
-        mesh.movePoints(map().preMotionPoints());
+        mesh.setPoints(map().preMotionPoints());
     }
 
     // Update topology on cellRemover
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index 4d699aa3c6..6c8890d1e6 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -113,7 +113,7 @@ label mergePatchFaces
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
             {
-                mesh.movePoints(map().preMotionPoints());
+                mesh.setPoints(map().preMotionPoints());
             }
             else
             {
@@ -269,7 +269,7 @@ label mergePatchFaces
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
             {
-                mesh.movePoints(map().preMotionPoints());
+                mesh.setPoints(map().preMotionPoints());
             }
             else
             {
@@ -322,7 +322,7 @@ label mergeEdges(const scalar minCos, polyMesh& mesh)
         // Move mesh (since morphing does not do this)
         if (map().hasMotionPoints())
         {
-            mesh.movePoints(map().preMotionPoints());
+            mesh.setPoints(map().preMotionPoints());
         }
         else
         {
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index 96b90ae6be..72493a3f4a 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -534,7 +534,7 @@ int main(int argc, char *argv[])
 
         if (map().hasMotionPoints())
         {
-            mesh.movePoints(map().preMotionPoints());
+            mesh.setPoints(map().preMotionPoints());
         }
 
         cutter.topoChange(map());
@@ -580,7 +580,7 @@ int main(int argc, char *argv[])
         }
 
         // Move master point to destination.
-        mesh.movePoints(newPoints);
+        mesh.setPoints(newPoints);
 
         List<pointEdgeCollapse> allPointInfo;
         const globalIndex globalPoints(mesh.nPoints());
@@ -606,7 +606,7 @@ int main(int argc, char *argv[])
 
         if (map().hasMotionPoints())
         {
-            mesh.movePoints(map().preMotionPoints());
+            mesh.setPoints(map().preMotionPoints());
         }
 
         // Not implemented yet:
@@ -651,7 +651,7 @@ int main(int argc, char *argv[])
 
         if (map().hasMotionPoints())
         {
-            mesh.movePoints(map().preMotionPoints());
+            mesh.setPoints(map().preMotionPoints());
         }
 
         cutter.topoChange(map());
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index 458fa3f428..2df8c9479a 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
     // Optionally inflate mesh
     if (map().hasMotionPoints())
     {
-        mesh.movePoints(map().preMotionPoints());
+        mesh.setPoints(map().preMotionPoints());
     }
 
     Info<< "Refined from " << returnReduce(map().nOldCells(), sumOp<label>())
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index d791339ca2..0555606b96 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -244,7 +244,7 @@ int main(int argc, char *argv[])
 
     if (map().hasMotionPoints())
     {
-        mesh.movePoints(map().preMotionPoints());
+        mesh.setPoints(map().preMotionPoints());
     }
 
     // Update stored labels on meshCutter.
diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
index 1d04f6fed5..5890b6aebf 100644
--- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
+++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
     {
-        mesh.movePoints(map().preMotionPoints());
+        mesh.setPoints(map().preMotionPoints());
     }
 
     // Update numbering of cells/vertices.
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 743f20e10a..03f2703872 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -689,7 +689,7 @@ int main(int argc, char *argv[])
 
         if (map().hasMotionPoints())
         {
-            mesh.movePoints(map().preMotionPoints());
+            mesh.setPoints(map().preMotionPoints());
         }
 
         // Update stored labels on meshCutter
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 143b62ebcf..4c851a1d84 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -429,7 +429,7 @@ int main(int argc, char *argv[])
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
             {
-                mesh.movePoints(map().preMotionPoints());
+                mesh.setPoints(map().preMotionPoints());
             }
         }
 
@@ -610,7 +610,7 @@ int main(int argc, char *argv[])
             {
                 newPoints[extrudePatch.meshPoints()[i]] = layer0Points[i];
             }
-            mesh.movePoints(newPoints);
+            mesh.setPoints(newPoints);
         }
 
 
@@ -894,7 +894,7 @@ int main(int argc, char *argv[])
             // Move mesh (if inflation used)
             if (map().hasMotionPoints())
             {
-                mesh.movePoints(map().preMotionPoints());
+                mesh.setPoints(map().preMotionPoints());
             }
         }
     }
@@ -1024,7 +1024,7 @@ int main(int argc, char *argv[])
         // Move mesh (if inflation used)
         if (map().hasMotionPoints())
         {
-            mesh.movePoints(map().preMotionPoints());
+            mesh.setPoints(map().preMotionPoints());
         }
     }
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 5c306d51d7..3f6fb0b16e 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2669,7 +2669,7 @@ int main(int argc, char *argv[])
         // Move mesh (since morphing might not do this)
         if (addBafflesMap().hasMotionPoints())
         {
-            mesh.movePoints(addBafflesMap().preMotionPoints());
+            mesh.setPoints(addBafflesMap().preMotionPoints());
         }
 
         mesh.setInstance(meshInstance);
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
index 7b280143b1..d847ee7897 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
@@ -104,7 +104,7 @@ static const NamedEnum<ExtrudeMode, 2> ExtrudeModeNames;
 //          - layer0Points[meshPointi];
 //    }
 
-//    fMesh.movePoints(layer0Points);
+//    fMesh.setPoints(layer0Points);
 
 //    return displacement;
 //}
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index e0da2cd9ac..6e2c463d8b 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -729,7 +729,7 @@ int main(int argc, char *argv[])
     // Move mesh (since morphing might not do this)
     if (map().hasMotionPoints())
     {
-        mesh.movePoints(map().preMotionPoints());
+        mesh.setPoints(map().preMotionPoints());
     }
 
     // Remove any now zero-sized patches
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 2303e9f662..0e9f979b24 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -724,7 +724,7 @@ int main(int argc, char *argv[])
     // tensors.
     Info<< "Doing topology modification to order faces." << nl << endl;
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, true);
-    mesh.movePoints(map().preMotionPoints());
+    mesh.setPoints(map().preMotionPoints());
 
     if (writeCyclicMatch)
     {
@@ -754,7 +754,7 @@ int main(int argc, char *argv[])
         Info<< "Points changed by average:" << gAverage(diff)
             << " max:" << gMax(diff) << nl << endl;
 
-        mesh.movePoints(newPoints);
+        mesh.setPoints(newPoints);
     }
 
     // 3. Remove zeros-sized patches
diff --git a/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C b/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C
index 9d5d936278..8368e83d57 100644
--- a/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C
@@ -224,7 +224,7 @@ int main(int argc, char *argv[])
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
     {
-        mesh.movePoints(map().preMotionPoints());
+        mesh.setPoints(map().preMotionPoints());
     }
 
     if (overwrite)
diff --git a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
index 56c9539a31..ee0e11430a 100644
--- a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
+++ b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.userTimeName() << endl;
 
-        mesh.movePoints(motionPtr->newPoints());
+        mesh.setPoints(motionPtr->newPoints());
 
         runTime.write();
 
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
index fb0f0e2ed2..2d7cdcc246 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
@@ -517,7 +517,7 @@ int main(int argc, char *argv[])
     // Optionally inflate mesh
     if (map().hasMotionPoints())
     {
-        mesh.movePoints(map().preMotionPoints());
+        mesh.setPoints(map().preMotionPoints());
     }
 
     if (!overwrite)
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 774269044c..ab05fc11f7 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -1069,7 +1069,7 @@ int main(int argc, char *argv[])
     // Move mesh (since morphing might not do this)
     if (map().hasMotionPoints())
     {
-        mesh.movePoints(map().preMotionPoints());
+        mesh.setPoints(map().preMotionPoints());
     }
 
 
diff --git a/applications/utilities/mesh/manipulation/splitBaffles/splitBaffles.C b/applications/utilities/mesh/manipulation/splitBaffles/splitBaffles.C
index 8d4fb34c4b..2bddb13edd 100644
--- a/applications/utilities/mesh/manipulation/splitBaffles/splitBaffles.C
+++ b/applications/utilities/mesh/manipulation/splitBaffles/splitBaffles.C
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
     {
-        mesh.movePoints(map().preMotionPoints());
+        mesh.setPoints(map().preMotionPoints());
     }
 
     if (overwrite)
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 48d609d799..bee3311544 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -450,7 +450,7 @@ int main(int argc, char *argv[])
     // Execute all polyMeshModifiers
     autoPtr<polyTopoChangeMap> map = stitcher.changeMesh(true);
 
-    mesh.movePoints(map->preMotionPoints());
+    mesh.setPoints(map->preMotionPoints());
 
     // Write mesh
     if (overwrite)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
index c92d52603a..df6cef0c5b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
@@ -11,6 +11,6 @@
     {
         // Read new points
         io.readOpt() = IOobject::MUST_READ;
-        mesh.movePoints(pointIOField(io));
+        mesh.setPoints(pointIOField(io));
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
index c85f55efaa..6c39743ee5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
@@ -23,5 +23,5 @@ if (ioPoints.headerOk())
         )
     );
 
-    mesh.movePoints(newPoints);
+    mesh.setPoints(newPoints);
 }