Harden triangular subchannel point classification Refs idaholab#32847

Author: kyriv1980

modules/subchannel/src/mesh/TriSubChannelMesh.C

@@ -73,10 +73,13 @@ TriSubChannelMesh::channelIndex(const Point & p) const
   /// Looping over all subchannels to determine the closest one to the point
   /// Special treatment for edge and corner subchannels since deformed elements may lead to wrong transfers
 
-  // Distances to determine the closest subchannel
-  Real distance0 = 1.0e+8; // Dummy distance to keep updating the closes distance found
-  Real distance1;          // Distance to be updated with the current subchannel distance
-  unsigned int j = 0;      // Index to keep track of the closest point to subchannel
+  Real distance1;
+  Real distance_center = 1.0e+8;
+  Real distance_edge = 1.0e+8;
+  Real distance_corner = 1.0e+8;
+  unsigned int center_idx = 0;
+  unsigned int edge_idx = 0;
+  unsigned int corner_idx = 0;
 
   // Projecting point into hexahedral coordinated to determine if the point belongs to a center
   // subchannel
@@ -96,44 +99,34 @@ TriSubChannelMesh::channelIndex(const Point & p) const
   Real x_coord_new = (std::cos(-rem_ang) * p(0) - std::sin(-rem_ang) * p(1));
   Real x_lim = (_n_rings - 1) * _pitch / 2.0;
 
-  // looping over all channels
   for (unsigned int i = 0; i < _n_channels; i++)
   {
-    // Distance from the point to subchannel
     distance1 = std::sqrt(std::pow((p(0) - _subchannel_position[i][0]), 2.0) +
                           std::pow((p(1) - _subchannel_position[i][1]), 2.0));
 
-    // If subchannel belongs to center ring
-    if (channel_distance < distance_outer_ring)
+    if (_subch_type[i] == EChannelType::CENTER && distance1 < distance_center)
     {
-      if ((distance1 < distance0) && (_subch_type[i] == EChannelType::CENTER))
-      {
-        j = i;
-        distance0 = distance1;
-      } // if
-    }   // if
-    // If subchannel belongs to outer ring
-    else
+      center_idx = i;
+      distance_center = distance1;
+    }
+    else if (_subch_type[i] == EChannelType::EDGE && distance1 < distance_edge)
     {
-      if ((distance1 < distance0) &&
-          (_subch_type[i] == EChannelType::EDGE || _subch_type[i] == EChannelType::CORNER))
-      {
-        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) &&
-                 _subch_type[i] == EChannelType::EDGE)
-        {
-          j = i;
-          distance0 = distance1;
-        }
-      }
+      edge_idx = i;
+      distance_edge = distance1;
+    }
+    else if (_subch_type[i] == EChannelType::CORNER && distance1 < distance_corner)
+    {
+      corner_idx = i;
+      distance_corner = distance1;
     }
   }
-  return j;
+
+  if (channel_distance < distance_outer_ring)
+    return center_idx;
+  else if ((x_coord_new > x_lim) || (x_coord_new < -x_lim))
+    return corner_idx;
+  else
+    return edge_idx;
 }
 
 void

modules/subchannel/src/meshgenerators/SCMDetailedTriAssemblyMeshGenerator.C

@@ -395,19 +395,9 @@ SCMDetailedTriAssemblyMeshGenerator::generate()
   }
 
   // specify number and type of sub-channel
-  unsigned int n_center, n_side, n_corner;
-  if (_n_rings == 1)
-  {
-    n_corner = 6;
-    n_side = 0;
-    n_center = _n_channels - n_side - n_corner;
-  }
-  else
-  {
-    n_corner = 6;
-    n_side = (_n_rings - 1) * 6;
-    n_center = _n_channels - n_side - n_corner;
-  }
+  unsigned int n_corner = 6;
+  unsigned int n_side = (_n_rings - 1) * 6;
+  unsigned int n_center = _n_channels - n_side - n_corner;
   if (_verbose)
   {
     _console << "Centers: " << n_center << std::endl;