Refactor SolutionUserObject (idaholab#29639)

dschwen · Jan 7, 2025 · 3b2ab65 · 3b2ab65
1 parent 0d9b1a1
commit 3b2ab65
Show file tree

Hide file tree

Showing 13 changed files with 1,814 additions and 1,734 deletions.
diff --git a/framework/include/userobjects/SolutionUserObject.h b/framework/include/userobjects/SolutionUserObject.h
diff --git a/framework/include/userobjects/SolutionUserObjectBase.h b/framework/include/userobjects/SolutionUserObjectBase.h
diff --git a/framework/src/auxkernels/SolutionAux.C b/framework/src/auxkernels/SolutionAux.C
@@ -39,7 +39,7 @@ SolutionAux::validParams()
 
 SolutionAux::SolutionAux(const InputParameters & parameters)
   : AuxKernel(parameters),
-    _solution_object(getUserObject<SolutionUserObject>("solution")),
+    _solution_object(getUserObject<SolutionUserObjectBase>("solution")),
     _direct(getParam<bool>("direct")),
     _scale_factor(getParam<Real>("scale_factor")),
     _add_factor(getParam<Real>("add_factor"))

diff --git a/framework/src/auxkernels/SolutionScalarAux.C b/framework/src/auxkernels/SolutionScalarAux.C
@@ -35,7 +35,7 @@ SolutionScalarAux::validParams()
 
 SolutionScalarAux::SolutionScalarAux(const InputParameters & parameters)
   : AuxScalarKernel(parameters),
-    _solution_object(getUserObject<SolutionUserObject>("solution")),
+    _solution_object(getUserObject<SolutionUserObjectBase>("solution")),
     _scale_factor(getParam<Real>("scale_factor")),
     _add_factor(getParam<Real>("add_factor"))
 {

diff --git a/framework/src/functions/Axisymmetric2D3DSolutionFunction.C b/framework/src/functions/Axisymmetric2D3DSolutionFunction.C
@@ -107,7 +107,7 @@ Axisymmetric2D3DSolutionFunction::initialSetup()
   // Get a pointer to the SolutionUserObject. A pointer is used because the UserObject is not
   // available during the
   // construction of the function
-  _solution_object_ptr = &getUserObject<SolutionUserObject>("solution");
+  _solution_object_ptr = &getUserObject<SolutionUserObjectBase>("solution");
 
   // If 'from_variable' is not specified, get the value from the SolutionUserObject
   if (_var_names.size() == 0)

diff --git a/framework/src/functions/SolutionFunction.C b/framework/src/functions/SolutionFunction.C
@@ -57,7 +57,7 @@ SolutionFunction::initialSetup()
   // Get a pointer to the SolutionUserObject. A pointer is used because the UserObject is not
   // available during the
   // construction of the function
-  _solution_object_ptr = &getUserObject<SolutionUserObject>("solution");
+  _solution_object_ptr = &getUserObject<SolutionUserObjectBase>("solution");
 
   std::string var_name;
 

diff --git a/framework/src/ics/ScalarSolutionIC.C b/framework/src/ics/ScalarSolutionIC.C
@@ -34,7 +34,7 @@ ScalarSolutionIC::validParams()
 
 ScalarSolutionIC::ScalarSolutionIC(const InputParameters & parameters)
   : ScalarInitialCondition(parameters),
-    _solution_object(getUserObject<SolutionUserObject>("solution_uo")),
+    _solution_object(getUserObject<SolutionUserObjectBase>("solution_uo")),
     _solution_object_var_name(getParam<VariableName>("from_variable"))
 {
 }

diff --git a/framework/src/ics/SolutionIC.C b/framework/src/ics/SolutionIC.C
@@ -31,7 +31,7 @@ SolutionIC::validParams()
 
 SolutionIC::SolutionIC(const InputParameters & parameters)
   : InitialCondition(parameters),
-    _solution_object(getUserObject<SolutionUserObject>("solution_uo")),
+    _solution_object(getUserObject<SolutionUserObjectBase>("solution_uo")),
     _solution_object_var_name(getParam<VariableName>("from_variable"))
 {
 }