🧲 Refactor croco 3

documentation/scripts/plotting_scripts/2nd_gen_rebco_critical_surface.py

@@ -22,6 +22,8 @@
         (
             j_scaling[i, j],
             _,
+            _,
+            _,
         ) = superconductors.jcrit_rebco(temp_grid[i, j], b_grid[i, j])
         # Convert from A/m² to kA/mm² (1 A/m² = 1e-6 A/mm²)
         j_scaling[i, j] *= 1e-9

documentation/source/eng-models/tf-coil-superconducting.md

@@ -652,6 +652,6 @@ WIP
 
 WIP
 
-### Superconductor properties | `supercon_croco()`
+### Superconductor properties | `tf_croco_superconductor_properties()`
 
 ### Quench voltage | `croco_voltage()`

process/core/init.py

@@ -383,7 +383,7 @@ def check_process(inputs, data):  # noqa: ARG001
             data_structure.impurity_radiation_module.f_nd_impurity_electrons[imp]
         )
 
-    # Stop the run if oacdcp is used as an optimisation variable
+    # Stop the run if j_tf_coil_full_area is used as an optimisation variable
     # As the current density is now calculated from b_plasma_toroidal_on_axis without constraint 10
 
     if (data_structure.numerics.ixc[: data_structure.numerics.nvar] == 12).any():

process/core/input.py

@@ -298,7 +298,7 @@ def __post_init__(self):
     "copper_rrr": InputVariable(
         data_structure.rebco_variables, float, range=(1.0, 10000.0)
     ),
-    "dx_hts_tape_copper": InputVariable(
+    "dx_tf_hts_tape_copper": InputVariable(
         data_structure.rebco_variables, float, range=(0.0, 0.001)
     ),
     "copperaoh_m2": InputVariable(
@@ -329,7 +329,7 @@ def __post_init__(self):
     "crane_arm_h": InputVariable("buildings", float, range=(1.0, 100.0)),
     "crane_clrnc_h": InputVariable("buildings", float, range=(0.0, 10.0)),
     "crane_clrnc_v": InputVariable("buildings", float, range=(0.0, 10.0)),
-    "dx_croco_strand_copper": InputVariable(
+    "dx_tf_croco_strand_copper": InputVariable(
         data_structure.rebco_variables, float, range=(0.001, 0.1)
     ),
     "cryomag_h": InputVariable("buildings", float, range=(1.0, 100.0)),
@@ -623,7 +623,7 @@ def __post_init__(self):
     "gas_buildings_w": InputVariable("buildings", float, range=(10.0, 1000.0)),
     "ground_clrnc": InputVariable("buildings", float, range=(0.0, 10.0)),
     "n_ecrh_harmonic": InputVariable("current_drive", float, range=(1.0, 10.0)),
-    "dx_hts_tape_hastelloy": InputVariable(
+    "dx_tf_hts_tape_hastelloy": InputVariable(
         data_structure.rebco_variables, float, range=(1e-08, 0.001)
     ),
     "hccl": InputVariable("buildings", float, range=(0.0, 10.0)),
@@ -740,7 +740,7 @@ def __post_init__(self):
         data_structure.physics_variables, float, range=(0.0, 1e21)
     ),
     "nflutfmax": InputVariable("constraints", float, range=(0.0, 1e24)),
-    "oacdcp": InputVariable(
+    "j_tf_coil_full_area": InputVariable(
         data_structure.tfcoil_variables, float, range=(10000.0, 1000000000.0)
     ),
     "f_a_cs_turn_steel": InputVariable(
@@ -846,7 +846,7 @@ def __post_init__(self):
     "reactor_hall_w": InputVariable("buildings", float, range=(10.0, 1000.0)),
     "reactor_roof_thk": InputVariable("buildings", float, range=(0.25, 25.0)),
     "reactor_wall_thk": InputVariable("buildings", float, range=(0.25, 25.0)),
-    "dx_hts_tape_rebco": InputVariable(
+    "dx_tf_hts_tape_rebco": InputVariable(
         data_structure.rebco_variables,
         float,
         range=(1e-08, 0.0001),
@@ -981,10 +981,10 @@ def __post_init__(self):
     "t_turn_tf_max": InputVariable(
         data_structure.tfcoil_variables, float, range=(0.0, 1.0)
     ),
-    "dx_hts_tape_total": InputVariable(
+    "dx_tf_hts_tape_total": InputVariable(
         data_structure.rebco_variables, float, range=(0.0, 0.1)
     ),
-    "dr_hts_tape": InputVariable(
+    "dr_tf_hts_tape": InputVariable(
         data_structure.rebco_variables, float, range=(0.0, 0.1)
     ),
     "tauee_in": InputVariable(
@@ -1213,7 +1213,7 @@ def __post_init__(self):
     "ccls_ma": InputVariable(data_structure.pfcoil_variables, float, array=True),
     "cfind": InputVariable("costs", float, array=True),
     "i_blkt_coolant_type": InputVariable("fwbs", int, choices=[1, 2]),
-    "coppera_m2_max": InputVariable(
+    "tf_coppera_m2_max": InputVariable(
         data_structure.rebco_variables, float, range=(1.0e6, 1.0e10)
     ),
     "cost_model": InputVariable("costs", int, choices=[0, 1, 2]),

process/core/io/obsolete_vars.py

@@ -420,12 +420,12 @@
     "t_structural_vertical": "dz_cs_turn_conduit",
     "t_cable_tf": "dx_tf_turn_cable_space_general",
     "t_turn_tf": "dx_tf_turn_general",
-    "copper_thick": "dx_hts_tape_copper",
-    "croco_thick": "dx_croco_strand_copper",
-    "hastelloy_thickness": "dx_hts_tape_hastelloy",
-    "rebco_thickness": "dx_hts_tape_rebco",
-    "tape_thickness": "dx_hts_tape_total",
-    "tape_width": "dr_hts_tape",
+    "copper_thick": "dx_tf_hts_tape_copper",
+    "croco_thick": "dx_tf_croco_strand_copper",
+    "hastelloy_thickness": "dx_tf_hts_tape_hastelloy",
+    "rebco_thickness": "dx_tf_hts_tape_rebco",
+    "tape_thickness": "dx_tf_hts_tape_total",
+    "tape_width": "dr_tf_hts_tape",
     "beta": "beta_total_vol_avg",
     "beta_max": "beta_vol_avg_max",
     "beta_min": "beta_vol_avg_min",

process/core/io/plot/scans.py

@@ -82,7 +82,7 @@ def plot_scan(
         2: "pflux_div_heat_load_max_mw",
         3: "p_plant_electric_net_mw",
         4: "hfact",
-        5: "oacdcp",
+        5: "j_tf_coil_full_area",
         6: "pflux_fw_neutron_max_mw",
         7: "beamfus0",
         8: "Obsolete",  # OBSOLETE