Update BoundaryRestrictable to use MooseObject pointer

(refs idaholab#9889)
aeslaughter · Oct 23, 2017 · a269d62 · a269d62
1 parent d70aba2
commit a269d62
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 37 deletions.
diff --git a/framework/include/base/BoundaryRestrictable.h b/framework/include/base/BoundaryRestrictable.h
@@ -50,7 +50,7 @@ class BoundaryRestrictable
    * @param parameters The input parameters
    * @param nodal True indicates that the object is operating on nodesets, false for sidesets
    */
-  BoundaryRestrictable(const InputParameters & parameters, bool nodal);
+  BoundaryRestrictable(const MooseObject * moose_object, bool nodal);
 
   /**
    * Class constructor
@@ -60,7 +60,7 @@ class BoundaryRestrictable
    * @param block_ids The block ids that the object is restricted to
    * @param nodal True indicates that the object is operating on nodesets, false for sidesets
    */
-  BoundaryRestrictable(const InputParameters & parameters,
+  BoundaryRestrictable(const MooseObject * moose_object,
                        const std::set<SubdomainID> & block_ids,
                        bool nodal);
 
@@ -213,7 +213,7 @@ class BoundaryRestrictable
   /**
    * An initialization routine needed for dual constructors
    */
-  void initializeBoundaryRestrictable(const InputParameters & parameters);
+  void initializeBoundaryRestrictable(const MooseObject * moose_object);
 
 protected:
   /**

diff --git a/framework/include/base/BoundaryRestrictableRequired.h b/framework/include/base/BoundaryRestrictableRequired.h
@@ -33,7 +33,7 @@ InputParameters validParams<BoundaryRestrictableRequired>();
 class BoundaryRestrictableRequired : public BoundaryRestrictable
 {
 public:
-  BoundaryRestrictableRequired(const InputParameters & parameters, bool nodal);
+  BoundaryRestrictableRequired(const MooseObject * moose_object, bool nodal);
 };
 
 #endif // BOUNDARYRESTRICTABLEREQURIED_H
diff --git a/framework/src/auxkernels/AuxKernel.C b/framework/src/auxkernels/AuxKernel.C
@@ -63,7 +63,7 @@ validParams<AuxKernel>()
 AuxKernel::AuxKernel(const InputParameters & parameters)
   : MooseObject(parameters),
     BlockRestrictable(this),
-    BoundaryRestrictable(parameters,
+    BoundaryRestrictable(this,
                          parameters.get<AuxiliarySystem *>("_aux_sys")
                              ->getVariable(parameters.get<THREAD_ID>("_tid"),
                                            parameters.get<AuxVariableName>("variable"))

diff --git a/framework/src/base/BoundaryRestrictable.C b/framework/src/base/BoundaryRestrictable.C
@@ -38,42 +38,44 @@ validParams<BoundaryRestrictable>()
 }
 
 // Standard constructor
-BoundaryRestrictable::BoundaryRestrictable(const InputParameters & parameters, bool nodal)
-  : _bnd_feproblem(parameters.isParamValid("_fe_problem_base")
-                       ? parameters.get<FEProblemBase *>("_fe_problem_base")
+BoundaryRestrictable::BoundaryRestrictable(const MooseObject * moose_object, bool nodal)
+  : _bnd_feproblem(moose_object->isParamValid("_fe_problem_base")
+                       ? moose_object->getParam<FEProblemBase *>("_fe_problem_base")
                        : NULL),
-    _bnd_mesh(parameters.isParamValid("_mesh") ? parameters.get<MooseMesh *>("_mesh") : NULL),
-    _bnd_dual_restrictable(parameters.get<bool>("_dual_restrictable")),
+    _bnd_mesh(moose_object->isParamValid("_mesh") ? moose_object->getParam<MooseMesh *>("_mesh")
+                                                  : NULL),
+    _bnd_dual_restrictable(moose_object->getParam<bool>("_dual_restrictable")),
     _block_ids(_empty_block_ids),
-    _bnd_tid(parameters.isParamValid("_tid") ? parameters.get<THREAD_ID>("_tid") : 0),
+    _bnd_tid(moose_object->isParamValid("_tid") ? moose_object->getParam<THREAD_ID>("_tid") : 0),
     _bnd_material_data(_bnd_feproblem->getMaterialData(Moose::BOUNDARY_MATERIAL_DATA, _bnd_tid)),
     _bnd_nodal(nodal)
 {
-  initializeBoundaryRestrictable(parameters);
+  initializeBoundaryRestrictable(moose_object);
 }
 
 // Dual restricted constructor
-BoundaryRestrictable::BoundaryRestrictable(const InputParameters & parameters,
+BoundaryRestrictable::BoundaryRestrictable(const MooseObject * moose_object,
                                            const std::set<SubdomainID> & block_ids,
                                            bool nodal)
-  : _bnd_feproblem(parameters.isParamValid("_fe_problem_base")
-                       ? parameters.get<FEProblemBase *>("_fe_problem_base")
+  : _bnd_feproblem(moose_object->isParamValid("_fe_problem_base")
+                       ? moose_object->getParam<FEProblemBase *>("_fe_problem_base")
                        : NULL),
-    _bnd_mesh(parameters.isParamValid("_mesh") ? parameters.get<MooseMesh *>("_mesh") : NULL),
-    _bnd_dual_restrictable(parameters.get<bool>("_dual_restrictable")),
+    _bnd_mesh(moose_object->isParamValid("_mesh") ? moose_object->getParam<MooseMesh *>("_mesh")
+                                                  : NULL),
+    _bnd_dual_restrictable(moose_object->getParam<bool>("_dual_restrictable")),
     _block_ids(block_ids),
-    _bnd_tid(parameters.isParamValid("_tid") ? parameters.get<THREAD_ID>("_tid") : 0),
+    _bnd_tid(moose_object->isParamValid("_tid") ? moose_object->getParam<THREAD_ID>("_tid") : 0),
     _bnd_material_data(_bnd_feproblem->getMaterialData(Moose::BOUNDARY_MATERIAL_DATA, _bnd_tid)),
     _bnd_nodal(nodal)
 {
-  initializeBoundaryRestrictable(parameters);
+  initializeBoundaryRestrictable(moose_object);
 }
 
 void
-BoundaryRestrictable::initializeBoundaryRestrictable(const InputParameters & parameters)
+BoundaryRestrictable::initializeBoundaryRestrictable(const MooseObject * moose_object)
 {
   // The name and id of the object
-  const std::string & name = parameters.get<std::string>("_object_name");
+  const std::string & name = moose_object->getParam<std::string>("_object_name");
 
   // If the mesh pointer is not defined, but FEProblemBase is, get it from there
   if (_bnd_feproblem != NULL && _bnd_mesh == NULL)
@@ -85,10 +87,10 @@ BoundaryRestrictable::initializeBoundaryRestrictable(const InputParameters & par
                "a pointer to the MooseMesh via '_mesh'");
 
   // If the user supplies boundary IDs
-  if (parameters.isParamValid("boundary"))
+  if (moose_object->isParamValid("boundary"))
   {
     // Extract the blocks from the input
-    _boundary_names = parameters.get<std::vector<BoundaryName>>("boundary");
+    _boundary_names = moose_object->getParam<std::vector<BoundaryName>>("boundary");
 
     // Get the IDs from the supplied names
     std::vector<BoundaryID> vec_ids = _bnd_mesh->getBoundaryIDs(_boundary_names, true);

diff --git a/framework/src/base/BoundaryRestrictableRequired.C b/framework/src/base/BoundaryRestrictableRequired.C
@@ -35,8 +35,8 @@ validParams<BoundaryRestrictableRequired>()
   return params;
 }
 
-BoundaryRestrictableRequired::BoundaryRestrictableRequired(const InputParameters & parameters,
+BoundaryRestrictableRequired::BoundaryRestrictableRequired(const MooseObject * moose_object,
                                                            bool nodal)
-  : BoundaryRestrictable(parameters, nodal)
+  : BoundaryRestrictable(moose_object, nodal)
 {
 }
diff --git a/framework/src/bcs/BoundaryCondition.C b/framework/src/bcs/BoundaryCondition.C
@@ -45,7 +45,7 @@ validParams<BoundaryCondition>()
 
 BoundaryCondition::BoundaryCondition(const InputParameters & parameters, bool nodal)
   : MooseObject(parameters),
-    BoundaryRestrictableRequired(parameters, nodal),
+    BoundaryRestrictableRequired(this, nodal),
     SetupInterface(this),
     FunctionInterface(this),
     DistributionInterface(this),

diff --git a/framework/src/dgkernels/DGKernelBase.C b/framework/src/dgkernels/DGKernelBase.C
@@ -68,7 +68,7 @@ Threads::spin_mutex DGKernelBase::_jacoby_vars_mutex;
 
 DGKernelBase::DGKernelBase(const InputParameters & parameters)
   : MooseObject(parameters),
-    BoundaryRestrictable(parameters, false), // false for _not_ nodal
+    BoundaryRestrictable(this, false), // false for _not_ nodal
     SetupInterface(this),
     TransientInterface(this),
     FunctionInterface(this),

diff --git a/framework/src/ics/InitialCondition.C b/framework/src/ics/InitialCondition.C
@@ -55,7 +55,7 @@ InitialCondition::InitialCondition(const InputParameters & parameters)
                    .isNodal()),
     FunctionInterface(this),
     UserObjectInterface(this),
-    BoundaryRestrictable(parameters, _c_nodal),
+    BoundaryRestrictable(this, _c_nodal),
     DependencyResolverInterface(),
     Restartable(parameters, "InitialConditions"),
     ZeroInterface(parameters),

diff --git a/framework/src/materials/Material.C b/framework/src/materials/Material.C
@@ -74,7 +74,7 @@ validParams<Material>()
 Material::Material(const InputParameters & parameters)
   : MooseObject(parameters),
     BlockRestrictable(this),
-    BoundaryRestrictable(parameters, blockIDs(), false), // false for being _not_ nodal
+    BoundaryRestrictable(this, blockIDs(), false), // false for being _not_ nodal
     SetupInterface(this),
     Coupleable(this, false),
     MooseVariableDependencyInterface(),

diff --git a/framework/src/multiapps/AutoPositionsMultiApp.C b/framework/src/multiapps/AutoPositionsMultiApp.C
@@ -32,8 +32,7 @@ validParams<AutoPositionsMultiApp>()
 }
 
 AutoPositionsMultiApp::AutoPositionsMultiApp(const InputParameters & parameters)
-  : TransientMultiApp(parameters),
-    BoundaryRestrictable(parameters, true) // true for applying to nodesets
+  : TransientMultiApp(parameters), BoundaryRestrictable(this, true) // true for applying to nodesets
 {
 }
 

diff --git a/framework/src/nodalkernels/NodalKernel.C b/framework/src/nodalkernels/NodalKernel.C
@@ -63,7 +63,7 @@ validParams<NodalKernel>()
 NodalKernel::NodalKernel(const InputParameters & parameters)
   : MooseObject(parameters),
     BlockRestrictable(this),
-    BoundaryRestrictable(parameters, true), // true for applying to nodesets
+    BoundaryRestrictable(this, true), // true for applying to nodesets
     SetupInterface(this),
     FunctionInterface(this),
     UserObjectInterface(this),

diff --git a/framework/src/userobject/NodalNormalsPreprocessor.C b/framework/src/userobject/NodalNormalsPreprocessor.C
@@ -41,7 +41,7 @@ validParams<NodalNormalsPreprocessor>()
 
 NodalNormalsPreprocessor::NodalNormalsPreprocessor(const InputParameters & parameters)
   : ElementUserObject(parameters),
-    BoundaryRestrictable(parameters, true), // true for applying to nodesets
+    BoundaryRestrictable(this, true), // true for applying to nodesets
     _aux(_fe_problem.getAuxiliarySystem()),
     _fe_type(getParam<Order>("fe_order"), getParam<FEFamily>("fe_family")),
     _has_corners(isParamValid("corner_boundary")),

diff --git a/framework/src/userobject/NodalUserObject.C b/framework/src/userobject/NodalUserObject.C
@@ -37,7 +37,7 @@ validParams<NodalUserObject>()
 NodalUserObject::NodalUserObject(const InputParameters & parameters)
   : UserObject(parameters),
     BlockRestrictable(this),
-    BoundaryRestrictable(parameters, blockIDs(), true), // true for applying to nodesets
+    BoundaryRestrictable(this, blockIDs(), true), // true for applying to nodesets
     UserObjectInterface(this),
     Coupleable(this, true),
     MooseVariableDependencyInterface(),

diff --git a/framework/src/userobject/SideUserObject.C b/framework/src/userobject/SideUserObject.C
@@ -29,7 +29,7 @@ validParams<SideUserObject>()
 
 SideUserObject::SideUserObject(const InputParameters & parameters)
   : UserObject(parameters),
-    BoundaryRestrictableRequired(parameters, false), // false for applying to sidesets
+    BoundaryRestrictableRequired(this, false), // false for applying to sidesets
     MaterialPropertyInterface(this, boundaryIDs()),
     Coupleable(this, false),
     MooseVariableDependencyInterface(),

diff --git a/modules/rdg/src/userobjects/ElementLoopUserObject.C b/modules/rdg/src/userobjects/ElementLoopUserObject.C
@@ -39,7 +39,7 @@ ElementLoopUserObject::ElementLoopUserObject(const InputParameters & parameters)
 
 ElementLoopUserObject::ElementLoopUserObject(ElementLoopUserObject & x, Threads::split /*split*/)
   : GeneralUserObject(x.parameters()),
-    BlockRestrictable(x.parameters()),
+    BlockRestrictable(&x),
     Coupleable(this, false),
     MooseVariableDependencyInterface(),
     ZeroInterface(x.parameters()),

diff --git a/modules/tensor_mechanics/src/userobjects/CrackFrontDefinition.C b/modules/tensor_mechanics/src/userobjects/CrackFrontDefinition.C
@@ -87,7 +87,7 @@ const Real CrackFrontDefinition::_tol = 1e-10;
 
 CrackFrontDefinition::CrackFrontDefinition(const InputParameters & parameters)
   : GeneralUserObject(parameters),
-    BoundaryRestrictable(parameters, true), // false means nodesets
+    BoundaryRestrictable(this, true), // false means nodesets
     _aux(_fe_problem.getAuxiliarySystem()),
     _mesh(_subproblem.mesh()),
     _treat_as_2d(getParam<bool>("2d")),