Merge pull request #25730 from GiudGiud/PR_rename

Rename outdated terminology
idaholab · Oct 13, 2023 · 735b280 · 735b280
2 parents 6760c9d + d1ead3b
commit 735b280
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 37 deletions.
diff --git a/modules/thermal_hydraulics/include/components/HeatTransferFromHeatStructure1Phase.h b/modules/thermal_hydraulics/include/components/HeatTransferFromHeatStructure1Phase.h
@@ -32,17 +32,17 @@ class HeatTransferFromHeatStructure1Phase : public HeatTransferFromTemperature1P
   virtual void check() const override;
 
   /**
-   * Gets the "master side" (heat structure) boundary name for this connection
+   * Gets the heat structure boundary name for this connection
    *
-   * @return The boundary name of the master side
+   * @return The boundary name of the heat structure side
    */
-  const BoundaryName & getMasterSideName() const;
+  const BoundaryName & getHeatStructureSideName() const;
   /**
-   * Gets the "slave side" (flow channel) nodeset name for this connection
+   * Gets the flow channel nodeset name for this connection
    *
-   * @return The nodeset name for the slave side
+   * @return The nodeset name for the channel side
    */
-  const BoundaryName & getSlaveSideName() const;
+  const BoundaryName & getChannelSideName() const;
 
   /// Mesh alignment
   MeshAlignment _mesh_alignment;

diff --git a/modules/thermal_hydraulics/src/components/HeatTransferFromHeatStructure1Phase.C b/modules/thermal_hydraulics/src/components/HeatTransferFromHeatStructure1Phase.C
@@ -159,7 +159,7 @@ HeatTransferFromHeatStructure1Phase::addMooseObjects()
   {
     const std::string class_name = "ADHeatFlux3EqnBC";
     InputParameters params = _factory.getValidParams(class_name);
-    params.set<std::vector<BoundaryName>>("boundary") = {getMasterSideName()};
+    params.set<std::vector<BoundaryName>>("boundary") = {getHeatStructureSideName()};
     params.set<NonlinearVariableName>("variable") = HeatConductionModel::TEMPERATURE;
     params.set<UserObjectName>("q_uo") = heat_flux_uo_name;
     params.set<Real>("P_hs_unit") = hs.getUnitPerimeter(_hs_side);
@@ -179,27 +179,27 @@ HeatTransferFromHeatStructure1Phase::addMooseObjects()
     getTHMProblem().addMaterial(class_name, genName(name(), "T_wall_transfer_mat"), params);
   }
 
-  // Transfer the temperature of the solid onto the flow channel as aux varaible for visualization
+  // Transfer the temperature of the solid onto the flow channel as aux variable for visualization
   {
     std::string class_name = "VariableValueTransferAux";
     InputParameters params = _factory.getValidParams(class_name);
     params.set<AuxVariableName>("variable") = _T_wall_name;
-    params.set<std::vector<BoundaryName>>("boundary") = {getSlaveSideName()};
-    params.set<BoundaryName>("paired_boundary") = getMasterSideName();
+    params.set<std::vector<BoundaryName>>("boundary") = {getChannelSideName()};
+    params.set<BoundaryName>("paired_boundary") = getHeatStructureSideName();
     params.set<std::vector<VariableName>>("paired_variable") =
         std::vector<VariableName>(1, HeatConductionModel::TEMPERATURE);
     getTHMProblem().addAuxKernel(class_name, genName(name(), "T_wall_transfer"), params);
   }
 }
 
 const BoundaryName &
-HeatTransferFromHeatStructure1Phase::getMasterSideName() const
+HeatTransferFromHeatStructure1Phase::getHeatStructureSideName() const
 {
   return getHSBoundaryName(this);
 }
 
 const BoundaryName &
-HeatTransferFromHeatStructure1Phase::getSlaveSideName() const
+HeatTransferFromHeatStructure1Phase::getChannelSideName() const
 {
   const FlowChannel1Phase & flow_channel =
       getComponentByName<FlowChannel1Phase>(_flow_channel_name);

diff --git a/modules/thermal_hydraulics/src/postprocessors/ADHeatRateConvection1Phase.C b/modules/thermal_hydraulics/src/postprocessors/ADHeatRateConvection1Phase.C
@@ -20,7 +20,7 @@ ADHeatRateConvection1Phase::validParams()
   params.addParam<MaterialPropertyName>(
       "T_wall", FlowModelSinglePhase::TEMPERATURE_WALL, "Wall temperature");
   params.addParam<MaterialPropertyName>(
-      "T", FlowModelSinglePhase::TEMPERATURE, "Temperature of the fluid on the slave side");
+      "T", FlowModelSinglePhase::TEMPERATURE, "Temperature of the fluid on the channel side");
   params.addParam<MaterialPropertyName>(
       "Hw", FlowModelSinglePhase::HEAT_TRANSFER_COEFFICIENT_WALL, "Wall heat transfer coefficient");
   params.addRequiredCoupledVar("P_hf", "heat flux perimeter");

diff --git a/modules/thermal_hydraulics/src/postprocessors/HeatRateConvection1Phase.C b/modules/thermal_hydraulics/src/postprocessors/HeatRateConvection1Phase.C
@@ -20,7 +20,7 @@ HeatRateConvection1Phase::validParams()
   params.addParam<MaterialPropertyName>(
       "T_wall", FlowModelSinglePhase::TEMPERATURE_WALL, "Wall temperature");
   params.addParam<MaterialPropertyName>(
-      "T", FlowModelSinglePhase::TEMPERATURE, "Temperature of the fluid on the slave side");
+      "T", FlowModelSinglePhase::TEMPERATURE, "Temperature of the fluid on the channel side");
   params.addParam<MaterialPropertyName>(
       "Hw", FlowModelSinglePhase::HEAT_TRANSFER_COEFFICIENT_WALL, "Wall heat transfer coefficient");
   params.addRequiredCoupledVar("P_hf", "heat flux perimeter");

diff --git a/.../phy.form_loss_1phase.parent_out_slave0.e → .../phy.form_loss_1phase.parent_out_child0.e b/.../phy.form_loss_1phase.parent_out_slave0.e → .../phy.form_loss_1phase.parent_out_child0.e
diff --git a/...l_app_1phase/phy.form_loss_1phase.slave.i → ...l_app_1phase/phy.form_loss_1phase.child.i b/...l_app_1phase/phy.form_loss_1phase.slave.i → ...l_app_1phase/phy.form_loss_1phase.child.i
diff --git a/...cs/test/tests/components/form_loss_from_external_app_1phase/phy.form_loss_1phase.parent.i b/...cs/test/tests/components/form_loss_from_external_app_1phase/phy.form_loss_1phase.parent.i
@@ -1,6 +1,7 @@
 # This tests a form loss transfer using the MultiApp system.  A dummy heat
 # conduction problem is solved, then the form loss evaluated and transferred
-# to the slave side of the solve, slave side solves and master continues solving
+# to the child app side of the solve, then the child app solves and then the
+# parent continues solving
 
 [Mesh]
   type = GeneratedMesh
@@ -78,18 +79,18 @@
 []
 
 [MultiApps]
-  [slave]
+  [child]
     type = TransientMultiApp
     app_type = ThermalHydraulicsApp
-    input_files = phy.form_loss_1phase.slave.i
+    input_files = phy.form_loss_1phase.child.i
     execute_on = 'timestep_end'
   []
 []
 
 [Transfers]
   [K_to_s]
     type = MultiAppNearestNodeTransfer
-    to_multi_app = slave
+    to_multi_app = child
     source_variable = K_prime
     variable = K_prime
   []

diff --git a/modules/thermal_hydraulics/test/tests/components/form_loss_from_external_app_1phase/tests b/modules/thermal_hydraulics/test/tests/components/form_loss_from_external_app_1phase/tests
@@ -2,7 +2,7 @@
   [phy:form_loss_1phase]
     type = 'Exodiff'
     input = 'phy.form_loss_1phase.parent.i'
-    exodiff = 'phy.form_loss_1phase.parent_out_slave0.e'
+    exodiff = 'phy.form_loss_1phase.parent_out_child0.e'
     rel_err = 1e-10
     recover = false
   []

diff --git a/...p_1phase/phy.T_wall_transfer_3eqn.slave.i → ...p_1phase/phy.T_wall_transfer_3eqn.child.i b/...p_1phase/phy.T_wall_transfer_3eqn.slave.i → ...p_1phase/phy.T_wall_transfer_3eqn.child.i
diff --git a/...tests/components/heat_transfer_from_external_app_1phase/phy.T_wall_transfer_3eqn.parent.i b/...tests/components/heat_transfer_from_external_app_1phase/phy.T_wall_transfer_3eqn.parent.i
@@ -1,6 +1,6 @@
 # This tests a temperature transfer using the MultiApp system.  Simple heat
-# conduction problem is solved, then the temperature is picked up by the slave
-# side of the solve, slave side solves and transfers its variables back to the
+# conduction problem is solved, then the temperature is picked up by the child
+# side of the solve, child side solves and transfers its variables back to the
 # master
 
 [Mesh]
@@ -64,13 +64,13 @@
   [thm]
     type = TransientMultiApp
     app_type = ThermalHydraulicsApp
-    input_files = phy.T_wall_transfer_3eqn.slave.i
+    input_files = phy.T_wall_transfer_3eqn.child.i
     execute_on = TIMESTEP_END
   []
 []
 
 [Transfers]
-  [T_to_slave]
+  [T_to_child]
     type = MultiAppNearestNodeTransfer
     to_multi_app = thm
     source_variable = T

diff --git a/...ase/phy.T_wall_transfer_elem_3eqn.slave.i → ...ase/phy.T_wall_transfer_elem_3eqn.child.i b/...ase/phy.T_wall_transfer_elem_3eqn.slave.i → ...ase/phy.T_wall_transfer_elem_3eqn.child.i
diff --git a/.../components/heat_transfer_from_external_app_1phase/phy.T_wall_transfer_elem_3eqn.parent.i b/.../components/heat_transfer_from_external_app_1phase/phy.T_wall_transfer_elem_3eqn.parent.i
@@ -1,6 +1,6 @@
 # This tests a temperature transfer using the MultiApp system.  Simple heat
 # conduction problem is solved, then the layered average is computed and
-# transferred into the slave side of the solve
+# transferred into the child side of the solve
 
 [Mesh]
   type = GeneratedMesh
@@ -73,13 +73,13 @@
   [thm]
     type = TransientMultiApp
     app_type = ThermalHydraulicsApp
-    input_files = phy.T_wall_transfer_elem_3eqn.slave.i
+    input_files = phy.T_wall_transfer_elem_3eqn.child.i
     execute_on = TIMESTEP_END
   []
 []
 
 [Transfers]
-  [T_to_slave]
+  [T_to_child]
     type = MultiAppUserObjectTransfer
     to_multi_app = thm
     user_object = T_avg_uo

diff --git a/...p_1phase/phy.q_wall_transfer_3eqn.slave.i → ...p_1phase/phy.q_wall_transfer_3eqn.child.i b/...p_1phase/phy.q_wall_transfer_3eqn.slave.i → ...p_1phase/phy.q_wall_transfer_3eqn.child.i
diff --git a/...tests/components/heat_transfer_from_external_app_1phase/phy.q_wall_transfer_3eqn.parent.i b/...tests/components/heat_transfer_from_external_app_1phase/phy.q_wall_transfer_3eqn.parent.i
@@ -1,6 +1,6 @@
 # This tests a heat flux transfer using the MultiApp system.  Simple heat
-# conduction problem is solved, then the heat flux is picked up by the slave
-# side of the solve, slave side solves and transfers its variables back to the
+# conduction problem is solved, then the heat flux is picked up by the child
+# side of the solve, child side solves and transfers its variables back to the
 # master
 
 [Mesh]
@@ -79,7 +79,7 @@
   [thm]
     type = TransientMultiApp
     app_type = ThermalHydraulicsApp
-    input_files = phy.q_wall_transfer_3eqn.slave.i
+    input_files = phy.q_wall_transfer_3eqn.child.i
     execute_on = 'initial timestep_end'
   []
 []

diff --git a/...les/thermal_hydraulics/test/tests/components/heat_transfer_from_external_app_1phase/tests b/...les/thermal_hydraulics/test/tests/components/heat_transfer_from_external_app_1phase/tests
@@ -16,7 +16,9 @@
     type = Exodiff
     input = 'phy.T_wall_transfer_3eqn.parent.i'
     exodiff = 'phy.T_wall_transfer_ext_3eqn.e phy.T_wall_transfer_ext_3eqn_thm0_out.e'
-    cli_args = "Outputs/file_base=phy.T_wall_transfer_ext_3eqn Transfers/T_to_slave/variable=T_ext thm:AuxVariables/T_ext thm:AuxVariables/T_ext/initial_condition=300 thm:Components/hxconn/T_ext=T_ext thm:Outputs/out/show='T_ext'"
+    cli_args = "Outputs/file_base=phy.T_wall_transfer_ext_3eqn Transfers/T_to_child/variable=T_ext "
+               "thm:AuxVariables/T_ext thm:AuxVariables/T_ext/initial_condition=300 "
+               "thm:Components/hxconn/T_ext=T_ext thm:Outputs/out/show='T_ext'"
   []
 
   [phy:T_wall_transfer_elem_3eqn]

diff --git a/...ermal_hydraulics/test/tests/components/hs_boundary_external_app_convection/plate.parent.i b/...ermal_hydraulics/test/tests/components/hs_boundary_external_app_convection/plate.parent.i
@@ -2,7 +2,7 @@
 # Simple heat conduction problem with heat source is solved,
 # to obtain an analytical solution:
 # T(x,t) = 300 + 20t(x-1)^2
-# The temperature is picked up by the slave
+# The temperature is picked up by the child
 # side of the solve, to use as ambiant temperature in a convective BC.
 htc = 100
 
@@ -59,8 +59,8 @@ htc = 100
 
   [source]
     type = BodyForce
-     function = 'source_term'
-     variable = T
+    function = 'source_term'
+    variable = T
   []
 []
 
@@ -97,13 +97,13 @@ htc = 100
 []
 
 [Transfers]
-  [T_to_slave]
+  [T_to_child]
     type = MultiAppNearestNodeTransfer
     to_multi_app = thm
     source_variable = T
     variable = T_ext
   []
-  [htc_to_slave]
+  [htc_to_child]
     type = MultiAppNearestNodeTransfer
     to_multi_app = thm
     source_variable = htc_ext

diff --git a/...dary_external_app_temperature/phy.slave.i → ...dary_external_app_temperature/phy.child.i b/...dary_external_app_temperature/phy.slave.i → ...dary_external_app_temperature/phy.child.i
diff --git a/...hermal_hydraulics/test/tests/components/hs_boundary_external_app_temperature/phy.parent.i b/...hermal_hydraulics/test/tests/components/hs_boundary_external_app_temperature/phy.parent.i
@@ -1,4 +1,4 @@
-# This tests a transfer of temperature values computed by master app and used by a slave app
+# This tests a transfer of temperature values computed by master app and used by a child app
 # as a heat structure boundary condition
 
 [Mesh]
@@ -72,7 +72,7 @@
   [thm]
     type = TransientMultiApp
     app_type = ThermalHydraulicsApp
-    input_files = phy.slave.i
+    input_files = phy.child.i
     execute_on = 'initial timestep_end'
   []
 []