Rename the Geometry-UOs to MoveNodes meshmodifier

framework/doc/content/source/meshmodifiers/MoveNodesToSphere.md

@@ -0,0 +1,17 @@
+# MoveNodesToSphere
+
+!syntax description /UserObjects/MoveNodesToSphere
+
+Moves all nodes from the supplied [!param](/UserObjects/MoveNodesToSphere/boundary) or [!param](/UserObjects/MoveNodesToSphere/block)
+to the surface of the sphere specified by the [!param](/UserObjects/MoveNodesToSphere/center) and
+[!param](/UserObjects/MoveNodesToSphere/radius) parameters.
+
+This is performed by default during adaptivity to allow adaptive refinement of curved geometries.
+It can also be performed using regular execution schedules specified by the [!param](/UserObjects/MoveNodesToSphere/execute_on)
+parameter.
+
+!syntax parameters /UserObjects/MoveNodesToSphere
+
+!syntax inputs /UserObjects/MoveNodesToSphere
+
+!syntax children /UserObjects/MoveNodesToSphere

framework/include/userobjects/GeometryBase.h → framework/include/meshmodifiers/MoveNodesToGeometryModifierBase.h

@@ -12,15 +12,15 @@
 #include "GeneralUserObject.h"
 
 /**
- * Base class for userobjects that snap nodes to a defined geometry when
- * adaptivity happens.
+ * Base class for mesh modifiers that snap nodes to a defined geometry either when executed
+ * or when mesh adaptivity happens
  */
-class GeometryBase : public GeneralUserObject
+class MoveNodesToGeometryModifierBase : public GeneralUserObject
 {
 public:
   static InputParameters validParams();
 
-  GeometryBase(const InputParameters & parameters);
+  MoveNodesToGeometryModifierBase(const InputParameters & parameters);
 
   virtual void initialize() final;
   virtual void execute() final;
@@ -29,6 +29,9 @@ class GeometryBase : public GeneralUserObject
   virtual void meshChanged() final;
 
 protected:
+  /// Snap all nodes from the specified block or boundary restriction to the derived-class-defined geometry
+  void snapNodes();
+
   /**
    * Override this method in derived classes to implement a specific geometry.
    * The method takes a writable reference to a node. Set the position of the
@@ -39,9 +42,9 @@ class GeometryBase : public GeneralUserObject
   /// Reference to the current simulation mesh
   MooseMesh & _mesh;
 
-  /// List of boundaries (or node sets) that will be snapped to a geometry
+  /// List of boundaries (or node sets) from which nodes will be snapped to a geometry
   const std::vector<BoundaryID> _boundary_ids;
 
-  /// List of blocks (likely lower D blocks) that will be snapped to a geometry
+  /// List of blocks (likely lower D blocks) from which nodes will be snapped to a geometry
   const std::vector<SubdomainID> _subdomain_ids;
 };

framework/include/userobjects/GeometrySphere.h → framework/include/meshmodifiers/MoveNodesToSphere.h

@@ -9,21 +9,23 @@
 
 #pragma once
 
-#include "GeometryBase.h"
+#include "MoveNodesToGeometryModifierBase.h"
 
 /**
  * Snaps the selected nodes to the surface of a sphere (or circular disk in 2D)
  */
-class GeometrySphere : public GeometryBase
+class MoveNodesToSphere : public MoveNodesToGeometryModifierBase
 {
 public:
   static InputParameters validParams();
 
-  GeometrySphere(const InputParameters & parameters);
+  MoveNodesToSphere(const InputParameters & parameters);
 
 protected:
-  virtual void snapNode(Node & node);
+  virtual void snapNode(Node & node) override;
 
+  /// Center of the sphere
   const Point _center;
+  /// Radius of the sphere
   const Real _radius;
 };

framework/src/userobjects/GeometryBase.C → framework/src/meshmodifiers/MoveNodesToGeometryModifierBase.C

@@ -7,12 +7,12 @@
 //* Licensed under LGPL 2.1, please see LICENSE for details
 //* https://www.gnu.org/licenses/lgpl-2.1.html
 
-#include "GeometryBase.h"
+#include "MoveNodesToGeometryModifierBase.h"
 #include "MooseMesh.h"
 #include "libmesh/mesh_base.h"
 
 InputParameters
-GeometryBase::validParams()
+MoveNodesToGeometryModifierBase::validParams()
 {
   InputParameters params = GeneralUserObject::validParams();
   params.addClassDescription(
@@ -21,10 +21,14 @@ GeometryBase::validParams()
       "boundary", {}, "List of boundaries whose nodes are snapped to a given geometry");
   params.addParam<std::vector<SubdomainName>>(
       "block", {}, "List of blocks whose nodes are snapped to a given geometry");
+
+  // By default don't execute
+  params.set<ExecFlagEnum>("execute_on") = "NONE";
+
   return params;
 }
 
-GeometryBase::GeometryBase(const InputParameters & parameters)
+MoveNodesToGeometryModifierBase::MoveNodesToGeometryModifierBase(const InputParameters & parameters)
   : GeneralUserObject(parameters),
     _mesh(_subproblem.mesh()),
     _boundary_ids(_mesh.getBoundaryIDs(getParam<std::vector<BoundaryName>>("boundary"))),
@@ -33,22 +37,29 @@ GeometryBase::GeometryBase(const InputParameters & parameters)
 }
 
 void
-GeometryBase::initialize()
+MoveNodesToGeometryModifierBase::initialize()
+{
+}
+
+void
+MoveNodesToGeometryModifierBase::execute()
 {
+  snapNodes();
 }
 
 void
-GeometryBase::execute()
+MoveNodesToGeometryModifierBase::finalize()
 {
 }
 
 void
-GeometryBase::finalize()
+MoveNodesToGeometryModifierBase::meshChanged()
 {
+  snapNodes();
 }
 
 void
-GeometryBase::meshChanged()
+MoveNodesToGeometryModifierBase::snapNodes()
 {
   auto & mesh = _mesh.getMesh();
 

framework/src/meshmodifiers/MoveNodesToSphere.C

@@ -0,0 +1,39 @@
+//* This file is part of the MOOSE framework
+//* https://www.mooseframework.org
+//*
+//* All rights reserved, see COPYRIGHT for full restrictions
+//* https://github.com/idaholab/moose/blob/master/COPYRIGHT
+//*
+//* Licensed under LGPL 2.1, please see LICENSE for details
+//* https://www.gnu.org/licenses/lgpl-2.1.html
+
+#include "MoveNodesToSphere.h"
+
+registerMooseObject("MooseApp", MoveNodesToSphere);
+registerMooseObjectRenamed("MooseApp", GeometrySphere, "06/30/2025 24:00", MoveNodesToSphere);
+
+InputParameters
+MoveNodesToSphere::validParams()
+{
+  InputParameters params = MoveNodesToGeometryModifierBase::validParams();
+  params.addClassDescription(
+      "Snap nodes to the surface of a sphere either during adaptivity or on execution");
+  params.addParam<Point>("center", "Sphere center");
+  params.addParam<Real>("radius", "Sphere radius");
+  return params;
+}
+
+MoveNodesToSphere::MoveNodesToSphere(const InputParameters & parameters)
+  : MoveNodesToGeometryModifierBase(parameters),
+    _center(getParam<Point>("center")),
+    _radius(getParam<Real>("radius"))
+{
+}
+
+void
+MoveNodesToSphere::snapNode(Node & node)
+{
+  const Point o = node - _center;
+  const Real r = o.norm();
+  node = o * _radius / r + _center;
+}

test/tests/userobjects/geometry_snap/tests → test/tests/meshmodifiers/move_nodes_to_sphere/tests

@@ -1,5 +1,5 @@
 [Tests]
-  design = 'GeometrySphere.md'
+  design = 'MoveNodesToSphere.md'
   [geometrysphere]
     type = 'Exodiff'
     input = 'geometrysphere.i'