Skip to content

Commit

Permalink
Tidied up references to STEP
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-a-foster @timothy-nunn
j-a-foster authored and timothy-nunn committed Feb 8, 2024
1 parent c7c73fa commit 8e12bdd
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 326 deletions.
4 changes: 2 additions & 2 deletions process/buildings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def run(self, output: bool = False):
# Calculate building areas and volumes

if buildings_variables.i_bldgs_size == 1:
# STEP building estimates
# Updated building estimates
self.bldgs_sizes(output, tf_radial_dim, tf_vertical_dim)

else:
Expand Down Expand Up @@ -831,7 +831,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim):
# As proposed by R. Gowland, based on assessment of 18 existing fission power plants:
# turbine hall size is largely independent of plant output power.
# The default footprint used here represents a weighted mean of those plants
# and the design of a Steam Rankine cycle turbine building suitable for STEP,
# and the design of a Steam Rankine cycle turbine building,
# produced by Morsons as part of the Year 1 work.
turbine_hall_area = (
buildings_variables.turbine_hall_l * buildings_variables.turbine_hall_w
Expand Down
28 changes: 14 additions & 14 deletions source/fortran/buildings_variables.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ module buildings_variables
!! hazardous waste storage building length, width, height (m)

integer :: i_bldgs_size
!! switch between routines estimating building sizes (0 = default; 1 = STEP-derived)
!! switch between routines estimating building sizes (0 = default; 1 = updated)

integer :: i_bldgs_v
!! switch to select verbose output for buildings (1 = verbose)
Expand Down Expand Up @@ -272,43 +272,43 @@ module buildings_variables


real(dp) :: a_reactor_bldg
!! Floor area of reactor building in m^2, used as GIFA in costs_step
!! Floor area of reactor building in m^2

real(dp) :: a_ee_ps_bldg
!! Floor area of electrical equipment and power supply building in m^2, used as GIFA in costs_step
!! Floor area of electrical equipment and power supply building in m^2

real(dp) :: a_aux_services_bldg
!! Floor area of auxiliary services building in m^2, used as GIFA in costs_step
!! Floor area of auxiliary services building in m^2

real(dp) :: a_hot_cell_bldg
!! Floor area of hot cell building in m^2, used as GIFA in costs_step
!! Floor area of hot cell building in m^2

real(dp) :: a_reactor_service_bldg
!! Floor area of reactor service building in m^2, used as GIFA in costs_step
!! Floor area of reactor service building in m^2

real(dp) :: a_service_water_bldg
!! Floor area of service water building in m^2, used as GIFA in costs_step
!! Floor area of service water building in m^2

real(dp) :: a_fuel_handling_bldg
!! Floor area of fuel handling and storage building in m^2, used as GIFA in costs_step
!! Floor area of fuel handling and storage building in m^2

real(dp) :: a_control_room_bldg
!! Floor area of controlroom building in m^2, used as GIFA in costs_step
!! Floor area of controlroom building in m^2

real(dp) :: a_ac_ps_bldg
!! Floor area of AC power supply building in m^2, used as GIFA in costs_step
!! Floor area of AC power supply building in m^2

real(dp) :: a_admin_bldg
!! Floor area of admin building in m^2, used as GIFA in costs_step
!! Floor area of admin building in m^2

real(dp) :: a_site_service_bldg
!! Floor area of site service building in m^2, used as GIFA in costs_step
!! Floor area of site service building in m^2

real(dp) :: a_cryo_inert_gas_bldg
!! Floor area of cryogenics and inert gas storage building in m^2, used as GIFA in costs_step
!! Floor area of cryogenics and inert gas storage building in m^2

real(dp) :: a_security_bldg
!! Floor area of security building in m^2, used as GIFA in costs_step
!! Floor area of security building in m^2


contains
Expand Down
6 changes: 3 additions & 3 deletions source/fortran/physics_variables.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ module physics_variables
!! high Z ion density (/m3)

real(dp) :: gradient_length_ne
!! Max. normalized gradient length in el. density (ipedestal==0 only)
!! Max. normalized gradient length in el. density (ipedestal==0 only)

real(dp) :: gradient_length_te
!! Max. normalized gradient length in el. temperature (ipedestal==0 only)
Expand Down Expand Up @@ -386,7 +386,7 @@ module physics_variables
integer :: iradloss
!! switch for radiation loss term usage in power balance (see User Guide):
!!
!! - =0 total power lost is scaling power plus radiation
!! - =0 total power lost is scaling power plus radiation
!! - =1 total power lost is scaling power plus core radiation only
!! - =2 total power lost is scaling power only, with no additional
!! allowance for radiation. This is not recommended for power plant models.
Expand Down Expand Up @@ -513,7 +513,7 @@ module physics_variables
!! - =6 use input kappa, triang to calculate 95% values based on MAST scaling (ST)
!! - =7 use input kappa95, triang95 to calculate separatrix values based on fit to FIESTA (ST)
!! - =8 use input kappa, triang to calculate 95% values based on fit to FIESTA (ST)
!! - =9 set kappa to the natural elongation value (PROCESS-STEP issue #70), triang input
!! - =9 set kappa to the natural elongation value, triang input
!! - =10 set kappa to maximum stable value at a given aspect ratio (2.6<A<3.6)), triang input (#1399)
!! - =11 set kappa Menard 2016 aspect-ratio-dependent scaling, triang input (#1439)

Expand Down
92 changes: 15 additions & 77 deletions tests/integration/ref_dicts.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5360,19 +5360,6 @@
"startuppwr": 0.0,
"startupratio": 1.0,
"stcl": 3.0,
"step20": 0.0,
"step21": 0.0,
"step22": 0.0,
"step23": 0.0,
"step24": 0.0,
"step25": 0.0,
"step27": 0.0,
"step91": 0.0,
"step91_per": 0.3,
"step92": 0.0,
"step92_per": 0.325,
"step93": 0.0,
"step93_per": 0.15,
"str_cs_con_res": -0.005,
"str_pf_con_res": -0.005,
"str_tf_con_res": -0.005,
Expand Down Expand Up @@ -8765,27 +8752,27 @@
"T_He_out": "",
"T_he_in": "",
"W_density": "Tungsten density [kg/m3]",
"a_ac_ps_bldg": "Floor area of AC power supply building in m^2, used as GIFA in costs_step",
"a_admin_bldg": "Floor area of admin building in m^2, used as GIFA in costs_step",
"a_aux_services_bldg": "Floor area of auxiliary services building in m^2, used as GIFA in costs_step",
"a_ac_ps_bldg": "Floor area of AC power supply building in m^2",
"a_admin_bldg": "Floor area of admin building in m^2",
"a_aux_services_bldg": "Floor area of auxiliary services building in m^2",
"a_case_front": "Front casing area [m2]",
"a_case_nose": "Nose casing area [m2]",
"a_control_room_bldg": "Floor area of controlroom building in m^2, used as GIFA in costs_step",
"a_control_room_bldg": "Floor area of controlroom building in m^2",
"a_cp_cool": "Centrepost cooling area toroidal cross-section (constant over the whole CP)",
"a_cryo_inert_gas_bldg": "Floor area of cryogenics and inert gas storage building in m^2, used as GIFA in costs_step",
"a_ee_ps_bldg": "Floor area of electrical equipment and power supply building in m^2, used as GIFA in costs_step",
"a_fuel_handling_bldg": "Floor area of fuel handling and storage building in m^2, used as GIFA in costs_step",
"a_cryo_inert_gas_bldg": "Floor area of cryogenics and inert gas storage building in m^2",
"a_ee_ps_bldg": "Floor area of electrical equipment and power supply building in m^2",
"a_fuel_handling_bldg": "Floor area of fuel handling and storage building in m^2",
"a_ground_ins": "Inboard mid-plane cross-section area of the WP ground insulation [m2]",
"a_hot_cell_bldg": "Floor area of hot cell building in m^2, used as GIFA in costs_step",
"a_hot_cell_bldg": "Floor area of hot cell building in m^2",
"a_leg_cond": "Exact TF ouboard leg conductor area [m2]",
"a_leg_gr_ins": "TF outboard leg ground insulation area per coil [m2]",
"a_leg_ins": "TF ouboard leg turn insulation area per coil [m2]",
"a_oh_turn": "Central solenoid (OH) trun cross-sectional area (m2)",
"a_reactor_bldg": "Floor area of reactor building in m^2, used as GIFA in costs_step",
"a_reactor_service_bldg": "Floor area of reactor service building in m^2, used as GIFA in costs_step",
"a_security_bldg": "Floor area of security building in m^2, used as GIFA in costs_step",
"a_service_water_bldg": "Floor area of service water building in m^2, used as GIFA in costs_step",
"a_site_service_bldg": "Floor area of site service building in m^2, used as GIFA in costs_step",
"a_reactor_bldg": "Floor area of reactor building in m^2",
"a_reactor_service_bldg": "Floor area of reactor service building in m^2",
"a_security_bldg": "Floor area of security building in m^2",
"a_service_water_bldg": "Floor area of service water building in m^2",
"a_site_service_bldg": "Floor area of site service building in m^2",
"a_tf_ins": "Inboard coil insulation cross-section per coil [m2]",
"a_tf_steel": "Inboard coil steel coil cross-sectional area [m2]",
"abeam": "beam ion mass (amu)",
Expand Down Expand Up @@ -9795,7 +9782,7 @@
"hydrogenicpowerlost": "Power lost due to hydrogenic radiation [W]",
"i": "",
"i8kind": "",
"i_bldgs_size": "switch between routines estimating building sizes (0 = default; 1 = STEP-derived)",
"i_bldgs_size": "switch between routines estimating building sizes (0 = default; 1 = updated)",
"i_bldgs_v": "switch to select verbose output for buildings (1 = verbose)",
"i_cp_joints": "Switch for CP demoutable joints type\n -= 0 : Clampled joints\n -= 1 : Sliding joints\n Default value (-1) choses :\n Sliding joints for resistive magnets (i_tf_sup = 0, 2)\n Clampled joints for superconducting magents (i_tf_sup = 1)",
"i_cp_lifetime": "Switch for the centrepost lifetime constraint\n 0 : The CP full power year lifetime is set by the user via cplife_input\n 1 : The CP lifetime is equal to the divertor lifetime\n 2 : The CP lifetime is equal to the breeding blankets lifetime\n 3 : The CP lifetime is equal to the plant lifetime",
Expand Down Expand Up @@ -9917,7 +9904,7 @@
"iscenr": "Switch for PF coil energy storage option:\n<ul>\n<li>=1 all power from MGF (motor-generator flywheel) units</li>\n<li>=2 all pulsed power from line</li>\n<li>=3 PF power from MGF, heating from line</li>\n</ul>",
"iscrp": "switch for plasma-first wall clearances:\n<ul>\n<li>=0 use 10% of rminor</li>\n<li>=1 use input (scrapli and scraplo)</li>\n</ul>",
"iscz": "",
"ishape": "switch for plasma cross-sectional shape calculation:\n<ul>\n<li>=0 use input kappa, triang to calculate 95% values</li>\n<li>=1 scale qlim, kappa, triang with aspect ratio (ST)</li>\n<li>=2 set kappa to the natural elongation value (Zohm ITER scaling), triang input</li>\n<li>=3 set kappa to the natural elongation value (Zohm ITER scaling), triang95 input</li>\n<li>=4 use input kappa95, triang95 to calculate separatrix values</li>\n<li>=5 use input kappa95, triang95 to calculate separatrix values based on MAST scaling (ST)</li>\n<li>=6 use input kappa, triang to calculate 95% values based on MAST scaling (ST)</li>\n<li>=7 use input kappa95, triang95 to calculate separatrix values based on fit to FIESTA (ST)</li>\n<li>=8 use input kappa, triang to calculate 95% values based on fit to FIESTA (ST)</li>\n<li>=9 set kappa to the natural elongation value (PROCESS-STEP issue #70), triang input</li>\n<li>=10 set kappa to maximum stable value at a given aspect ratio (2.6<A<3.6)), triang input (#1399)</li>\n<li>=11 set kappa Menard 2016 aspect-ratio-dependent scaling, triang input (#1439)</li>\n</ul>",
"ishape": "switch for plasma cross-sectional shape calculation:\n<ul>\n<li>=0 use input kappa, triang to calculate 95% values</li>\n<li>=1 scale qlim, kappa, triang with aspect ratio (ST)</li>\n<li>=2 set kappa to the natural elongation value (Zohm ITER scaling), triang input</li>\n<li>=3 set kappa to the natural elongation value (Zohm ITER scaling), triang95 input</li>\n<li>=4 use input kappa95, triang95 to calculate separatrix values</li>\n<li>=5 use input kappa95, triang95 to calculate separatrix values based on MAST scaling (ST)</li>\n<li>=6 use input kappa, triang to calculate 95% values based on MAST scaling (ST)</li>\n<li>=7 use input kappa95, triang95 to calculate separatrix values based on fit to FIESTA (ST)</li>\n<li>=8 use input kappa, triang to calculate 95% values based on fit to FIESTA (ST)</li>\n<li>=9 set kappa to the natural elongation value, triang input</li>\n<li>=10 set kappa to maximum stable value at a given aspect ratio (2.6<A<3.6)), triang input (#1399)</li>\n<li>=11 set kappa Menard 2016 aspect-ratio-dependent scaling, triang input (#1439)</li>\n</ul>",
"istell": "Switch for stellarator option (set via `device.dat`):\n<ul>\n<li>=0 use tokamak model</li>\n<li>=1 use stellarator model: Helias5-b</li>\n<li>=2 use stellarator model: Helias4-b</li>\n<li>=3 use stellarator model: Helias3-b</li>\n</ul>",
"isthtr": "Switch for stellarator auxiliary heating method:\n<ul>\n<li>= 1electron cyclotron resonance heating</li>\n<li>= 2lower hybrid heating</li>\n<li>= 3neutral beam injection</li>\n</ul>",
"istore": "Switch for thermal storage method:\n<ul>\n<li>=1 option 1 of Electrowatt report, AEA FUS 205</li>\n<li>=2 option 2 of Electrowatt report, AEA FUS 205</li>\n<li>=3 stainless steel block</li>\n</ul>",
Expand Down Expand Up @@ -10679,19 +10666,6 @@
"startuppwr": "cost associated with additional HCD system power required on start-up ($)",
"startupratio": "ratio of additional HCD power for start-up to flat-top operational requirements",
"stcl": "clearance above crane to roof (m)",
"step20": "M$",
"step21": "M$",
"step22": "M$",
"step23": "M$",
"step24": "M$",
"step25": "M$",
"step27": "M$",
"step91": "M$",
"step91_per": "Percentage of cdirt used in calculating step91 (3.0D-1 = 30%)",
"step92": "M$",
"step92_per": "Percentage of cdirt used in calculating step92 (3.0D-1 = 30%)",
"step93": "M$",
"step93_per": "Percentage of cdirt used in calculating step93 (3.0D-1 = 30%)",
"str_cs_con_res": "Residual manufacturing strain in CS superconductor material",
"str_pf_con_res": "Residual manufacturing strain in PF superconductor material",
"str_tf_con_res": "Residual manufacturing strain in TF superconductor material\n If `i_str_wp == 0`, used to compute the critical surface.\n Otherwise, the self-consistent winding pack `str_wp` is used.",
Expand Down Expand Up @@ -14376,18 +14350,6 @@
"lb": 0.0,
"ub": 10.0
},
"step91_per": {
"lb": 1.0,
"ub": 100.0
},
"step92_per": {
"lb": 1.0,
"ub": 100.0
},
"step93_per": {
"lb": 1.0,
"ub": 100.0
},
"str_cs_con_res": {
"lb": -0.02,
"ub": 0.02
Expand Down Expand Up @@ -17616,9 +17578,6 @@
"discount_rate",
"startupratio",
"startuppwr",
"step91_per",
"step92_per",
"step93_per",
"tlife",
"ucad",
"ucaf",
Expand Down Expand Up @@ -17819,24 +17778,6 @@
"cppa",
"c22128"
],
"costs_step": [
"pth",
"ptherm_star",
"rmajor_star",
"rminor_star",
"step20",
"step21",
"step22",
"step23",
"step24",
"step25",
"step27",
"step91",
"step92",
"step93",
"vfi",
"vfi_star"
],
"current_drive_module": [],
"current_drive_variables": [
"beamwd",
Expand Down Expand Up @@ -20794,9 +20735,6 @@
"staff_buildings_h": "real_variable",
"startupratio": "real_variable",
"stcl": "real_variable",
"step91_per": "real_variable",
"step92_per": "real_variable",
"step93_per": "real_variable",
"str_cs_con_res": "real_variable",
"str_pf_con_res": "real_variable",
"str_tf_con_res": "real_variable",
Expand Down
Loading

0 comments on commit 8e12bdd

Please sign in to comment.