replaced afwi and afwo for stellarators with tokamak variable radius_…

…fw_channel
ukaea · Feb 12, 2025 · b552e9d · b552e9d
1 parent cfb9d8e
commit b552e9d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 32 deletions.
diff --git a/process/stellarator.py b/process/stellarator.py
@@ -1394,10 +1394,14 @@ def stfwbs(self, output: bool):
                 bfwo = 0.5e0 * build_variables.dr_fw_outboard
 
                 f_a_fw_coolant_inboard = (
-                    fwbs_variables.afwi * fwbs_variables.afwi / (bfwi * bfwi)
+                    fwbs_variables.radius_fw_channel
+                    * fwbs_variables.radius_fw_channel
+                    / (bfwi * bfwi)
                 )  # inboard FW coolant void fraction
                 f_a_fw_coolant_outboard = (
-                    fwbs_variables.afwo * fwbs_variables.afwo / (bfwo * bfwo)
+                    fwbs_variables.radius_fw_channel
+                    * fwbs_variables.radius_fw_channel
+                    / (bfwo * bfwo)
                 )  # outboard FW coolant void fraction
 
                 #  First wall decay length (m) - improved calculation required

diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90
@@ -301,14 +301,6 @@ module fwbs_variables
   !! - =2 pressurized water
   !#TODO: change switch name to satisfy convention
 
-  real(dp) :: afwi
-  !! inner radius of inboard first wall/blanket coolant channels (stellarator only) [m]
-  !#TODO move to stellarator?
-
-  real(dp) :: afwo
-  !! inner radius of outboard first wall/blanket coolant channels (stellarator only) [m]
-  !#TODO move to stellarator?
-
   character(len=6) :: i_fw_coolant_type
   !! switch for first wall coolant (can be different from blanket coolant):
   !!
@@ -737,8 +729,6 @@ subroutine init_fwbs_variables
     secondary_cycle = 0
     secondary_cycle_liq = 4
     coolwh = 1
-    afwi = 0.008D0
-    afwo = 0.008D0
     i_fw_coolant_type = 'helium'
     dr_fw_wall = 0.003D0
     radius_fw_channel = 0.006D0

diff --git a/source/fortran/input.f90 b/source/fortran/input.f90
@@ -267,10 +267,10 @@ subroutine parse_input_file(in_file,out_file,show_changes)
       zeffdiv, hldivlim, rlenmax, divfix, c3div, &
       hldiv, i_hldiv
     use fwbs_variables, only: fblhebpo, vfblkt, fdiv, fvolso, i_fw_coolant_type, &
-      dx_fw_module, i_blanket_type, blktmodel, afwi, fblli2o, nphcdin, breeder_multiplier, &
+      dx_fw_module, i_blanket_type, blktmodel, fblli2o, nphcdin, breeder_multiplier, &
       fw_armour_thickness, roughness, fwclfr, breedmat, fblli, fblvd, &
       iblanket_thickness, vfcblkt, breeder_f, fbllipb, fhcd, vfshld, fblhebmi, &
-      f_neut_shield, fw_th_conductivity, nblktmodti, dr_fw_wall, afwo, &
+      f_neut_shield, fw_th_conductivity, nblktmodti, dr_fw_wall, &
       fvolsi, etahtp, nblktmodpo, pres_fw_coolant, emult, temp_fw_coolant_out, nblktmodpi, &
       fblhebpi, fblss, inlet_temp, outlet_temp, fblbreed, qnuc, blpressure, &
       blpressure_liq, n_liq_recirc, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, &
@@ -2054,12 +2054,6 @@ subroutine parse_input_file(in_file,out_file,show_changes)
           call parse_int_variable('secondary_cycle_liq', secondary_cycle_liq, 2, 4, &
                'Switch for blanket thermodynamic model - liquid breeder')
 
-       case ('afwi')
-          call parse_real_variable('afwi', afwi, 1.0D-3, 0.05D0, &
-               'I/B fw/blkt coolant channel inner radius (m)')
-       case ('afwo')
-          call parse_real_variable('afwo', afwo, 1.0D-3, 0.05D0, &
-               'O/B fw/blkt coolant channel inner radius (m)')
        case ('inlet_temp')
           call parse_real_variable('inlet_temp', inlet_temp, 200.0D0, 600.0D0, &
                'Coolant inlet temperature (K)')

diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json
@@ -11561,14 +11561,6 @@
             "lb": 0.001,
             "ub": 0.5
         },
-        "afwi": {
-            "lb": 0.001,
-            "ub": 0.05
-        },
-        "afwo": {
-            "lb": 0.001,
-            "ub": 0.05
-        },
         "airtemp": {
             "lb": -15.0,
             "ub": 40.0
@@ -18080,8 +18072,6 @@
             "i_shield_mat",
             "secondary_cycle",
             "coolwh",
-            "afwi",
-            "afwo",
             "i_fw_coolant_type",
             "dr_fw_wall",
             "radius_fw_channel",
@@ -19989,8 +19979,6 @@
         "adivflnc": "real_variable",
         "admv": "real_variable",
         "radius_fw_channel": "real_variable",
-        "afwi": "real_variable",
-        "afwo": "real_variable",
         "airtemp": "real_variable",
         "alfapf": "real_variable",
         "alphaj": "real_variable",