Clean up PressureAction

Use the proper mechanics for forwarding
idaholab · Jan 14, 2025 · 59e325e · 59e325e
1 parent 94895b1
commit 59e325e
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/modules/solid_mechanics/src/actions/PressureAction.C b/modules/solid_mechanics/src/actions/PressureAction.C
@@ -46,6 +46,7 @@ PressureAction::validParams()
       true,
       "Set the enabled status of the BCs created by the Pressure action (defaults to true).");
   params.declareControllable("enable");
+  params.declareControllable("factor");
 
   // Residual output
   params.addParam<std::vector<AuxVariableName>>(
@@ -86,17 +87,17 @@ PressureAction::act()
   if (_use_ad)
     ad_prepend = "AD";
 
-  std::string kernel_name = ad_prepend + "Pressure";
+  std::string bc_type = ad_prepend + "Pressure";
 
   std::vector<VariableName> displacements = getParam<std::vector<VariableName>>("displacements");
 
   // Create pressure BCs
   for (unsigned int i = 0; i < displacements.size(); ++i)
   {
     // Create unique kernel name for each of the components
-    std::string unique_kernel_name = kernel_name + "_" + _name + "_" + Moose::stringify(i);
+    std::string bc_name = bc_type + "_" + _name + "_" + Moose::stringify(i);
 
-    InputParameters params = _factory.getValidParams(kernel_name);
+    InputParameters params = _factory.getValidParams(bc_type);
     params.applyParameters(parameters(), {"factor"});
     params.set<bool>("use_displaced_mesh") = getParam<bool>("use_displaced_mesh");
     params.set<Real>("alpha") =
@@ -106,16 +107,19 @@ PressureAction::act()
     if (isParamValid("control_tags"))
       params.set<std::vector<std::string>>("control_tags") =
           getParam<std::vector<std::string>>("control_tags");
-    // Setting a reference like this in three BCs is dangerous (the three BCs can no longer
-    // be controlled independently). So we only do this if "enable" is set explicitly
-    params.set<bool>("enable") = getParam<bool>("enable");
+    if (isParamValid("enable"))
+      params.set<bool>("enable") = getParam<bool>("enable");
 
     params.set<NonlinearVariableName>("variable") = displacements[i];
 
     if (_has_save_in_vars[i])
       params.set<std::vector<AuxVariableName>>("save_in") = _save_in_vars[i];
 
     params.set<Real>("factor") = getParam<Real>("factor");
-    _problem->addBoundaryCondition(kernel_name, unique_kernel_name, params);
+    _problem->addBoundaryCondition(bc_type, bc_name, params);
+    // The three BCs can no longer be controlled independently. We agreed on PR#29603 that this
+    // was not a problem
+    if (isParamValid("enable"))
+      connectControllableParams("enable", bc_type, bc_name, "enable");
   }
 }