Address reviewer comments p2 idaholab#29484

loganharbour · Nov 5, 2024 · 8d63a0b · 8d63a0b
1 parent 987b168
commit 8d63a0b
Show file tree

Hide file tree

Showing 36 changed files with 87 additions and 294 deletions.
diff --git a/modules/subchannel/doc/content/source/problems/TriInterWrapper1PhaseProblem.md b/modules/subchannel/doc/content/source/problems/TriInterWrapper1PhaseProblem.md
@@ -2,7 +2,7 @@
 
 !syntax description /Problem/TriInterWrapper1PhaseProblem
 
-##
+## Overview
 
 <!-- -->
 

diff --git a/...mples/coupling/1pinHex_thermomech_SC/3d.i → ...ples/coupling/1pinHex_thermomech_SCM/3d.i b/...mples/coupling/1pinHex_thermomech_SC/3d.i → ...ples/coupling/1pinHex_thermomech_SCM/3d.i
diff --git a/...inHex_thermomech_SC/one_pin_problem_sub.i → ...nHex_thermomech_SCM/one_pin_problem_sub.i b/...inHex_thermomech_SC/one_pin_problem_sub.i → ...nHex_thermomech_SCM/one_pin_problem_sub.i
@@ -18,6 +18,7 @@ T_in = 588.5
   []
   coord_type = RZ
   rz_coord_axis = Y
+  beta_rotation = 90
 []
 
 [Functions]
@@ -175,26 +176,6 @@ T_in = 588.5
   []
 []
 
-[UserObjects]
-  [q_prime_uo]
-    type = LayeredSideAverage
-    boundary = right
-    variable = q_prime
-    num_layers = 1000
-    direction = y
-    execute_on = 'TIMESTEP_END'
-  []
-
-  [pin_diameter_uo]
-    type = LayeredSideAverage
-    boundary = right
-    variable = pin_diameter_deformed
-    num_layers = 1000
-    direction = y
-    execute_on = 'TIMESTEP_END'
-  []
-[]
-
 [Preconditioning]
   [smp]
     type = SMP

diff --git a/...es/coupling/1pinHex_thermomech_SC/plot.py → ...s/coupling/1pinHex_thermomech_SCM/plot.py b/...es/coupling/1pinHex_thermomech_SC/plot.py → ...s/coupling/1pinHex_thermomech_SCM/plot.py
diff --git a/...g/1pinHex_thermomech_SC/power_profile.txt → .../1pinHex_thermomech_SCM/power_profile.txt b/...g/1pinHex_thermomech_SC/power_profile.txt → .../1pinHex_thermomech_SCM/power_profile.txt
diff --git a/...1pinHex_thermomech_SC/seven_pin_problem.i → ...pinHex_thermomech_SCM/seven_pin_problem.i b/...1pinHex_thermomech_SC/seven_pin_problem.i → ...pinHex_thermomech_SCM/seven_pin_problem.i
@@ -206,25 +206,6 @@ pitch = 7.26e-3
   exodus = true
 []
 
-# Need to have as many points as pins in the object
-[UserObjects]
-  [Tpin_avg_uo]
-    type = NearestPointLayeredAverage
-    direction = z
-    num_layers = 1000
-    variable = Tpin
-    block = fuel_pins
-    points = ' 0   0   0
-              ${fparse  1.0 * pitch}   0  0
-              ${fparse -1.0 * pitch}   0  0
-              ${fparse  0.5 * pitch}   ${fparse  0.866 * pitch}   0
-              ${fparse  0.5 * pitch}   ${fparse -0.866 * pitch}   0
-              ${fparse -0.5 * pitch}   ${fparse  0.866 * pitch}   0
-              ${fparse -0.5 * pitch}   ${fparse -0.866 * pitch}   0'
-    execute_on = timestep_end
-  []
-[]
-
 [Executioner]
   type = Steady
   petsc_options_iname = '-pc_type -pc_hypre_type'
@@ -261,24 +242,29 @@ pitch = 7.26e-3
 
 [Transfers]
   [Tpin] # send pin surface temperature to bison,
-    type = MultiAppUserObjectTransferSCM
+    type = MultiAppGeneralFieldNearestLocationTransfer
     to_multi_app = sub
     variable = Pin_surface_temperature
-    user_object = Tpin_avg_uo
+    source_variable = Tpin
+    execute_on = 'timestep_end'
   []
 
   [diameter] # send diameter information from /BISON/heatConduction to subchannel
-    type = MultiAppUserObjectTransferSCM
+    type =  MultiAppGeneralFieldNearestLocationTransfer
     from_multi_app = sub
     variable = Dpin
-    user_object = pin_diameter_uo
+    source_variable = pin_diameter_deformed
+    from_boundaries = right
+    execute_on = 'timestep_end'
   []
 
   [q_prime] # send heat flux from /BISON/heatConduction to subchannel
-    type = MultiAppUserObjectTransferSCM
+    type = MultiAppGeneralFieldNearestLocationTransfer
     from_multi_app = sub
     variable = q_prime
-    user_object = q_prime_uo
+    source_variable = q_prime
+    from_boundaries = right
+    execute_on = 'timestep_end'
   []
 
   [subchannel_transfer]

diff --git a/...es/coupling/1pinSquare_thermomech_SC/3d.i → ...s/coupling/1pinSquare_thermomech_SCM/3d.i b/...es/coupling/1pinSquare_thermomech_SC/3d.i → ...s/coupling/1pinSquare_thermomech_SCM/3d.i
diff --git a/...pinSquare_thermomech_SC/one_pin_problem.i → ...inSquare_thermomech_SCM/one_pin_problem.i b/...pinSquare_thermomech_SC/one_pin_problem.i → ...inSquare_thermomech_SCM/one_pin_problem.i
@@ -265,28 +265,33 @@ heated_length = 1.0
 
 [Transfers]
   [Tpin] # send pin surface temperature to bison,
-    type = MultiAppUserObjectTransferSCM
+    type = MultiAppGeneralFieldNearestLocationTransfer
     to_multi_app = sub
     variable = Pin_surface_temperature
-    user_object = Tpin_avg_uo
+    source_variable = Tpin
+    execute_on = 'timestep_end'
   []
 
   [diameter] # send diameter information from /BISON/heatConduction to subchannel
-    type = MultiAppUserObjectTransferSCM
+    type =  MultiAppGeneralFieldNearestLocationTransfer
     from_multi_app = sub
     variable = Dpin
-    user_object = pin_diameter_uo
+    source_variable = pin_diameter_deformed
+    from_boundaries = right
+    execute_on = 'timestep_end'
   []
 
   [q_prime] # send heat flux from /BISON/heatConduction to subchannel
-    type = MultiAppUserObjectTransferSCM
+    type = MultiAppGeneralFieldNearestLocationTransfer
     from_multi_app = sub
     variable = q_prime
-    user_object = q_prime_uo
+    source_variable = q_prime
+    from_boundaries = right
+    execute_on = 'timestep_end'
   []
 
   [subchannel_transfer]
-    type = MultiAppDetailedSolutionTransfer
+    type = MultiAppGeneralFieldNearestLocationTransfer
     to_multi_app = viz
     variable = 'mdot SumWij P DP h T rho mu S w_perim'
   []

diff --git a/...quare_thermomech_SC/one_pin_problem_sub.i → ...uare_thermomech_SCM/one_pin_problem_sub.i b/...quare_thermomech_SC/one_pin_problem_sub.i → ...uare_thermomech_SCM/one_pin_problem_sub.i
@@ -15,9 +15,11 @@ T_in = 359.15
     nx = 20
     ymax = ${heated_length}
     ny = 100 # number of axial cells
+    beta_rotation = 90
   []
   coord_type = RZ
   rz_coord_axis = Y
+  beta_rotation = 90
 []
 
 [Functions]
@@ -177,26 +179,6 @@ T_in = 359.15
   []
 []
 
-[UserObjects]
-  [q_prime_uo]
-    type = LayeredSideAverage
-    boundary = right
-    variable = q_prime
-    num_layers = 1000
-    direction = y
-    execute_on = 'TIMESTEP_END'
-  []
-
-  [pin_diameter_uo]
-    type = LayeredSideAverage
-    boundary = right
-    variable = pin_diameter_deformed
-    num_layers = 1000
-    direction = y
-    execute_on = 'TIMESTEP_END'
-  []
-[]
-
 [Preconditioning]
   [smp]
     type = SMP
@@ -243,9 +225,6 @@ T_in = 359.15
     type = VolumePostprocessor
     use_displaced_mesh = true
   []
-
-  # [qprime_integral]
-  # []
 []
 
 [Outputs]

diff --git a/...coupling/1pinSquare_thermomech_SC/plot.py → ...oupling/1pinSquare_thermomech_SCM/plot.py b/...coupling/1pinSquare_thermomech_SC/plot.py → ...oupling/1pinSquare_thermomech_SCM/plot.py
diff --git a/...pling/HeatConduction_SC/power_profile.txt → ...inSquare_thermomech_SCM/power_profile.txt b/...pling/HeatConduction_SC/power_profile.txt → ...inSquare_thermomech_SCM/power_profile.txt
diff --git a/...examples/coupling/BISON_SC/detailedMesh.i → ...xamples/coupling/BISON_SCM/detailedMesh.i b/...examples/coupling/BISON_SC/detailedMesh.i → ...xamples/coupling/BISON_SCM/detailedMesh.i
diff --git a/...channel/examples/coupling/BISON_SC/main.i → ...hannel/examples/coupling/BISON_SCM/main.i b/...channel/examples/coupling/BISON_SC/main.i → ...hannel/examples/coupling/BISON_SCM/main.i
@@ -193,36 +193,6 @@ pitch = 0.0126
   []
 []
 
-[UserObjects]
-  [Tpin_avg_uo]
-    type = NearestPointLayeredAverage
-    direction = z
-    num_layers = 1000
-    variable = Tpin
-    block = fuel_pins
-    points = '${fparse -1.5 * pitch}   ${fparse -1.5 * pitch}   0
-              ${fparse -0.5 * pitch}   ${fparse -1.5 * pitch}   0
-              ${fparse  0.5 * pitch}   ${fparse -1.5 * pitch}   0
-              ${fparse  1.5 * pitch}   ${fparse -1.5 * pitch}   0
-
-              ${fparse -1.5 * pitch}   ${fparse -0.5 * pitch}   0
-              ${fparse -0.5 * pitch}   ${fparse -0.5 * pitch}   0
-              ${fparse  0.5 * pitch}   ${fparse -0.5 * pitch}   0
-              ${fparse  1.5 * pitch}   ${fparse -0.5 * pitch}   0
-
-              ${fparse -1.5 * pitch}   ${fparse  0.5 * pitch}   0
-              ${fparse -0.5 * pitch}   ${fparse  0.5 * pitch}   0
-              ${fparse  0.5 * pitch}   ${fparse  0.5 * pitch}   0
-              ${fparse  1.5 * pitch}   ${fparse  0.5 * pitch}   0
-
-              ${fparse -1.5 * pitch}   ${fparse  1.5 * pitch}   0
-              ${fparse -0.5 * pitch}   ${fparse  1.5 * pitch}   0
-              ${fparse  0.5 * pitch}   ${fparse  1.5 * pitch}   0
-              ${fparse  1.5 * pitch}   ${fparse  1.5 * pitch}   0'
-    execute_on = timestep_end
-  []
-[]
-
 [Outputs]
   exodus = true
   [Temp_Out_MATRIX]
@@ -267,26 +237,6 @@ pitch = 0.0126
     bounding_box_padding = '0 0 0.1'
   []
 
-  # [sub1]
-  #   app_type = BisonApp
-  #   type = FullSolveMultiApp
-  #   input_files = sub_hot_corner.i # seperate file for multiapps due to radial power profile (each sub has different power)
-  #   execute_on = 'timestep_end'
-  #   positions = '${fparse -1.5 * pitch}   ${fparse -1.5 * pitch}   0'
-  #   output_in_position = true
-  #   bounding_box_padding = '0 0 0.1'
-  # []
-  #
-  # [sub2]
-  #   app_type = BisonApp
-  #   type = FullSolveMultiApp
-  #   input_files = sub_cold_corner.i # seperate file for multiapps due to radial power profile (each sub has different power)
-  #   execute_on = 'timestep_end'
-  #   positions = '${fparse 1.5 * pitch}   ${fparse 1.5 * pitch}   0'
-  #   output_in_position = true
-  #   bounding_box_padding = '0 0 0.1'
-  # []
-
   [viz]
     type = FullSolveMultiApp
     input_files = "detailedMesh.i"
@@ -296,50 +246,22 @@ pitch = 0.0126
 
 [Transfers]
   [Tpin] # send pin surface temperature to bison,
-    type = MultiAppUserObjectTransferSCM
+    type = MultiAppGeneralFieldNearestLocationTransfer
     to_multi_app = sub
     variable = Pin_surface_temperature
-    user_object = Tpin_avg_uo
+    source_variable = Tpin
+    execute_on = 'timestep_end'
   []
 
-  [q_prime]
-    type = MultiAppUserObjectTransferSCM
+  [q_prime] # send heat flux from /BISON/heatConduction to subchannel
+    type = MultiAppGeneralFieldNearestLocationTransfer
     from_multi_app = sub
     variable = q_prime
-    user_object = q_prime_uo
+    source_variable = q_prime
+    from_boundaries = clad_outside_right
     execute_on = 'timestep_end'
   []
 
-  # [Tpin1] # send pin surface temperature to bison,
-  #   type = MultiAppUserObjectTransferSCM
-  #   to_multi_app = sub1
-  #   variable = Pin_surface_temperature
-  #   user_object = Tpin_avg_uo
-  # []
-  #
-  # [Tpin2] # send pin surface temperature to bison,
-  #   type = MultiAppUserObjectTransferSCM
-  #   to_multi_app = sub2
-  #   variable = Pin_surface_temperature
-  #   user_object = Tpin_avg_uo
-  # []
-  #
-  # [q_prime1] # send heat flux from BISON/heatConduction to subchannel
-  #   type = MultiAppUserObjectTransferSCM
-  #   from_multi_app = sub1
-  #   variable = q_prime
-  #   user_object = q_prime_uo
-  #   execute_on = 'timestep_end'
-  # []
-  #
-  # [q_prime2] # send heat flux from BISON/heatConduction to subchannel
-  #   type = MultiAppUserObjectTransferSCM
-  #   from_multi_app = sub2
-  #   variable = q_prime
-  #   user_object = q_prime_uo
-  #   execute_on = 'timestep_end'
-  # []
-
   ###### Transfers to the detailedMesh at the end of the coupled simulations
   [subchannel_transfer]
     type = MultiAppDetailedSolutionTransfer

diff --git a/modules/subchannel/examples/coupling/BISON_SCM/power_profile.txt b/modules/subchannel/examples/coupling/BISON_SCM/power_profile.txt
@@ -0,0 +1,16 @@
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
+1.0
diff --git a/...mples/coupling/BISON_SC/sub_cold_corner.i → ...ples/coupling/BISON_SCM/sub_cold_corner.i b/...mples/coupling/BISON_SC/sub_cold_corner.i → ...ples/coupling/BISON_SCM/sub_cold_corner.i
@@ -34,6 +34,9 @@ DY = ${fparse y_location + clad_bot_gap_height + top_bot_clad_height}
     pellet_mesh_density = customize
     clad_mesh_density = customize
   []
+  coord_type = RZ
+  rz_coord_axis = Y
+  beta_rotation = 90
 []
 
 [Functions]
@@ -155,22 +158,6 @@ DY = ${fparse y_location + clad_bot_gap_height + top_bot_clad_height}
   []
 []
 
-[UserObjects]
-  [q_prime_uo]
-    type = LayeredSideAverage
-    boundary = clad_outside_right
-    variable = q_prime
-    num_layers = 1000
-    direction = y
-    execute_on = 'TIMESTEP_END'
-  []
-[]
-
-[Problem]
-  coord_type = RZ
-  rz_coord_axis = Y
-[]
-
 [Executioner]
   type = Steady
   solve_type = 'PJFNK'
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     !syntax description /Problem/TriInterWrapper1PhaseProblem
-    ##
+    ## Overview
     <!-- -->
@@ Expand Down @@