Merge mesh generators

modules/combined/test/tests/subchannel_thm_coupling/3D.i

@@ -10,24 +10,14 @@ heated_length = 1.0
 ###################################################
 [TriSubChannelMesh]
   [subchannel]
-    type = SCMDetailedTriSubChannelMeshGenerator
+    type = SCMDetailedTriAssemblyMeshGenerator
     nrings = ${n_rings}
     n_cells = ${n_cells}
     flat_to_flat = ${inner_duct_in}
     heated_length = ${heated_length}
     pin_diameter = ${fuel_pin_diameter}
     pitch = ${fuel_pin_pitch}
   []
-
-  [fuel_pins]
-    type = SCMDetailedTriPinMeshGenerator
-    input = subchannel
-    nrings = ${n_rings}
-    n_cells = ${n_cells}
-    pin_diameter = ${fuel_pin_diameter}
-    heated_length = ${heated_length}
-    pitch = ${fuel_pin_pitch}
-  []
 []
 
 [AuxVariables]

modules/combined/test/tests/subchannel_thm_coupling/subchannel.i

@@ -17,7 +17,7 @@ heated_length = 1.0
 ###################################################
 [TriSubChannelMesh]
   [subchannel]
-    type = SCMTriSubChannelMeshGenerator
+    type = SCMTriAssemblyMeshGenerator
     nrings = ${n_rings}
     n_cells = ${n_cells}
     flat_to_flat = ${inner_duct_in}
@@ -29,15 +29,6 @@ heated_length = 1.0
     spacer_z = '0.0'
     spacer_k = '0.0'
   []
-
-  [fuel_pins]
-    type = SCMTriPinMeshGenerator
-    input = subchannel
-    nrings = ${n_rings}
-    n_cells = ${n_cells}
-    heated_length = ${heated_length}
-    pitch = ${fuel_pin_pitch}
-  []
 []
 
 [AuxVariables]
@@ -273,12 +264,14 @@ heated_length = 1.0
 [Transfers]
   [subchannel_transfer]
     type = SCMSolutionTransfer
+    transfer_type = subchannel
     to_multi_app = viz
     variable = 'mdot SumWij P DP h T rho mu S'
   []
   [pin_transfer]
-    type = SCMPinSolutionTransfer
+    type = SCMSolutionTransfer
+    transfer_type = pin
     to_multi_app = viz
-    variable = 'Dpin Tpin q_prime'
+    variable = 'Tpin q_prime Dpin'
   []
 []

modules/subchannel/doc/content/modules/subchannel/v&v/ornl_19_pin.md

@@ -66,7 +66,7 @@ The general parameters on the experimental conditions are described here. The pu
 
 ### Mesh
 
-The meshing in SCM uses a custom *SCMTriSubChannelMeshGenerator*.
+The meshing in SCM uses a custom *SCMTriAssemblyMeshGenerator*.
 This one generates a mesh of 1D channel segments connected in 3D.
 The subchannel positions are automatically generated by specifying the number of radial rings, the flat to flat distance of the duct, and the pin pitch.
 The number of axial cells in which the domain is discretrized is specified by *n_cells*.
@@ -121,7 +121,7 @@ A custom transfer, *SCMSolutionTransfer*, is used for this purpose.
 
 !listing /validation/ORNL_19_pin/test_ORNL_19.i block=Transfers language=moose
 
-The detailed mesh uses a *SCMDetailedTriSubChannelMeshGenerator* and the solution variables are populated by the transfer.
+The detailed mesh uses a *SCMDetailedTriAssemblyMeshGenerator* and the solution variables are populated by the transfer.
 
 !listing /validation/ORNL_19_pin/test_ORNL_19.i language=moose
 

modules/subchannel/doc/content/modules/subchannel/v&v/toshiba_37_pin.md

@@ -65,7 +65,7 @@ P_out = 2.0e5 # Pa
 
 ### Mesh
 
-The meshing in SCM uses a custom [SCMTriSubChannelMeshGenerator](source/meshgenerators/SCMTriSubChannelMeshGenerator.md).
+The meshing in SCM uses a custom [SCMTriAssemblyMeshGenerator](source/meshgenerators/SCMTriAssemblyMeshGenerator.md).
 This one generates a mesh of 1D channel segments connected in 3D.
 The subchannel positions are automatically generated by specifying the number of radial rings, the flat to flat distance of the duct, and the pin pitch. The number of axial cells in which the domain is discretrized is specified by *n_cells*.
 For more information about the mesh generator, pelase consult the website documentation on SCM.
@@ -121,7 +121,7 @@ A custom transfer, *MultiAppDetailedSolutionTransfer*, is used for this purpose.
 
 !listing /validation/Toshiba_37_pin/toshiba_37_pin.i block=Transfers language=moose
 
-The detailed mesh uses a *SCMDetailedTriSubChannelMeshGenerator* and the solution variables are populated by the transfer.
+The detailed mesh uses a *SCMDetailedTriAssemblyMeshGenerator* and the solution variables are populated by the transfer.
 
 !listing /validation/Toshiba_37_pin/toshiba_37_pin.i block=viz language=moose
 

modules/subchannel/doc/content/source/auxkernels/SCMQuadPowerAux.md

@@ -12,8 +12,7 @@ This AuxKernel does the same thing as the [SCMQuadPowerIC](SCMQuadPowerIC.md) IC
 
 !! Intentional comment to provide extra spacing
 
-If the user has created a mesh for the pins, the axial heat rate `q_prime` will be assigned to the nodes of the pin mesh. If the user hasn't created a pin mesh the appropriate heat rate `q_prime` will be assigned to
-the nodes of the subchannel mesh.
+This AuxKernel requires a pin mesh. The axial heat rate `q_prime` is assigned only to the nodes of the pin mesh. If the subchannel mesh has no pin mesh, this object reports an error.
 
 !syntax parameters /AuxKernels/SCMQuadPowerAux
 

modules/subchannel/doc/content/source/auxkernels/SCMTriPowerAux.md

@@ -12,8 +12,7 @@ This AuxKernel does the same thing as the [SCMTriPowerIC](SCMTriPowerIC.md) IC k
 
 !! Intentional comment to provide extra spacing
 
-If the user has created a mesh for the pins, the axial heat rate `q_prime` will be assigned to the nodes of the pin mesh. If the user hasn't created a pin mesh the appropriate heat rate `q_prime` will be assigned to
-the nodes of the subchannel mesh.
+This AuxKernel requires a pin mesh. The axial heat rate `q_prime` is assigned only to the nodes of the pin mesh. If the subchannel mesh has no pin mesh, this object reports an error.
 
 !syntax parameters /AuxKernels/SCMTriPowerAux
 

modules/subchannel/doc/content/source/ics/SCMQuadPowerIC.md

@@ -6,7 +6,7 @@
 
 !! Intentional comment to provide extra spacing
 
-This IC assigns the axial heat rate ([!param](/ICs/SCMQuadPowerIC/variable) = `q_prime`) on the subchannels or pins in the case of a problem with subchannels/pins in a square lattice arrangement.
+This IC assigns the axial heat rate ([!param](/ICs/SCMQuadPowerIC/variable) = `q_prime`) to the fuel pins in a square lattice arrangement.
 
 The user must provide the  total power of the subassembly [!param](/ICs/SCMQuadPowerIC/power), the axial shape of the power profile and the radial power distribution (power per pin). The axial power profile is given as a function over the -z direction, which integral over the length of the heated portion of the pin, is equal to the length of the heated portion of the pin. The radial power distribution is given as a column of numbers in a .txt file [!param](/ICs/SCMQuadPowerIC/filename) that has as many entries as the number of pins.
 
@@ -24,8 +24,7 @@ The axial heat rate at a specific height is the product of the total power of th
 
 !! Intentional comment to provide extra spacing
 
-If the user has created a mesh for the pins, the axial heat rate will be assigned to the nodes of the pin mesh. If the user hasn't created a pin mesh the appropriate heat rate will be assigned to
-the nodes of the subchannel mesh. When the user has defined a fuel-pin mesh, the axial heat rate ([!param](/ICs/SCMTriPowerIC/variable) = `q_prime`) is the heat rate at the surface of the fuels pins and it is distributed equally to each neighboring subchannel.
+This IC requires a pin mesh. The axial heat rate ([!param](/ICs/SCMQuadPowerIC/variable) = `q_prime`) is assigned only to the nodes of the pin mesh. If the subchannel mesh has no pin mesh, this object reports an error. The subchannel solver distributes this pin heat to neighboring subchannels when computing the heat added to the coolant.
 
 !syntax parameters /ICs/SCMQuadPowerIC
 

modules/subchannel/doc/content/source/ics/SCMTriPowerIC.md

@@ -6,7 +6,7 @@
 
 !! Intentional comment to provide extra spacing
 
-This IC assigns the axial heat rate ([!param](/ICs/SCMTriPowerIC/variable) = `q_prime`) on the subchannels or pins in the case of a problem with subchannels/pins in a triangular lattice arrangement.
+This IC assigns the axial heat rate ([!param](/ICs/SCMTriPowerIC/variable) = `q_prime`) to the fuel pins in a triangular lattice arrangement.
 
 The user must provide the total power of the subassembly [!param](/ICs/SCMTriPowerIC/power), the axial shape of the power profile and the radial
 power distribution (power per pin). The axial power profile is given as a function, which integral over the length of the heated portion of the pin, is equal
@@ -26,8 +26,7 @@ The axial heat rate at a specific height is the product of the total power of th
 
 !! Intentional comment to provide extra spacing
 
-If the user has created a mesh for the pins, the axial hear rate will be assigned to the nodes of the pin mesh. If the user hasn't created a pin mesh the appropiate heat rate will be assigned to
-the nodes of the subchannel mesh. When the user has defined a fuel-pin mesh, the axial heat rate ([!param](/ICs/SCMTriPowerIC/variable) = `q_prime`) is the heat rate at the surface of the fuels pins and it is distributed equally to each neighboring subchannel.
+This IC requires a pin mesh. The axial heat rate ([!param](/ICs/SCMTriPowerIC/variable) = `q_prime`) is assigned only to the nodes of the pin mesh. If the subchannel mesh has no pin mesh, this object reports an error. The subchannel solver distributes this pin heat to neighboring subchannels when computing the heat added to the coolant.
 
 !syntax parameters /ICs/SCMTriPowerIC
 

modules/subchannel/doc/content/source/meshgenerators/SCMDetailedQuadAssemblyMeshGenerator.md

@@ -0,0 +1,17 @@
+# SCMDetailedQuadAssemblyMeshGenerator
+
+!syntax description /Mesh/SCMDetailedQuadAssemblyMeshGenerator
+
+## Overview
+
+!! Intentional comment to provide extra spacing
+
+This mesh generator creates one detailed 3D visualization mesh containing both the subchannel
+volume and the fuel pin volume for a square lattice arrangement. The generated subdomains are named
+`subchannel` and `fuel_pins`.
+
+!syntax parameters /Mesh/SCMDetailedQuadAssemblyMeshGenerator
+
+!syntax inputs /Mesh/SCMDetailedQuadAssemblyMeshGenerator
+
+!syntax children /Mesh/SCMDetailedQuadAssemblyMeshGenerator

modules/subchannel/doc/content/source/meshgenerators/SCMDetailedTriAssemblyMeshGenerator.md

@@ -0,0 +1,17 @@
+# SCMDetailedTriAssemblyMeshGenerator
+
+!syntax description /Mesh/SCMDetailedTriAssemblyMeshGenerator
+
+## Overview
+
+!! Intentional comment to provide extra spacing
+
+This mesh generator creates one detailed 3D visualization mesh containing both the subchannel
+volume and the fuel pin volume for a triangular lattice arrangement. The generated subdomains are
+named `subchannel` and `fuel_pins`.
+
+!syntax parameters /Mesh/SCMDetailedTriAssemblyMeshGenerator
+
+!syntax inputs /Mesh/SCMDetailedTriAssemblyMeshGenerator
+
+!syntax children /Mesh/SCMDetailedTriAssemblyMeshGenerator

modules/subchannel/doc/content/source/meshgenerators/SCMQuadAssemblyMeshGenerator.md

@@ -0,0 +1,21 @@
+# SCMQuadAssemblyMeshGenerator
+
+!syntax description /Mesh/SCMQuadAssemblyMeshGenerator
+
+## Overview
+
+!! Intentional comment to provide extra spacing
+
+This mesh generator creates the 1D subchannel and pin meshes for a square lattice arrangement.
+The generated subdomains are named `subchannel` and `fuel_pins`.
+The center of the mesh is the origin.
+
+## Example Input File Syntax
+
+!listing /test/tests/problems/psbt/psbt_explicit.i block=QuadSubChannelMesh language=moose
+
+!syntax parameters /Mesh/SCMQuadAssemblyMeshGenerator
+
+!syntax inputs /Mesh/SCMQuadAssemblyMeshGenerator
+
+!syntax children /Mesh/SCMQuadAssemblyMeshGenerator

modules/subchannel/doc/content/source/meshgenerators/SCMTriAssemblyMeshGenerator.md

@@ -0,0 +1,21 @@
+# SCMTriAssemblyMeshGenerator
+
+!syntax description /Mesh/SCMTriAssemblyMeshGenerator
+
+## Overview
+
+!! Intentional comment to provide extra spacing
+
+This mesh generator creates the 1D subchannel and pin meshes for a triangular lattice arrangement.
+The generated subdomains are named `subchannel` and `fuel_pins`.
+The center of the mesh is the origin.
+
+## Example Input File Syntax
+
+!listing /test/tests/problems/SFR/sodium-19pin/test19_monolithic.i block=TriSubChannelMesh language=moose
+
+!syntax parameters /Mesh/SCMTriAssemblyMeshGenerator
+
+!syntax inputs /Mesh/SCMTriAssemblyMeshGenerator
+
+!syntax children /Mesh/SCMTriAssemblyMeshGenerator