Fix merged subchannel mesh fallout in tests, docs, and gold files Refs idaholab#32847

Author: kyriv1980

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]

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/postprocessors/SCMPinPowerPostprocessor.md

@@ -10,8 +10,8 @@ The user needs to specify a subchannel problem. Either a [QuadSubChannel1PhasePr
 
 ## Example Input File Syntax
 
-!listing /test/tests/SCMQuadPower/test.i block=Postprocessors language=moose
-!listing /test/tests/SCMTriPower/test.i block=Postprocessors language=moose
+!listing /test/tests/SCMQuadPower/test_with_pins.i block=Postprocessors language=moose
+!listing /test/tests/SCMTriPower/test_with_pins.i block=Postprocessors language=moose
 
 !syntax parameters /Postprocessors/SCMPinPowerPostprocessor
 

modules/subchannel/include/mesh/TriSubChannelMesh.h

@@ -41,7 +41,7 @@ class TriSubChannelMesh : public SubChannelMesh
   const Real & getDuctToPinGap() const { return _duct_to_pin_gap; }
 
   /**
-   * Return the number of rings
+   * Return the number of fuel-pin rings, counting the center pin as the first ring
    */
   const unsigned int & getNumOfRings() const { return _n_rings; }
 
@@ -131,7 +131,7 @@ class TriSubChannelMesh : public SubChannelMesh
   unsigned int pinIndex(const Point & p) const override;
 
 protected:
-  /// number of rings of fuel pins
+  /// number of fuel-pin rings, counting the center pin as the first ring
   unsigned int _n_rings;
   /// number of subchannels
   unsigned int _n_channels;

modules/subchannel/src/mesh/TriSubChannelMesh.C

@@ -82,17 +82,15 @@ TriSubChannelMesh::channelIndex(const Point & p) const
   // subchannel
   Real distance_outer_ring = _flat_to_flat / 2 - _duct_to_pin_gap - _pin_diameter / 2;
   Real channel_distance = std::sqrt(std::pow(p(0), 2) + std::pow(p(1), 2));
-  Real angle = std::abs(std::atan(p(1) / p(0)));
+  Real angle = std::abs(std::atan2(p(1), p(0)));
   Real projection_angle =
       angle - libMesh::pi / 6 - std::trunc(angle / (libMesh::pi / 3)) * (libMesh::pi / 3);
   channel_distance = channel_distance * std::cos(projection_angle);
 
   // Projecting point on top edge to determine if the point is a corner or edge subchannel by x
   // coordinate
-  Real loc_angle = std::atan(p(1) / p(0));
-  if (p(0) <= 0)
-    loc_angle += libMesh::pi;
-  else if (p(0) >= 0 && p(1) <= 0)
+  Real loc_angle = std::atan2(p(1), p(0));
+  if (loc_angle < 0.0)
     loc_angle += 2 * libMesh::pi;
   Real rem_ang = std::trunc(loc_angle / (libMesh::pi / 3)) * (libMesh::pi / 3) - libMesh::pi / 3;
   Real x_coord_new = (std::cos(-rem_ang) * p(0) - std::sin(-rem_ang) * p(1));
@@ -104,7 +102,9 @@ TriSubChannelMesh::channelIndex(const Point & p) const
 
     if (_n_rings == 1)
     {
-      Real angle = std::atan(p(1) / p(0));
+      Real angle = std::atan2(p(1), p(0));
+      if (angle < 0.0)
+        angle += 2.0 * libMesh::pi;
       if ((i * libMesh::pi / 6.0 < angle) && (angle <= (i + 1) * libMesh::pi / 6.0))
         return i;
     }
@@ -129,13 +129,13 @@ TriSubChannelMesh::channelIndex(const Point & p) const
         if ((distance1 < distance0) &&
             (_subch_type[i] == EChannelType::EDGE || _subch_type[i] == EChannelType::CORNER))
         {
-          if (((x_coord_new > x_lim) || (x_coord_new < -x_lim)) &&
+          if ((x_coord_new > x_lim || x_coord_new < -x_lim) &&
               _subch_type[i] == EChannelType::CORNER)
           {
             j = i;
             distance0 = distance1;
           } // if
-          else if (((x_coord_new > x_lim) || (x_coord_new > -x_lim)) &&
+          else if ((x_coord_new <= x_lim && x_coord_new >= -x_lim) &&
                    _subch_type[i] == EChannelType::EDGE)
           {
             j = i;

modules/subchannel/src/meshgenerators/SCMTriAssemblyMeshGenerator.C

@@ -27,7 +27,9 @@ SCMTriAssemblyMeshGenerator::validParams()
   params.addParam<Real>("unheated_length_entry", 0.0, "Unheated length at entry [m]");
   params.addRequiredParam<Real>("heated_length", "Heated length [m]");
   params.addParam<Real>("unheated_length_exit", 0.0, "Unheated length at exit [m]");
-  params.addRequiredParam<unsigned int>("nrings", "Number of fuel Pin rings per assembly [-]");
+  params.addRequiredParam<unsigned int>(
+      "nrings",
+      "Number of fuel-pin rings per assembly, counting the center pin as the first ring [-]");
   params.addRequiredParam<Real>("flat_to_flat",
                                 "Flat to flat distance for the hexagonal assembly [m]");
   params.addRequiredParam<Real>("dwire", "Wire diameter [m]");
@@ -86,6 +88,11 @@ SCMTriAssemblyMeshGenerator::SCMTriAssemblyMeshGenerator(const InputParameters &
     _n_gaps(0),
     _elem_id(0)
 {
+  if (_n_rings < 2)
+    mooseError(name(),
+               ": 'nrings' must be at least 2. In this mesh generator, the center pin counts as "
+               "the first ring, so a 7-pin bundle uses nrings = 2.");
+
   if (_spacer_z.size() != _spacer_k.size())
     mooseError(name(), ": Size of vector spacer_z should be equal to size of vector spacer_k");