🔥 Remove divert() method, associated functions and tests.

process/init.py

@@ -283,7 +283,6 @@ def initialise_iterative_variables():
     fortran.define_iteration_variables.init_itv_31()
     fortran.define_iteration_variables.init_itv_32()
     fortran.define_iteration_variables.init_itv_33()
-    fortran.define_iteration_variables.init_itv_34()
     fortran.define_iteration_variables.init_itv_35()
     fortran.define_iteration_variables.init_itv_36()
     fortran.define_iteration_variables.init_itv_37()

process/input.py

@@ -228,20 +228,13 @@ def __post_init__(self):
     "bootstrap_current_fraction_max": InputVariable(
         fortran.current_drive_variables, float, range=(-0.999, 0.999)
     ),
-    "bpsout": InputVariable(fortran.divertor_variables, float, range=(0.0, 10.0)),
     "breeder_f": InputVariable(fortran.fwbs_variables, float, range=(0.0, 1.0)),
     "breeder_multiplier": InputVariable(
         fortran.fwbs_variables, float, range=(0.0, 1.0)
     ),
     "bz_channel_conduct_liq": InputVariable(
         fortran.fwbs_variables, float, range=(1e-06, 1000000.0)
     ),
-    "c1div": InputVariable(fortran.divertor_variables, float, range=(-100.0, 100.0)),
-    "c2div": InputVariable(fortran.divertor_variables, float, range=(-100.0, 100.0)),
-    "c3div": InputVariable(fortran.divertor_variables, float, range=(-100.0, 100.0)),
-    "c4div": InputVariable(fortran.divertor_variables, float, range=(-100.0, 100.0)),
-    "c5div": InputVariable(fortran.divertor_variables, float, range=(-100.0, 100.0)),
-    "c6div": InputVariable(fortran.divertor_variables, float, range=(-100.0, 100.0)),
     "casthi": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)),
     "casthi_fraction": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)),
     "casths": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)),
@@ -359,7 +352,6 @@ def __post_init__(self):
     "declfw": InputVariable(fortran.fwbs_variables, float, range=(0.01, 0.2)),
     "declshld": InputVariable(fortran.fwbs_variables, float, range=(0.01, 0.2)),
     "decomf": InputVariable(fortran.cost_variables, float, range=(0.0, 1.0)),
-    "delld": InputVariable(fortran.divertor_variables, float, range=(0.1, 2.0)),
     "denstl": InputVariable(fortran.fwbs_variables, float, range=(5000.0, 10000.0)),
     "dhecoil": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 0.1)),
     "dintrt": InputVariable(fortran.cost_variables, float, range=(0.0, 0.1)),
@@ -590,10 +582,8 @@ def __post_init__(self):
     "fcupfsu": InputVariable(fortran.pfcoil_variables, float, range=(0.0, 1.0)),
     "fcutfsu": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)),
     "fdene": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)),
-    "fdfs": InputVariable(fortran.divertor_variables, float, range=(0.0, 20.0)),
     "f_ster_div_single": InputVariable(fortran.fwbs_variables, float, range=(0.0, 1.0)),
     "fdiva": InputVariable(fortran.divertor_variables, float, range=(0.1, 2.0)),
-    "fdivcol": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)),
     "fdivwet": InputVariable(fortran.stellarator_variables, float, range=(0.01, 1.0)),
     "fdtmp": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)),
     "fecrh_ignition": InputVariable(
@@ -607,7 +597,6 @@ def __post_init__(self):
     "fhldiv": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)),
     "fhole": InputVariable(fortran.fwbs_variables, float, range=(0.0, 1.0)),
     "fhts": InputVariable(fortran.tfcoil_variables, float, range=(0.01, 1.0)),
-    "fififi": InputVariable(fortran.divertor_variables, float, range=(1e-06, 1.0)),
     "fiooic": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)),
     "fipir": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)),
     "fjohc": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)),
@@ -683,7 +672,6 @@ def __post_init__(self):
     "frholeg": InputVariable(fortran.tfcoil_variables, float, range=(0.01, 5.0)),
     "frminor": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)),
     "frrmax": InputVariable(fortran.ife_variables, float, range=(1e-06, 1.0)),
-    "frrp": InputVariable(fortran.divertor_variables, float, range=(0.0, 1.0)),
     "fseppc": InputVariable(
         fortran.build_variables, float, range=(1000000.0, 1000000000.0)
     ),
@@ -841,7 +829,6 @@ def __post_init__(self):
     ),
     "kappa": InputVariable(fortran.physics_variables, float, range=(0.99, 5.0)),
     "kappa95": InputVariable(fortran.physics_variables, float, range=(0.99, 5.0)),
-    "ksic": InputVariable(fortran.divertor_variables, float, range=(0.0, 2.0)),
     "layer_ins": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 0.1)),
     "ld_ratio_cst": InputVariable(fortran.pfcoil_variables, float, range=(0.0, 5.0)),
     "len_fw_channel": InputVariable(
@@ -936,7 +923,6 @@ def __post_init__(self):
     "f_z_cs_tf_internal": InputVariable(
         fortran.pfcoil_variables, float, range=(0.0, 2.0)
     ),
-    "omegan": InputVariable(fortran.divertor_variables, float, range=(0.1, 10.0)),
     "outgasfactor": InputVariable(
         fortran.vacuum_variables, float, range=(1e-06, 1000.0)
     ),
@@ -1092,7 +1078,6 @@ def __post_init__(self):
     "rhopfbus": InputVariable(fortran.pfcoil_variables, float, range=(0.0, 1e-05)),
     "rinboard": InputVariable(fortran.build_variables, float, range=(0.1, 10.0)),
     "ripmax": InputVariable(fortran.tfcoil_variables, float, range=(0.1, 100.0)),
-    "rlenmax": InputVariable(fortran.divertor_variables, float, range=(0.0, 1.0)),
     "rmajor": InputVariable(fortran.physics_variables, float, range=(0.1, 50.0)),
     "robotics_h": InputVariable(fortran.buildings_variables, float, range=(1.0, 100.0)),
     "robotics_l": InputVariable(
@@ -1429,9 +1414,7 @@ def __post_init__(self):
     ),
     "wsvfac": InputVariable(fortran.buildings_variables, float, range=(0.9, 3.0)),
     "xi_ebw": InputVariable(fortran.current_drive_variables, float, range=(0.0, 1.0)),
-    "xparain": InputVariable(fortran.divertor_variables, float, range=(0.01, 10000.0)),
     "xpertin": InputVariable(fortran.divertor_variables, float, range=(0.0, 10.0)),
-    "zeffdiv": InputVariable(fortran.divertor_variables, float, range=(0.01, 100.0)),
     "zeffmax": InputVariable(fortran.constraint_variables, float, range=(1.0, 10.0)),
     "blktmodel": InputVariable(fortran.fwbs_variables, int, choices=[0, 1]),
     "blkttype": InputVariable(fortran.fwbs_variables, int, choices=[1, 2, 3]),
@@ -1444,7 +1427,6 @@ def __post_init__(self):
         fortran.rebco_variables, float, range=(1.0e6, 1.0e10)
     ),
     "cost_model": InputVariable(fortran.cost_variables, int, choices=[0, 1]),
-    "divdum": InputVariable(fortran.divertor_variables, int, choices=[0, 1]),
     "dwell_pump": InputVariable(fortran.vacuum_variables, int, choices=[0, 1, 2]),
     "i_fw_blkt_vv_shape": InputVariable(fortran.fwbs_variables, int, range=(1, 2)),
     "hcdportsize": InputVariable(fortran.fwbs_variables, int, range=(1, 2)),

process/io/obsolete_vars.py

@@ -273,6 +273,24 @@
     "ipump": "i_fw_blkt_shared_coolant",
     "coolwh": "i_blkt_coolant_type",
     "iblanket_thickness": None,
+    "bpsout": None,
+    "c1div": None,
+    "c2div": None,
+    "c3div": None,
+    "c4div": None,
+    "c5div": None,
+    "c6div": None,
+    "delld": None,
+    "fdfs": None,
+    "fdivcol": None,
+    "fififi": None,
+    "frrp": None,
+    "ksic": None,
+    "omegan": None,
+    "rlenmax": None,
+    "xparain": None,
+    "zeffdiv": None,
+    "divdum": None,
 }
 
 OBS_VARS_HELP = {

process/utilities/errorlist.json

@@ -8,7 +8,7 @@
   "comment2": [
     "Increment n_errortypes if an error is added to this list"
   ],
-  "n_errortypes": 288,
+  "n_errortypes": 289,
   "errors": [
     {
       "no": 1,
@@ -1449,6 +1449,11 @@
       "no": 288,
       "level": 3,
       "message": "PFCOIL: i_pf_location(i) should not be 1 if iohcl=0"
+    },
+    {
+      "no": 289,
+      "level": 3,
+      "message": "CHECK: Constraint equation 22 has been deprecated."
     }
   ]
 }

source/fortran/constraint_equations.f90

@@ -148,7 +148,7 @@ subroutine constraint_eqns(m,ieqn,cc,con,err,symbol,units)
         case (20); call constraint_eqn_020(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
 	      ! Equation for minor radius lower limit
         case (21); call constraint_eqn_021(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
-	      ! Equation for divertor collision/connection length ratio upper limit
+	      ! Obsolete
         case (22); call constraint_eqn_022(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
 	      ! Equation for conducting shell radius / rminor upper limit
         case (23); call constraint_eqn_023(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
@@ -1195,19 +1195,22 @@ subroutine constraint_eqn_022(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
       !! fdivcol : input real : f-value for divertor collisionality
       !! rlenmax : input real : maximum value for length ratio (rlclolcn)
       !! rlclolcn : input real : ratio of collision length / connection length
-      use constraint_variables, only: fdivcol
-      use divertor_variables, only: rlenmax, rlclolcn
+
       implicit none
+
             real(dp), intent(out) :: tmp_cc
       real(dp), intent(out) :: tmp_con
       real(dp), intent(out) :: tmp_err
       character(len=1), intent(out) :: tmp_symbol
       character(len=10), intent(out) :: tmp_units
+      !! Constraints output
 
-      tmp_cc =  rlclolcn / rlenmax - 1.0D0 * fdivcol
-      tmp_con = rlenmax * (1.0D0 - tmp_cc)
-      tmp_err = rlclolcn * tmp_cc
-      tmp_symbol = '<'
+      ! This constraint is depreciated
+      call report_error(289)
+
+      tmp_con = 1.0D0
+      tmp_err = 0.0D0
+      tmp_symbol = '='
       tmp_units = ''
 
    end subroutine constraint_eqn_022

source/fortran/constraint_variables.f90

@@ -54,9 +54,6 @@ module constraint_variables
   !! f-value for density limit (`constraint equation 5`, `iteration variable 9`)
   !! (invalid if `ipedestal=3`)
 
-  real(dp) :: fdivcol
-  !! f-value for divertor collisionality (`constraint equation 22`, `iteration variable 34`)
-
   real(dp) :: fdtmp
   !! f-value for first wall coolant temperature rise
   !! (`constraint equation 38`, `iteration variable 62`)
@@ -332,7 +329,6 @@ subroutine init_constraint_variables
     fcpttf = 1.0D0
    fr_conducting_wall = 1.0D0
     fdene = 1.0D0
-    fdivcol = 1.0D0
     fdtmp = 1.0D0
     fflutf = 1.0D0
     ffuspow = 1.0D0