remove rename code

kyriv1980 · kyriv1980 · commit 1912ec58c333 · 2026-01-13T10:16:04.000-07:00
diff --git a/modules/subchannel/doc/content/modules/subchannel/general/subchannel_theory.md b/modules/subchannel/doc/content/modules/subchannel/general/subchannel_theory.md
@@ -12,11 +12,7 @@ Subchannel codes are thermal-hydraulic codes that offer an efficient compromise
 
 !! Intentional comment to provide extra spacing
 
-<<<<<<< HEAD
 The subchannel thermal-hydraulic analysis is based on the conservation equations of mass, linear momentum and energy on the specified control volumes. The control volumes are connected in both axial and radial directions to capture the three dimensional effects of the flow geometry. The subchannel control volumes are shown in [ControlVolume] from [!cite](todreas2021nuclear2).
-=======
-The subchannel thermal-hydraulic analysis is based on the conservation equations of mass, linear momentum and energy on the specified control volumes. The control volumes are connected in both axial and radial directions to capture the three dimensional effects of the flow geometry. The subchannel control volumes are shown in [ControlVolume] from [!cite](Todreas).
->>>>>>> 672def255c (create new docs #32029)
 
 !media subchannel/getting_started/ControlVolume.png
     style=width:90%;margin-bottom:2%;margin:auto;
diff --git a/modules/subchannel/src/auxkernels/SCMBlockedMassFlowRateAux.C b/modules/subchannel/src/auxkernels/SCMBlockedMassFlowRateAux.C
@@ -11,10 +11,6 @@
 #include "SCM.h"
 
 registerMooseObject("SubChannelApp", SCMBlockedMassFlowRateAux);
-registerMooseObjectRenamed("SubChannelApp",
-                           BlockedMassFlowRateAux,
-                           "06/30/2025 24:00",
-                           SCMBlockedMassFlowRateAux);
 
 InputParameters
 SCMBlockedMassFlowRateAux::validParams()
diff --git a/modules/subchannel/src/auxkernels/SCMFlatMassFlowRateAux.C b/modules/subchannel/src/auxkernels/SCMFlatMassFlowRateAux.C
@@ -11,10 +11,6 @@
 #include "SCM.h"
 
 registerMooseObject("SubChannelApp", SCMFlatMassFlowRateAux);
-registerMooseObjectRenamed("SubChannelApp",
-                           FlatMassFlowRateAux,
-                           "06/30/2025 24:00",
-                           SCMFlatMassFlowRateAux);
 
 InputParameters
 SCMFlatMassFlowRateAux::validParams()
diff --git a/modules/subchannel/src/auxkernels/SCMMassFlowRateAux.C b/modules/subchannel/src/auxkernels/SCMMassFlowRateAux.C
@@ -10,10 +10,6 @@
 #include "SCMMassFlowRateAux.h"
 
 registerMooseObject("SubChannelApp", SCMMassFlowRateAux);
-registerMooseObjectRenamed("SubChannelApp",
-                           MassFlowRateAux,
-                           "06/30/2025 24:00",
-                           SCMMassFlowRateAux);
 
 InputParameters
 SCMMassFlowRateAux::validParams()
diff --git a/modules/subchannel/src/auxkernels/SCMQuadPowerAux.C b/modules/subchannel/src/auxkernels/SCMQuadPowerAux.C
@@ -13,7 +13,6 @@
 #include "SCM.h"
 
 registerMooseObject("SubChannelApp", SCMQuadPowerAux);
-registerMooseObjectRenamed("SubChannelApp", QuadPowerAux, "06/30/2025 24:00", SCMQuadPowerAux);
 
 InputParameters
 SCMQuadPowerAux::validParams()
diff --git a/modules/subchannel/src/auxkernels/SCMRZPinQPrimeAux.C b/modules/subchannel/src/auxkernels/SCMRZPinQPrimeAux.C
@@ -10,7 +10,6 @@
 #include "SCMRZPinQPrimeAux.h"
 
 registerMooseObject("SubChannelApp", SCMRZPinQPrimeAux);
-registerMooseObjectRenamed("SubChannelApp", RZPinQPrimeAux, "06/30/2025 24:00", SCMRZPinQPrimeAux);
 
 InputParameters
 SCMRZPinQPrimeAux ::validParams()
diff --git a/modules/subchannel/src/auxkernels/SCMTriPowerAux.C b/modules/subchannel/src/auxkernels/SCMTriPowerAux.C
@@ -13,7 +13,6 @@
 #include "SCM.h"
 
 registerMooseObject("SubChannelApp", SCMTriPowerAux);
-registerMooseObjectRenamed("SubChannelApp", TriPowerAux, "06/30/2025 24:00", SCMTriPowerAux);
 
 InputParameters
 SCMTriPowerAux::validParams()
diff --git a/modules/subchannel/src/ics/SCMMassFlowRateIC.C b/modules/subchannel/src/ics/SCMMassFlowRateIC.C
@@ -10,7 +10,6 @@
 #include "SCMMassFlowRateIC.h"
 
 registerMooseObject("SubChannelApp", SCMMassFlowRateIC);
-registerMooseObjectRenamed("SubChannelApp", MassFlowRateIC, "06/30/2025 24:00", SCMMassFlowRateIC);
 
 InputParameters
 SCMMassFlowRateIC::validParams()
diff --git a/modules/subchannel/src/ics/SCMQuadFlowAreaIC.C b/modules/subchannel/src/ics/SCMQuadFlowAreaIC.C
@@ -14,7 +14,6 @@
 #include "SCM.h"
 
 registerMooseObject("SubChannelApp", SCMQuadFlowAreaIC);
-registerMooseObjectRenamed("SubChannelApp", QuadFlowAreaIC, "06/30/2025 24:00", SCMQuadFlowAreaIC);
 
 InputParameters
 SCMQuadFlowAreaIC::validParams()
diff --git a/modules/subchannel/src/ics/SCMQuadPowerIC.C b/modules/subchannel/src/ics/SCMQuadPowerIC.C
@@ -15,7 +15,6 @@ using namespace std;
 using namespace Eigen;
 
 registerMooseObject("SubChannelApp", SCMQuadPowerIC);
-registerMooseObjectRenamed("SubChannelApp", QuadPowerIC, "06/30/2025 24:00", SCMQuadPowerIC);
 
 InputParameters
 SCMQuadPowerIC::validParams()
diff --git a/modules/subchannel/src/ics/SCMQuadWettedPerimIC.C b/modules/subchannel/src/ics/SCMQuadWettedPerimIC.C
@@ -11,10 +11,6 @@
 #include "QuadSubChannelMesh.h"
 
 registerMooseObject("SubChannelApp", SCMQuadWettedPerimIC);
-registerMooseObjectRenamed("SubChannelApp",
-                           QuadWettedPerimIC,
-                           "06/30/2025 24:00",
-                           SCMQuadWettedPerimIC);
 
 InputParameters
 SCMQuadWettedPerimIC::validParams()
diff --git a/modules/subchannel/src/ics/SCMTriFlowAreaIC.C b/modules/subchannel/src/ics/SCMTriFlowAreaIC.C
@@ -12,7 +12,6 @@
 #include "SCM.h"
 
 registerMooseObject("SubChannelApp", SCMTriFlowAreaIC);
-registerMooseObjectRenamed("SubChannelApp", TriFlowAreaIC, "06/30/2025 24:00", SCMTriFlowAreaIC);
 
 InputParameters
 SCMTriFlowAreaIC::validParams()
diff --git a/modules/subchannel/src/ics/SCMTriPowerIC.C b/modules/subchannel/src/ics/SCMTriPowerIC.C
@@ -12,7 +12,6 @@
 #include "TriSubChannelMesh.h"
 
 registerMooseObject("SubChannelApp", SCMTriPowerIC);
-registerMooseObjectRenamed("SubChannelApp", TriPowerIC, "06/30/2025 24:00", SCMTriPowerIC);
 
 InputParameters
 SCMTriPowerIC::validParams()
diff --git a/modules/subchannel/src/ics/SCMTriWettedPerimIC.C b/modules/subchannel/src/ics/SCMTriWettedPerimIC.C
@@ -11,10 +11,6 @@
 #include "TriSubChannelMesh.h"
 
 registerMooseObject("SubChannelApp", SCMTriWettedPerimIC);
-registerMooseObjectRenamed("SubChannelApp",
-                           TriWettedPerimIC,
-                           "06/30/2025 24:00",
-                           SCMTriWettedPerimIC);
 
 InputParameters
 SCMTriWettedPerimIC::validParams()
diff --git a/modules/subchannel/src/meshgenerators/SCMDetailedQuadPinMeshGenerator.C b/modules/subchannel/src/meshgenerators/SCMDetailedQuadPinMeshGenerator.C
@@ -12,10 +12,6 @@
 #include "libmesh/cell_prism6.h"
 
 registerMooseObject("SubChannelApp", SCMDetailedQuadPinMeshGenerator);
-registerMooseObjectRenamed("SubChannelApp",
-                           DetailedQuadPinMeshGenerator,
-                           "06/30/2025 24:00",
-                           SCMDetailedQuadPinMeshGenerator);
 
 InputParameters
 SCMDetailedQuadPinMeshGenerator::validParams()
diff --git a/modules/subchannel/src/meshgenerators/SCMDetailedQuadSubChannelMeshGenerator.C b/modules/subchannel/src/meshgenerators/SCMDetailedQuadSubChannelMeshGenerator.C
@@ -14,10 +14,6 @@
 #include "libmesh/unstructured_mesh.h"
 
 registerMooseObject("SubChannelApp", SCMDetailedQuadSubChannelMeshGenerator);
-registerMooseObjectRenamed("SubChannelApp",
-                           DetailedQuadSubChannelMeshGenerator,
-                           "06/30/2025 24:00",
-                           SCMDetailedQuadSubChannelMeshGenerator);
 
 InputParameters
 SCMDetailedQuadSubChannelMeshGenerator::validParams()
diff --git a/modules/subchannel/src/meshgenerators/SCMDetailedTriPinMeshGenerator.C b/modules/subchannel/src/meshgenerators/SCMDetailedTriPinMeshGenerator.C
@@ -12,10 +12,6 @@
 #include "libmesh/cell_prism6.h"
 
 registerMooseObject("SubChannelApp", SCMDetailedTriPinMeshGenerator);
-registerMooseObjectRenamed("SubChannelApp",
-                           DetailedTriPinMeshGenerator,
-                           "06/30/2025 24:00",
-                           SCMDetailedTriPinMeshGenerator);
 
 InputParameters
 SCMDetailedTriPinMeshGenerator::validParams()
diff --git a/modules/subchannel/src/meshgenerators/SCMDetailedTriSubChannelMeshGenerator.C b/modules/subchannel/src/meshgenerators/SCMDetailedTriSubChannelMeshGenerator.C
@@ -15,10 +15,6 @@
 #include "libmesh/unstructured_mesh.h"
 
 registerMooseObject("SubChannelApp", SCMDetailedTriSubChannelMeshGenerator);
-registerMooseObjectRenamed("SubChannelApp",
-                           DetailedTriSubChannelMeshGenerator,
-                           "06/30/2025 24:00",
-                           SCMDetailedTriSubChannelMeshGenerator);
 
 InputParameters
 SCMDetailedTriSubChannelMeshGenerator::validParams()
diff --git a/modules/subchannel/src/meshgenerators/SCMQuadPinMeshGenerator.C b/modules/subchannel/src/meshgenerators/SCMQuadPinMeshGenerator.C
@@ -12,10 +12,6 @@
 #include "libmesh/edge_edge2.h"
 
 registerMooseObject("SubChannelApp", SCMQuadPinMeshGenerator);
-registerMooseObjectRenamed("SubChannelApp",
-                           QuadPinMeshGenerator,
-                           "06/30/2025 24:00",
-                           SCMQuadPinMeshGenerator);
 
 InputParameters
 SCMQuadPinMeshGenerator::validParams()
diff --git a/modules/subchannel/src/meshgenerators/SCMQuadSubChannelMeshGenerator.C b/modules/subchannel/src/meshgenerators/SCMQuadSubChannelMeshGenerator.C
@@ -13,10 +13,6 @@
 #include <numeric>
 
 registerMooseObject("SubChannelApp", SCMQuadSubChannelMeshGenerator);
-registerMooseObjectRenamed("SubChannelApp",
-                           QuadSubChannelMeshGenerator,
-                           "06/30/2025 24:00",
-                           SCMQuadSubChannelMeshGenerator);
 
 InputParameters
 SCMQuadSubChannelMeshGenerator::validParams()
diff --git a/modules/subchannel/src/meshgenerators/SCMTriDuctMeshGenerator.C b/modules/subchannel/src/meshgenerators/SCMTriDuctMeshGenerator.C
@@ -14,10 +14,6 @@
 #include "libmesh/unstructured_mesh.h"
 
 registerMooseObject("SubChannelApp", SCMTriDuctMeshGenerator);
-registerMooseObjectRenamed("SubChannelApp",
-                           TriDuctMeshGenerator,
-                           "06/30/2025 24:00",
-                           SCMTriDuctMeshGenerator);
 
 InputParameters
 SCMTriDuctMeshGenerator::validParams()
diff --git a/modules/subchannel/src/meshgenerators/SCMTriPinMeshGenerator.C b/modules/subchannel/src/meshgenerators/SCMTriPinMeshGenerator.C
@@ -13,10 +13,6 @@
 #include <numeric>
 
 registerMooseObject("SubChannelApp", SCMTriPinMeshGenerator);
-registerMooseObjectRenamed("SubChannelApp",
-                           TriPinMeshGenerator,
-                           "06/30/2025 24:00",
-                           SCMTriPinMeshGenerator);
 
 InputParameters
 SCMTriPinMeshGenerator::validParams()
diff --git a/modules/subchannel/src/meshgenerators/SCMTriSubChannelMeshGenerator.C b/modules/subchannel/src/meshgenerators/SCMTriSubChannelMeshGenerator.C
@@ -14,10 +14,6 @@
 #include "libmesh/unstructured_mesh.h"
 
 registerMooseObject("SubChannelApp", SCMTriSubChannelMeshGenerator);
-registerMooseObjectRenamed("SubChannelApp",
-                           TriSubChannelMeshGenerator,
-                           "06/30/2025 24:00",
-                           SCMTriSubChannelMeshGenerator);
 
 InputParameters
 SCMTriSubChannelMeshGenerator::validParams()
diff --git a/modules/subchannel/src/postprocessors/SCMPinSurfaceTemperature.C b/modules/subchannel/src/postprocessors/SCMPinSurfaceTemperature.C
@@ -18,10 +18,6 @@
 #include "SCM.h"
 
 registerMooseObject("SubChannelApp", SCMPinSurfaceTemperature);
-registerMooseObjectRenamed("SubChannelApp",
-                           PinSurfaceTemperature,
-                           "06/30/2025 24:00",
-                           SCMPinSurfaceTemperature);
 
 InputParameters
 SCMPinSurfaceTemperature::validParams()
diff --git a/modules/subchannel/src/postprocessors/SCMPlanarMean.C b/modules/subchannel/src/postprocessors/SCMPlanarMean.C
@@ -18,7 +18,6 @@
 #include "SCM.h"
 
 registerMooseObject("SubChannelApp", SCMPlanarMean);
-registerMooseObjectRenamed("SubChannelApp", PlanarMean, "06/30/2025 24:00", SCMPlanarMean);
 
 InputParameters
 SCMPlanarMean::validParams()
diff --git a/modules/subchannel/src/scmclosures/SCMMixingKimAndChung.C b/modules/subchannel/src/scmclosures/SCMMixingKimAndChung.C
@@ -52,8 +52,8 @@ SCMMixingKimAndChung::computeTriLatticeMixingParameter(const unsigned int & i_ga
   auto mu_soln = SolutionHandle(_subproblem.getVariable(0, "mu"));
   auto P_soln = SolutionHandle(_subproblem.getVariable(0, "P"));
   auto T_soln = SolutionHandle(_subproblem.getVariable(0, "T"));
-  auto P_out = _scm_problem->_P_out;
-  auto fp = _scm_problem->_fp;
+  auto P_out = _scm_problem._P_out;
+  auto fp = _scm_problem._fp;
   const Real & pitch = _tri_sch_mesh->getPitch();
   const Real & pin_diameter = _tri_sch_mesh->getPinDiameter();
   auto chans = _tri_sch_mesh->getGapChannels(i_gap);
@@ -127,8 +127,8 @@ SCMMixingKimAndChung::computeQuadLatticeMixingParameter(const unsigned int & i_g
   auto mu_soln = SolutionHandle(_subproblem.getVariable(0, "mu"));
   auto P_soln = SolutionHandle(_subproblem.getVariable(0, "P"));
   auto T_soln = SolutionHandle(_subproblem.getVariable(0, "T"));
-  auto P_out = _scm_problem->_P_out;
-  auto fp = _scm_problem->_fp;
+  auto P_out = _scm_problem._P_out;
+  auto fp = _scm_problem._fp;
   const Real & pitch = _quad_sch_mesh->getPitch();
   const Real & pin_diameter = _quad_sch_mesh->getPinDiameter();
   auto chans = _quad_sch_mesh->getGapChannels(i_gap);
diff --git a/modules/subchannel/src/transfers/SCMPinSolutionTransfer.C b/modules/subchannel/src/transfers/SCMPinSolutionTransfer.C
@@ -11,10 +11,6 @@
 #include "SubChannelMesh.h"
 
 registerMooseObject("SubChannelApp", SCMPinSolutionTransfer);
-registerMooseObjectRenamed("SubChannelApp",
-                           PinSolutionTransfer,
-                           "06/30/2025 24:00",
-                           SCMPinSolutionTransfer);
 
 InputParameters
 SCMPinSolutionTransfer::validParams()
diff --git a/modules/subchannel/src/transfers/SCMSolutionTransfer.C b/modules/subchannel/src/transfers/SCMSolutionTransfer.C
@@ -11,10 +11,6 @@
 #include "SubChannelMesh.h"
 
 registerMooseObject("SubChannelApp", SCMSolutionTransfer);
-registerMooseObjectRenamed("SubChannelApp",
-                           SolutionTransfer,
-                           "06/30/2025 24:00",
-                           SCMSolutionTransfer);
 
 InputParameters
 SCMSolutionTransfer::validParams()
diff --git a/modules/subchannel/test/tests/ics/marvel/test.i b/modules/subchannel/test/tests/ics/marvel/test.i
@@ -5,7 +5,7 @@
 heated_length = 0.51
 [TriSubChannelMesh]
   [subchannel]
-    type = TriSubChannelMeshGenerator
+    type = SCMTriSubChannelMeshGenerator
     nrings = 4
     n_cells = 40
     flat_to_flat = 0.22
