🏗️ Refactor buildings.py

documentation/source/unique-models/buildings_sizes.md

@@ -141,4 +141,4 @@ Amalgamating multiple individual buildings (and using an average height), this e
 ## Summary variables
 
 - Effective floor area for AC power module, `a_plant_floor_effective`: total floor area (m2) across all buildings. This estimate attempts to account for multiple floors within buildings by assuming an average storey height of 6m across the site; the volume of all buildings is therefore summed and divided by 6.
-- Total volume of nuclear buildings, `volnucb`: sum of all nuclear building (external) volumes.
+- Total volume of nuclear buildings, `vol_plant_nuclear_buildings`: sum of all nuclear building (external) volumes.

process/core/init.py

@@ -403,7 +403,7 @@ def check_process(inputs):  # noqa: ARG001
     if (
         data_structure.physics_variables.f_plasma_fuel_tritium < 1.0e-3
     ):  # tritium fraction is negligible
-        data_structure.buildings_variables.triv = 0.0
+        data_structure.buildings_variables.vol_plant_tritium_fuel_building = 0.0
         data_structure.heat_transport_variables.p_tritium_plant_electric_mw = 0.0
 
     if data_structure.impurity_radiation_module.f_nd_impurity_electrons[1] != 0.1:

process/core/input.py

@@ -1232,9 +1232,13 @@ def __post_init__(self):
     "outgrat_fw": InputVariable(
         data_structure.vacuum_variables, float, range=(1e-10, 1e-06)
     ),
-    "rbrt": InputVariable(data_structure.buildings_variables, float, range=(0.0, 10.0)),
+    "dz_plant_reactor_building_roof": InputVariable(
+        data_structure.buildings_variables, float, range=(0.0, 10.0)
+    ),
     "rbvfac": InputVariable(data_structure.buildings_variables, float, range=(0.9, 3.0)),
-    "rbwt": InputVariable(data_structure.buildings_variables, float, range=(0.0, 10.0)),
+    "dx_plant_reactor_building_wall": InputVariable(
+        data_structure.buildings_variables, float, range=(0.0, 10.0)
+    ),
     "radius_cp_coolant_channel": InputVariable(
         data_structure.tfcoil_variables, float, range=(1e-06, 1.0)
     ),
@@ -1516,7 +1520,7 @@ def __post_init__(self):
     "temp_plasma_separatrix_kev": InputVariable(
         data_structure.physics_variables, float, range=(0.0, 20.0)
     ),
-    "tfcbv": InputVariable(
+    "vol_plant_tf_power_supplies_building": InputVariable(
         data_structure.buildings_variables, float, range=(10000.0, 1000000.0)
     ),
     "dx_tf_wp_insertion_gap": InputVariable(
@@ -1586,13 +1590,15 @@ def __post_init__(self):
     "f_temp_plasma_ion_electron": InputVariable(
         data_structure.physics_variables, float, range=(0.0, 2.0)
     ),
-    "trcl": InputVariable(data_structure.buildings_variables, float, range=(0.0, 10.0)),
+    "dr_plant_reactor_building_transport_clearance": InputVariable(
+        data_structure.buildings_variables, float, range=(0.0, 10.0)
+    ),
     "triang": InputVariable(data_structure.physics_variables, float, range=(-1.0, 1.0)),
     "triang95": InputVariable(data_structure.physics_variables, float, range=(0.0, 1.0)),
     "p_tritium_plant_electric_mw": InputVariable(
         data_structure.heat_transport_variables, float, range=(0.0, 100.0)
     ),
-    "triv": InputVariable(
+    "vol_plant_tritium_fuel_building": InputVariable(
         data_structure.buildings_variables, float, range=(10000.0, 1000000.0)
     ),
     "turbine_hall_h": InputVariable(
@@ -1773,7 +1779,7 @@ def __post_init__(self):
     "watertemp": InputVariable(
         data_structure.water_usage_variables, float, range=(0.0, 25.0)
     ),
-    "wgt": InputVariable(
+    "m_plant_reactor_building_crane_capacity": InputVariable(
         data_structure.buildings_variables, float, range=(10000.0, 1000000.0)
     ),
     "wgt2": InputVariable(

process/core/io/plot_proc.py

@@ -10147,7 +10147,7 @@ def plot_tf_coil_structure(axis: plt.Axes, mfile: mf.MFile, scan: int, colour_sc
     axis.text(
         (r_tf_inboard_out + r_tf_outboard_in) / 1.5,
         -z_tf_inside_half / 12,
-        f"{r_tf_outboard_in - r_tf_inboard_in:.3f} m",
+        f"{mfile.get('dr_tf_internal_midplane', scan=scan):.3f} m",
         fontsize=7,
         color="black",
         verticalalignment="center",
@@ -10171,7 +10171,7 @@ def plot_tf_coil_structure(axis: plt.Axes, mfile: mf.MFile, scan: int, colour_sc
     axis.text(
         (r_tf_inboard_out + r_tf_outboard_in) / 1.5,
         0.0,
-        f"{(r_tf_outboard_in + dr_tf_outboard) - r_tf_inboard_in:.3f} m",
+        f"{mfile.get('dr_tf_full_midplane', scan=scan):.3f} m",
         fontsize=7,
         color="black",
         verticalalignment="center",

process/data_structure/buildings_variables.py

@@ -114,7 +114,7 @@
 """vertical clearance from TF coil to cryostat (m)"""
 
 
-cryvol: float = None
+vol_plant_cryoplant_building: float = None
 """volume of cryoplant building (m3)"""
 
 
@@ -158,7 +158,7 @@
 """Energy Storage facilities height (m)"""
 
 
-elevol: float = None
+vol_plant_electrical_building: float = None
 """volume of electrical equipment building (m3)"""
 
 
@@ -354,15 +354,15 @@
 """reactor building volume multiplication factor"""
 
 
-rbrt: float = None
+dz_plant_reactor_building_roof: float = None
 """reactor building roof thickness (m)"""
 
 
-rbvol: float = None
+vol_plant_reactor_building: float = None
 """reactor building volume (m3)"""
 
 
-rbwt: float = None
+dx_plant_reactor_building_wall: float = None
 """reactor building wall thickness (m)"""
 
 
@@ -394,7 +394,7 @@
 """reactor building wall thickness (m)"""
 
 
-rmbvol: float = None
+vol_plant_maintenance_assembly_building: float = None
 """volume of maintenance and assembly building (m3)"""
 
 
@@ -454,19 +454,19 @@
 """clearance above crane to roof (m)"""
 
 
-tfcbv: float = None
+vol_plant_tf_power_supplies_building: float = None
 """volume of TF coil power supply building (m3) (calculated if TF coils are superconducting)"""
 
 
 transp_clrnc: float = None
 """transportation clearance between components (m)"""
 
 
-trcl: float = None
+dr_plant_reactor_building_transport_clearance: float = None
 """transportation clearance between components (m)"""
 
 
-triv: float = None
+vol_plant_tritium_fuel_building: float = None
 """volume of tritium, fuel handling and health physics buildings (m3)"""
 
 
@@ -494,11 +494,11 @@
 """tritiated waste storage building height (m)"""
 
 
-volrci: float = None
+vol_plant_reactor_building_internal: float = None
 """internal volume of reactor building (m3)"""
 
 
-volnucb: float = None
+vol_plant_nuclear_buildings: float = None
 """sum of nuclear buildings volumes (m3)"""
 
 
@@ -526,7 +526,7 @@
 """water, laundry & drainage buildings height (m)"""
 
 
-wgt: float = None
+m_plant_reactor_building_crane_capacity: float = None
 """reactor building crane capacity (kg) (calculated if 0 is input)"""
 
 
@@ -546,11 +546,11 @@
 """[cold] workshop buildings height (m)"""
 
 
-wrbi: float = None
+dr_plant_reactor_building_internal_half: float = None
 """distance from centre of machine to building wall (m)"""
 
 
-wsvol: float = None
+vol_plant_warm_shop_building: float = None
 """volume of warm shop building (m3)"""
 
 
@@ -641,7 +641,7 @@ def init_buildings_variables():
         cryostore_w, \
         cryostore_h, \
         cryostat_clrnc, \
-        cryvol, \
+        vol_plant_cryoplant_building, \
         a_plant_floor_effective, \
         elecdist_l, \
         elecdist_w, \
@@ -652,7 +652,7 @@ def init_buildings_variables():
         elecstore_l, \
         elecstore_w, \
         elecstore_h, \
-        elevol, \
+        vol_plant_electrical_building, \
         esbldgm3, \
         fc_building_l, \
         fc_building_w, \
@@ -701,17 +701,17 @@ def init_buildings_variables():
         pibv, \
         qnty_sfty_fac, \
         rbvfac, \
-        rbrt, \
-        rbvol, \
-        rbwt, \
+        dz_plant_reactor_building_roof, \
+        vol_plant_reactor_building, \
+        dx_plant_reactor_building_wall, \
         reactor_clrnc, \
         reactor_fndtn_thk, \
         reactor_hall_l, \
         reactor_hall_w, \
         reactor_hall_h, \
         reactor_roof_thk, \
         reactor_wall_thk, \
-        rmbvol, \
+        vol_plant_maintenance_assembly_building, \
         robotics_l, \
         robotics_w, \
         robotics_h, \
@@ -726,31 +726,31 @@ def init_buildings_variables():
         staff_buildings_area, \
         staff_buildings_h, \
         stcl, \
-        tfcbv, \
+        vol_plant_tf_power_supplies_building, \
         transp_clrnc, \
-        trcl, \
-        triv, \
+        dr_plant_reactor_building_transport_clearance, \
+        vol_plant_tritium_fuel_building, \
         turbine_hall_l, \
         turbine_hall_w, \
         turbine_hall_h, \
         tw_storage_l, \
         tw_storage_w, \
         tw_storage_h, \
-        volrci, \
-        volnucb, \
+        vol_plant_reactor_building_internal, \
+        vol_plant_nuclear_buildings, \
         warm_shop_l, \
         warm_shop_w, \
         warm_shop_h, \
         water_buildings_l, \
         water_buildings_w, \
         water_buildings_h, \
-        wgt, \
+        m_plant_reactor_building_crane_capacity, \
         wgt2, \
         workshop_l, \
         workshop_w, \
         workshop_h, \
-        wrbi, \
-        wsvol, \
+        dr_plant_reactor_building_internal_half, \
+        vol_plant_warm_shop_building, \
         wsvfac, \
         a_reactor_bldg, \
         a_ee_ps_bldg, \
@@ -795,7 +795,7 @@ def init_buildings_variables():
     cryostore_w = 30.0
     cryostore_h = 20.0
     cryostat_clrnc = 2.5
-    cryvol = 0.0
+    vol_plant_cryoplant_building = 0.0
     a_plant_floor_effective = 0.0
     elecdist_l = 380.0
     elecdist_w = 350.0
@@ -806,7 +806,7 @@ def init_buildings_variables():
     elecstore_l = 100.0
     elecstore_w = 60.0
     elecstore_h = 12.0
-    elevol = 0.0
+    vol_plant_electrical_building = 0.0
     esbldgm3 = 1.0e3
     fc_building_l = 60.0
     fc_building_w = 60.0
@@ -855,17 +855,17 @@ def init_buildings_variables():
     pibv = 2.0e4
     qnty_sfty_fac = 2.0
     rbvfac = 1.6
-    rbrt = 1.0
-    rbvol = 0.0
-    rbwt = 2.0
+    dz_plant_reactor_building_roof = 1.0
+    vol_plant_reactor_building = 0.0
+    dx_plant_reactor_building_wall = 2.0
     reactor_clrnc = 4.0
     reactor_fndtn_thk = 2.0
     reactor_hall_l = 0.0
     reactor_hall_w = 0.0
     reactor_hall_h = 0.0
     reactor_roof_thk = 1.0
     reactor_wall_thk = 2.0
-    rmbvol = 0.0
+    vol_plant_maintenance_assembly_building = 0.0
     robotics_l = 50.0
     robotics_w = 30.0
     robotics_h = 30.0
@@ -880,18 +880,18 @@ def init_buildings_variables():
     staff_buildings_h = 5.0
     staff_buildings_area = 4.8e5
     stcl = 3.0
-    tfcbv = 2.0e4
+    vol_plant_tf_power_supplies_building = 2.0e4
     transp_clrnc = 1.0
-    trcl = 1.0
-    triv = 4.0e4
+    dr_plant_reactor_building_transport_clearance = 1.0
+    vol_plant_tritium_fuel_building = 4.0e4
     turbine_hall_l = 109.0
     turbine_hall_w = 62.0
     turbine_hall_h = 15.0
     tw_storage_l = 90.0
     tw_storage_w = 30.0
     tw_storage_h = 5.0
-    volnucb = 0.0
-    volrci = 0.0
+    vol_plant_nuclear_buildings = 0.0
+    vol_plant_reactor_building_internal = 0.0
     warm_shop_l = 100.0
     warm_shop_w = 50.0
     warm_shop_h = 10.0
@@ -901,11 +901,11 @@ def init_buildings_variables():
     workshop_l = 150.0
     workshop_w = 125.0
     workshop_h = 10.0
-    wgt = 5.0e5
+    m_plant_reactor_building_crane_capacity = 5.0e5
     wgt2 = 1.0e5
-    wrbi = 0.0
+    dr_plant_reactor_building_internal_half = 0.0
     wsvfac = 1.9
-    wsvol = 0.0
+    vol_plant_warm_shop_building = 0.0
     a_reactor_bldg = 8.32e3
     a_ee_ps_bldg = 2.133e4
     a_aux_services_bldg = 1.0e3

process/data_structure/tfcoil_variables.py

@@ -767,6 +767,12 @@
 (calculated for stellarators)
 """
 
+dr_tf_full_midplane: float = None
+"""Full radial thickness of TF coil at midplane (m)"""
+
+dr_tf_internal_midplane: float = None
+"""Internal radial thickness of TF coil at midplane (m)"""
+
 
 dr_tf_wp_with_insulation: float = None
 """radial thickness of winding pack (m) (`iteration variable 140`) (issue #514)"""
@@ -1221,6 +1227,8 @@ def init_tfcoil_variables():
         dx_tf_turn_insulation, \
         layer_ins, \
         dr_tf_nose_case, \
+        dr_tf_full_midplane, \
+        dr_tf_internal_midplane, \
         dr_tf_wp_with_insulation, \
         dx_tf_turn_steel, \
         dx_tf_wp_insulation, \
@@ -1454,6 +1462,8 @@ def init_tfcoil_variables():
     dx_tf_turn_insulation = 8e-4
     layer_ins = 0.0
     dr_tf_nose_case = 0.3
+    dr_tf_full_midplane = 0.0
+    dr_tf_internal_midplane = 0.0
     dr_tf_wp_with_insulation = 0.0
     dx_tf_turn_steel = 8e-3
     dx_tf_wp_insulation = 0.018