Harden triangular subchannel point classification Refs #32847

kyriv1980 · kyriv1980 · commit 0bdb326d2f29 · 2026-04-29T10:07:12.000-06:00
diff --git a/modules/combined/test/tests/subchannel_thm_coupling/subchannel.i b/modules/combined/test/tests/subchannel_thm_coupling/subchannel.i
@@ -264,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'
   []
 []
diff --git a/modules/subchannel/src/mesh/TriSubChannelMesh.C b/modules/subchannel/src/mesh/TriSubChannelMesh.C
@@ -111,14 +111,14 @@ TriSubChannelMesh::channelIndex(const Point & p) const
         j = i;
         distance0 = distance1;
       } // if
-    }   // if
+    } // if
     // If subchannel belongs to outer ring
     else
     {
       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;
diff --git a/modules/subchannel/src/meshgenerators/SCMDetailedTriAssemblyMeshGenerator.C b/modules/subchannel/src/meshgenerators/SCMDetailedTriAssemblyMeshGenerator.C
@@ -300,7 +300,6 @@ SCMDetailedTriAssemblyMeshGenerator::SCMDetailedTriAssemblyMeshGenerator(
       _subchannel_position[i][0] = (a2 * x1 - a1 * x0) / (a2 - a1);
       _subchannel_position[i][1] = (a2 * y1 - a1 * y0) / (a2 - a1);
     }
-
   }
 }
 
@@ -395,19 +394,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;
diff --git a/modules/subchannel/test/tests/ics/quad_flow_area/gold/test_out.csv b/modules/subchannel/test/tests/ics/quad_flow_area/gold/test_out.csv
@@ -0,0 +1,3 @@
+time,center,corner,edge
+0,0,0,0
+1,0.050228153696915,0.047557038424229,0.050114076848457
diff --git a/modules/subchannel/test/tests/ics/quad_flow_area/gold/test_out.e b/modules/subchannel/test/tests/ics/quad_flow_area/gold/test_out.e
diff --git a/modules/subchannel/test/tests/ics/quad_flow_area/test.i b/modules/subchannel/test/tests/ics/quad_flow_area/test.i
@@ -25,6 +25,30 @@
   []
 []
 
+[Postprocessors]
+  [center]
+    type = SubChannelPointValue
+    variable = S
+    index = 4
+    execute_on = 'timestep_end'
+    height = 0.5
+  []
+  [edge]
+    type = SubChannelPointValue
+    variable = S
+    index = 1
+    execute_on = 'timestep_end'
+    height = 0.5
+  []
+  [corner]
+    type = SubChannelPointValue
+    variable = S
+    index = 0
+    execute_on = 'timestep_end'
+    height = 0.5
+  []
+[]
+
 [Problem]
   solve = false
 []
@@ -34,5 +58,6 @@
 []
 
 [Outputs]
-  exodus = true
+  exodus = false
+  csv = true
 []
diff --git a/modules/subchannel/test/tests/ics/quad_flow_area/tests b/modules/subchannel/test/tests/ics/quad_flow_area/tests
@@ -2,10 +2,14 @@
   design = 'SCMQuadFlowAreaIC.md'
   issues = '#29194'
   [test]
-    type = Exodiff
+    type = CSVDiff
+    csvdiff = test_out.csv
+    capabilities = 'method!=dbg'
+    valgrind = NONE
+    recover = false
+    abs_zero = 1e-6
+    max_threads = 1
     input = 'test.i'
-    exodiff = 'test_out.e'
-    recover = False
     requirement = 'The system will calculate the subchannel flow area for quadrilateral assemblies'
   []
 []
diff --git a/modules/subchannel/test/tests/ics/quad_wetted_perimeter/gold/test_out.csv b/modules/subchannel/test/tests/ics/quad_wetted_perimeter/gold/test_out.csv
@@ -0,0 +1,3 @@
+time,center,corner,edge
+0,0,0,0
+1,0.39269908169872,0.54817477042468,0.44634954084936
diff --git a/modules/subchannel/test/tests/ics/quad_wetted_perimeter/gold/test_out.e b/modules/subchannel/test/tests/ics/quad_wetted_perimeter/gold/test_out.e
diff --git a/modules/subchannel/test/tests/ics/quad_wetted_perimeter/test.i b/modules/subchannel/test/tests/ics/quad_wetted_perimeter/test.i
@@ -25,6 +25,30 @@
   []
 []
 
+[Postprocessors]
+  [center]
+    type = SubChannelPointValue
+    variable = w_perim
+    index = 4
+    execute_on = 'timestep_end'
+    height = 0.5
+  []
+  [edge]
+    type = SubChannelPointValue
+    variable = w_perim
+    index = 1
+    execute_on = 'timestep_end'
+    height = 0.5
+  []
+  [corner]
+    type = SubChannelPointValue
+    variable = w_perim
+    index = 0
+    execute_on = 'timestep_end'
+    height = 0.5
+  []
+[]
+
 [Problem]
   solve = false
 []
@@ -34,5 +58,6 @@
 []
 
 [Outputs]
-  exodus = true
+  exodus = false
+  csv = true
 []
diff --git a/modules/subchannel/test/tests/ics/quad_wetted_perimeter/tests b/modules/subchannel/test/tests/ics/quad_wetted_perimeter/tests
@@ -2,10 +2,14 @@
   design = 'SCMQuadWettedPerimIC.md'
   issues = '#29233'
   [test]
-    type = Exodiff
+    type = CSVDiff
+    csvdiff = test_out.csv
+    capabilities = 'method!=dbg'
+    valgrind = NONE
+    recover = false
+    abs_zero = 1e-6
+    max_threads = 1
     input = 'test.i'
-    exodiff = 'test_out.e'
-    recover = False
     requirement = 'The system will calculate the wetted perimeter of subchannels in a quadrilateral lattice'
   []
 []
diff --git a/modules/subchannel/test/tests/ics/tri_flow_area/gold/test_out.csv b/modules/subchannel/test/tests/ics/tri_flow_area/gold/test_out.csv
@@ -0,0 +1,3 @@
+time,center,corner,edge
+0,0,0,0
+1,0.0027939221920524,0.001725185385005,0.0052043488821598
diff --git a/modules/subchannel/test/tests/ics/tri_flow_area/gold/test_out.e b/modules/subchannel/test/tests/ics/tri_flow_area/gold/test_out.e
diff --git a/modules/subchannel/test/tests/ics/tri_flow_area/test.i b/modules/subchannel/test/tests/ics/tri_flow_area/test.i
@@ -16,13 +16,39 @@
 
 [Variables]
   [S]
+    block = subchannel
   []
 []
 
 [ICs]
   [S_IC]
     type = SCMTriFlowAreaIC
     variable = S
+    block = subchannel
+  []
+[]
+
+[Postprocessors]
+  [center]
+    type = SubChannelPointValue
+    variable = S
+    index = 0
+    execute_on = 'timestep_end'
+    height = 0.5
+  []
+  [edge]
+    type = SubChannelPointValue
+    variable = S
+    index = 24
+    execute_on = 'timestep_end'
+    height = 0.5
+  []
+  [corner]
+    type = SubChannelPointValue
+    variable = S
+    index = 25
+    execute_on = 'timestep_end'
+    height = 0.5
   []
 []
 
@@ -35,5 +61,6 @@
 []
 
 [Outputs]
-  exodus = true
+  exodus = false
+  csv = true
 []
diff --git a/modules/subchannel/test/tests/ics/tri_flow_area/tests b/modules/subchannel/test/tests/ics/tri_flow_area/tests
@@ -2,10 +2,14 @@
   design = 'SCMTriFlowAreaIC.md'
   issues = '#29194'
   [test]
-    type = Exodiff
-    input = 'test.i'
-    exodiff = 'test_out.e'
+    type = CSVDiff
+    csvdiff = test_out.csv
+    capabilities = 'method!=dbg'
+    valgrind = NONE
     recover = false
+    abs_zero = 1e-6
+    max_threads = 1
+    input = 'test.i'
     requirement = 'The system will calculate the subchannel flow area for triangular assemblies'
   []
 []
diff --git a/modules/subchannel/test/tests/ics/tri_wetted_perimeter/gold/test_out.csv b/modules/subchannel/test/tests/ics/tri_wetted_perimeter/gold/test_out.csv
@@ -0,0 +1,3 @@
+time,center,corner,edge
+0,0,0,0
+1,0.23667985307134,0.16530344587089,0.36667985307134
diff --git a/modules/subchannel/test/tests/ics/tri_wetted_perimeter/gold/test_out.e b/modules/subchannel/test/tests/ics/tri_wetted_perimeter/gold/test_out.e
diff --git a/modules/subchannel/test/tests/ics/tri_wetted_perimeter/test.i b/modules/subchannel/test/tests/ics/tri_wetted_perimeter/test.i
@@ -16,13 +16,39 @@
 
 [Variables]
   [w_perim]
+    block = subchannel
   []
 []
 
 [ICs]
   [w_perim_IC]
     type = SCMTriWettedPerimIC
     variable = w_perim
+    block = subchannel
+  []
+[]
+
+[Postprocessors]
+  [center]
+    type = SubChannelPointValue
+    variable = w_perim
+    index = 0
+    execute_on = 'timestep_end'
+    height = 0.5
+  []
+  [edge]
+    type = SubChannelPointValue
+    variable = w_perim
+    index = 24
+    execute_on = 'timestep_end'
+    height = 0.5
+  []
+  [corner]
+    type = SubChannelPointValue
+    variable = w_perim
+    index = 25
+    execute_on = 'timestep_end'
+    height = 0.5
   []
 []
 
@@ -35,5 +61,6 @@
 []
 
 [Outputs]
-  exodus = true
+  exodus = false
+  csv = true
 []
diff --git a/modules/subchannel/test/tests/ics/tri_wetted_perimeter/tests b/modules/subchannel/test/tests/ics/tri_wetted_perimeter/tests
@@ -2,10 +2,14 @@
   design = 'SCMTriWettedPerimIC.md'
   issues = '#29194'
   [test]
-    type = Exodiff
-    input = 'test.i'
-    exodiff = 'test_out.e'
+    type = CSVDiff
+    csvdiff = test_out.csv
+    capabilities = 'method!=dbg'
+    valgrind = NONE
     recover = false
+    abs_zero = 1e-6
+    max_threads = 1
+    input = 'test.i'
     requirement = 'The system will calculate the wetted perimeter of subchannels in a triangular lattice'
   []
 []
diff --git a/modules/subchannel/test/tests/problems/psbt/psbt_monolithic.i b/modules/subchannel/test/tests/problems/psbt/psbt_monolithic.i
@@ -19,28 +19,6 @@ pin_diameter = 0.00950
     subchannel_block_id = 0
     pin_block_id = 1
   []
-  # [sub_channel]
-  #   type = SCMQuadAssemblyMeshGenerator
-  #   nx = 6
-  #   ny = 6
-  #   n_cells = 10
-  #   pitch = 0.0126
-  #   pin_diameter = ${pin_diameter}
-  #   side_gap = 0.00095
-  #   heated_length = 1.0
-  #   spacer_z = '0.0'
-  #   spacer_k = '0.0'
-  # []
-
-  # [fuel_pins]
-  #   type = SCMQuadAssemblyMeshGenerator
-  #   input = sub_channel
-  #   nx = 6
-  #   ny = 6
-  #   n_cells = 10
-  #   pitch = 0.0126
-  #   heated_length = 1.0
-  # []
 []
 
 [FluidProperties]

Original file line number	Diff line number	Diff line change
`@@ -111,14 +111,14 @@ TriSubChannelMesh::channelIndex(const Point & p) const`
`111`	`111`	`j = i;`
`112`	`112`	`distance0 = distance1;`
`113`	`113`	`} // if`
`114`		`- } // if`
	`114`	`+ } // if`
`115`	`115`	`// If subchannel belongs to outer ring`
`116`	`116`	`else`
`117`	`117`	`{`
`118`	`118`	`if ((distance1 < distance0) &&`
`119`	`119`	`(_subch_type[i] == EChannelType::EDGE \|\| _subch_type[i] == EChannelType::CORNER))`
`120`	`120`	`{`
`121`		`- if ((x_coord_new > x_lim \|\| x_coord_new < -x_lim) &&`
	`121`	`+ if (((x_coord_new > x_lim) \|\| (x_coord_new < -x_lim)) &&`
`122`	`122`	`_subch_type[i] == EChannelType::CORNER)`
`123`	`123`	`{`
`124`	`124`	`j = i;`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,6 @@ SCMDetailedTriAssemblyMeshGenerator::SCMDetailedTriAssemblyMeshGenerator(`
`300`	`300`	`_subchannel_position[i][0] = (a2 * x1 - a1 * x0) / (a2 - a1);`
`301`	`301`	`_subchannel_position[i][1] = (a2 * y1 - a1 * y0) / (a2 - a1);`
`302`	`302`	`}`
`303`		`-`
`304`	`303`	`}`
`305`	`304`	`}`
`306`	`305`
`@@ -395,19 +394,9 @@ SCMDetailedTriAssemblyMeshGenerator::generate()`
`395`	`394`	`}`
`396`	`395`
`397`	`396`	`// specify number and type of sub-channel`
`398`		`- unsigned int n_center, n_side, n_corner;`
`399`		`- if (_n_rings == 1)`
`400`		`- {`
`401`		`- n_corner = 6;`
`402`		`- n_side = 0;`
`403`		`- n_center = _n_channels - n_side - n_corner;`
`404`		`- }`
`405`		`- else`
`406`		`- {`
`407`		`- n_corner = 6;`
`408`		`- n_side = (_n_rings - 1) * 6;`
`409`		`- n_center = _n_channels - n_side - n_corner;`
`410`		`- }`
	`397`	`+ unsigned int n_corner = 6;`
	`398`	`+ unsigned int n_side = (_n_rings - 1) * 6;`
	`399`	`+ unsigned int n_center = _n_channels - n_side - n_corner;`
`411`	`400`	`if (_verbose)`
`412`	`401`	`{`
`413`	`402`	`_console << "Centers: " << n_center << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+time,center,corner,edge`
	`2`	`+0,0,0,0`
	`3`	`+1,0.050228153696915,0.047557038424229,0.050114076848457`