From 58d40598dfbebd1281afe15f1557227f5259e65e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 15 Jan 2025 13:53:10 +0000 Subject: [PATCH 01/16] =?UTF-8?q?=F0=9F=94=84Rename=20variable=20rdewex=20?= =?UTF-8?q?to=20r=5Fcryostat=5Finboard=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eng-models/cryostat-and-vacuum-system.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/blanket_library.py | 12 ++++--- process/buildings.py | 4 +-- process/costs_2015.py | 28 +++++++++++----- process/geometry/cryostat_geometry.py | 18 +++++++---- process/hcpb.py | 4 +-- process/io/plot_proc.py | 15 ++++++--- process/stellarator.py | 10 +++--- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++++++--------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 18 +++++++---- tests/unit/test_buildings.py | 10 +++--- tests/unit/test_costs_2015.py | 32 ++++++++++++------- 27 files changed, 146 insertions(+), 105 deletions(-) diff --git a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md index 61ebed6e9e..c035b963be 100644 --- a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md +++ b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md @@ -3,7 +3,7 @@ The _vacuum vessel_ provides a toroidal evacuated chamber containing the plasma, The top flange of the cryostat will be a large structure taking a considerable load from atmospheric pressure. PROCESS does not calculate the required thickness, but the vertical distance *h* between the uppermost PF coil and the top flange of the cryostat is set using `clhsf` (default value 4.268 m); a scaling based on ITER is used: $$ -h = \mathtt{clhsf} \left( \frac{2 \times \mathtt{rdewex}}{28.440}\right) +h = \mathtt{clhsf} \left( \frac{2 \times \mathtt{r_cryostat_inboard}}{28.440}\right) $$ # Cryogenics diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index d3b2ffff15..d8bf78f3c2 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -992,7 +992,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7769E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7769E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5292E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6091E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 1c6c8c0443..7d2cb7cebf 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -987,7 +987,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7798E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index d37f36227c..5b71d5636a 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -987,7 +987,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7798E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 088e0ffaaa..73444013de 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -987,7 +987,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7798E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 491d9b2221..7a828b6065 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -987,7 +987,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7798E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 8d6d5ca7c8..9c811f8e0a 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -816,7 +816,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -1811,7 +1811,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -2806,7 +2806,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -3801,7 +3801,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -4796,7 +4796,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -5791,7 +5791,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -6786,7 +6786,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -7781,7 +7781,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -8776,7 +8776,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index 68e5786e4d..5a2becd1d2 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -370,12 +370,14 @@ def external_cryo_geometry(self): # cryostat radius (m) # ISSUE #508 Remove RFP option # rb(i) = outer radius of PF coil i (tokamaks) - fwbs_variables.rdewex = np.max(pfcoil_variables.rb) + fwbs_variables.rpf2dewar + fwbs_variables.r_cryostat_inboard = ( + np.max(pfcoil_variables.rb) + fwbs_variables.rpf2dewar + ) # Clearance between uppermost PF coil and cryostat lid (m). # Scaling from ITER by M. Kovari blanket_library.hcryopf = ( - build_variables.clhsf * (2.0 * fwbs_variables.rdewex) / 28.440 + build_variables.clhsf * (2.0 * fwbs_variables.r_cryostat_inboard) / 28.440 ) # Half-height of cryostat (m) @@ -389,8 +391,10 @@ def external_cryo_geometry(self): # cryostat volume (m3) fwbs_variables.vdewex = ( - (2.0 * np.pi * fwbs_variables.rdewex) * 2.0 * fwbs_variables.zdewex - + (2.0 * np.pi * fwbs_variables.rdewex**2) + (2.0 * np.pi * fwbs_variables.r_cryostat_inboard) + * 2.0 + * fwbs_variables.zdewex + + (2.0 * np.pi * fwbs_variables.r_cryostat_inboard**2) ) * build_variables.ddwex # Vacuum vessel mass (kg) diff --git a/process/buildings.py b/process/buildings.py index 0178a0d6f5..843de654ae 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -81,7 +81,7 @@ def run(self, output: bool = False): - build_variables.d_vv_top - build_variables.d_vv_bot, fwbs_variables.whtshld, - fwbs_variables.rdewex, + fwbs_variables.r_cryostat_inboard, heat_transport_variables.helpow, ) @@ -390,7 +390,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): # Lateral size driven by radial width of largest component, from: # PF coil max radius, cryostat radius, TF coil outer radius width_reactor_piece = max( - pfcoil_variables.pfrmax, fwbs_variables.rdewex, tf_radial_dim + pfcoil_variables.pfrmax, fwbs_variables.r_cryostat_inboard, tf_radial_dim ) # Allow for biological shielding around reactor width_reactor_piece = width_reactor_piece + buildings_variables.bioshld_thk diff --git a/process/costs_2015.py b/process/costs_2015.py index 62ee69cd8d..644bd9fa27 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -544,7 +544,11 @@ def calc_building_costs(self): self.s_label[1] = "Tokamak Complex (excluding hot cell)" self.s_cref[1] = 1100000.0e0 * cost_variables.tok_build_cost_per_vol # ITER cryostat volume (m^3) - self.s_k[1] = (np.pi * fwbs_variables.rdewex**2) * 2.0e0 * fwbs_variables.zdewex + self.s_k[1] = ( + (np.pi * fwbs_variables.r_cryostat_inboard**2) + * 2.0e0 + * fwbs_variables.zdewex + ) self.s_kref[1] = 18712.0e0 self.s_cost[1] = ( self.s_cost_factor[1] * self.s_cref[1] * (self.s_k[1] / self.s_kref[1]) @@ -640,7 +644,7 @@ def calc_land_costs(self): ITER_buffer_land_area = ITER_total_land_area - ITER_key_buildings_land_area # Scale with area of cryostat (m) - self.s_k[9] = np.pi * fwbs_variables.rdewex**2 + self.s_k[9] = np.pi * fwbs_variables.r_cryostat_inboard**2 self.s_kref[9] = 638.0e0 # Cost of land per hectare (2014 $ / ha) self.s_cref[9] = 318000.0e0 @@ -660,7 +664,7 @@ def calc_land_costs(self): # Cost of clearing ITER land self.s_cref[10] = 214.0e6 # Scale with area of cryostat (m) - self.s_k[10] = np.pi * fwbs_variables.rdewex**2 + self.s_k[10] = np.pi * fwbs_variables.r_cryostat_inboard**2 self.s_kref[10] = 638.0e0 self.s_cost[10] = ( self.s_cost_factor[10] @@ -974,7 +978,9 @@ def calc_remaining_subsystems(self): self.s_cref[43] = 351.0e6 # Scale with cryostat external volume (m3) self.s_k[43] = ( - (np.pi * fwbs_variables.rdewex**2.0e0) * 2.0e0 * fwbs_variables.zdewex + (np.pi * fwbs_variables.r_cryostat_inboard**2.0e0) + * 2.0e0 + * fwbs_variables.zdewex ) self.s_kref[43] = 18700.0e0 self.s_cost[43] = ( @@ -1002,8 +1008,12 @@ def calc_remaining_subsystems(self): self.s_cref[45] = 126.0e6 # Scale with cryostat surface area (m2) self.s_k[45] = ( - 2.0e0 * np.pi * fwbs_variables.rdewex * 2.0e0 * fwbs_variables.zdewex - + 2 * (np.pi * fwbs_variables.rdewex**2) + 2.0e0 + * np.pi + * fwbs_variables.r_cryostat_inboard + * 2.0e0 + * fwbs_variables.zdewex + + 2 * (np.pi * fwbs_variables.r_cryostat_inboard**2) ) self.s_kref[45] = 3902.0e0 self.s_cost[45] = ( @@ -1119,7 +1129,7 @@ def calc_remaining_subsystems(self): self.s_label[55] = "Access control and security systems" # Cost of ITER access control and security systems # Scale with area of cryostat (m2) - self.s_k[55] = np.pi * fwbs_variables.rdewex**2 + self.s_k[55] = np.pi * fwbs_variables.r_cryostat_inboard**2 self.s_kref[55] = 640.0e0 self.s_cref[55] = 42.0e6 self.s_cost[55] = ( @@ -1199,7 +1209,9 @@ def calc_remaining_subsystems(self): self.s_label[59] = "Logistics" self.s_cref[59] = 129.0e6 # Scale with cryostat external volume (m) - self.s_k[59] = np.pi * fwbs_variables.rdewex**2 * 2.0e0 * fwbs_variables.zdewex + self.s_k[59] = ( + np.pi * fwbs_variables.r_cryostat_inboard**2 * 2.0e0 * fwbs_variables.zdewex + ) self.s_kref[59] = 18700.0e0 self.s_cost[59] = ( self.s_cost_factor[59] diff --git a/process/geometry/cryostat_geometry.py b/process/geometry/cryostat_geometry.py index 668c5666ef..dafc1b0d32 100644 --- a/process/geometry/cryostat_geometry.py +++ b/process/geometry/cryostat_geometry.py @@ -6,12 +6,12 @@ def cryostat_geometry( - rdewex: float, ddwex: float, zdewex: float + r_cryostat_inboard: float, ddwex: float, zdewex: float ) -> list[RectangleGeometry]: """Calculates rectangular geometries of the cryostat - :param rdewex: cryostat internal radius - :type rdewex: float + :param r_cryostat_inboard: cryostat internal radius + :type r_cryostat_inboard: float :param ddwex: external cryostat thickness :type ddwex: float :param zdewex: cryostat internal half-height @@ -23,17 +23,21 @@ def cryostat_geometry( # rectangle representing vertical part of cryostat above the midplane rect1 = RectangleGeometry( - anchor_x=rdewex, anchor_z=0, width=ddwex, height=(zdewex + ddwex) + anchor_x=r_cryostat_inboard, anchor_z=0, width=ddwex, height=(zdewex + ddwex) ) # rectangle representing vertical part of cryostat below the midplane rect2 = RectangleGeometry( - anchor_x=rdewex, anchor_z=0, width=ddwex, height=-(zdewex + ddwex) + anchor_x=r_cryostat_inboard, anchor_z=0, width=ddwex, height=-(zdewex + ddwex) ) # rectangle representing horizontal part of cryostat above the midplane - rect3 = RectangleGeometry(anchor_x=0, anchor_z=zdewex, width=rdewex, height=ddwex) + rect3 = RectangleGeometry( + anchor_x=0, anchor_z=zdewex, width=r_cryostat_inboard, height=ddwex + ) # rectangle representing horizontal part of cryostat below the midplane - rect4 = RectangleGeometry(anchor_x=0, anchor_z=-zdewex, width=rdewex, height=-ddwex) + rect4 = RectangleGeometry( + anchor_x=0, anchor_z=-zdewex, width=r_cryostat_inboard, height=-ddwex + ) return [rect1, rect2, rect3, rect4] diff --git a/process/hcpb.py b/process/hcpb.py index e790f6cf2f..239b8f2fed 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -1543,8 +1543,8 @@ def write_output(self): po.ovarre( self.outfile, "Cryostat internal radius (m)", - "(rdewex)", - fwbs_variables.rdewex, + "(r_cryostat_inboard)", + fwbs_variables.r_cryostat_inboard, "OP ", ) po.ovarre( diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 1ee5ddc6bb..e4ceeb8ba3 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -359,7 +359,9 @@ def poloidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): def plot_cryostat(axis, _mfile_data, _scan, colour_scheme): """Function to plot cryostat in poloidal cross-section""" - rects = cryostat_geometry(rdewex=rdewex, ddwex=ddwex, zdewex=zdewex) + rects = cryostat_geometry( + r_cryostat_inboard=r_cryostat_inboard, ddwex=ddwex, zdewex=zdewex + ) for rec in rects: axis.add_patch( @@ -484,7 +486,12 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): r2, r1 = cumulative_radial_build2("thshield_ob", mfile_data, scan) arc_fill(axis, r1, r2, color=THERMAL_SHIELD_COLOUR[colour_scheme - 1]) - arc_fill(axis, rdewex, rdewex + ddwex, color=CRYOSTAT_COLOUR[colour_scheme - 1]) + arc_fill( + axis, + r_cryostat_inboard, + r_cryostat_inboard + ddwex, + color=CRYOSTAT_COLOUR[colour_scheme - 1], + ) # Segment the TF coil inboard # Calculate centrelines @@ -3377,7 +3384,7 @@ def main(args=None): global ddwi global gapsto global tfthko - global rdewex + global r_cryostat_inboard global zdewex global ddwex global j_plasma_0 @@ -3399,7 +3406,7 @@ def main(args=None): shldoth = m_file.data["shldoth"].get_scan(scan) gapsto = m_file.data["gapsto"].get_scan(scan) tfthko = m_file.data["tfthko"].get_scan(scan) - rdewex = m_file.data["rdewex"].get_scan(scan) + r_cryostat_inboard = m_file.data["r_cryostat_inboard"].get_scan(scan) zdewex = m_file.data["zdewex"].get_scan(scan) ddwex = m_file.data["ddwex"].get_scan(scan) j_plasma_0 = m_file.data["j_plasma_0"].get_scan(scan) diff --git a/process/stellarator.py b/process/stellarator.py index 06c4f269ec..288db5d5f7 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1837,12 +1837,12 @@ def stfwbs(self, output: bool): # External cryostat outboard major radius (m) - fwbs_variables.rdewex = ( + fwbs_variables.r_cryostat_inboard = ( build_variables.r_tf_outboard_mid + 0.5e0 * build_variables.tfthko + fwbs_variables.rpf2dewar ) - adewex = fwbs_variables.rdewex - physics_variables.rmajor + adewex = fwbs_variables.r_cryostat_inboard - physics_variables.rmajor # External cryostat volume @@ -2238,13 +2238,13 @@ def stfwbs(self, output: bool): self.outfile, "External cryostat inner radius (m)", "", - fwbs_variables.rdewex - 2.0e0 * adewex, + fwbs_variables.r_cryostat_inboard - 2.0e0 * adewex, ) po.ovarre( self.outfile, "External cryostat outer radius (m)", - "(rdewex)", - fwbs_variables.rdewex, + "(r_cryostat_inboard)", + fwbs_variables.r_cryostat_inboard, ) po.ovarre( self.outfile, "External cryostat minor radius (m)", "(adewex)", adewex diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 6479992aba..5c90716253 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -418,7 +418,7 @@ module fwbs_variables !! nuclear heating in the TF coil (MW/m3) (`blktmodel>0`) !#TODO: check usage of old blktmodel. Update to iblanket - real(dp) :: rdewex + real(dp) :: r_cryostat_inboard !! cryostat radius [m] real(dp) :: zdewex @@ -772,7 +772,7 @@ subroutine init_fwbs_variables pradloss = 0.0D0 ptfnuc = 0.0D0 ptfnucpm3 = 0.0D0 - rdewex = 0.0D0 + r_cryostat_inboard = 0.0D0 zdewex = 0.0D0 rpf2dewar = 0.5D0 vdewex = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 8768bc988c..cdd607849f 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -986,7 +986,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7798E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 12efdbeceb..be7c06c14c 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -987,7 +987,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7798E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 3cc6e67093..fc684b7bcb 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -987,7 +987,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7798E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 24ecdbb674..d3c67839d4 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -987,7 +987,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7798E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 484a98a267..a62da72cc7 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -990,7 +990,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7805E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7805E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5351E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6032E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index c7e8558a2a..1316617725 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -988,7 +988,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7774E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7774E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5301E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6076E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -2151,7 +2151,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7765E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7765E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5286E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6094E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -3314,7 +3314,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7758E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7758E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5274E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6107E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -4477,7 +4477,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7759E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7759E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5275E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6109E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -5640,7 +5640,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7766E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7766E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5286E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6097E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -6803,7 +6803,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7775E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7775E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5302E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6082E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -7966,7 +7966,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7776E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7776E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5304E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6084E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -9129,7 +9129,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7768E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7768E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5290E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6096E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -10292,7 +10292,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7760E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7760E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5277E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6103E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -11455,7 +11455,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7761E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7761E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5278E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6108E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -12618,7 +12618,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7769E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7769E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5292E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6104E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -13781,7 +13781,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7777E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7777E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5305E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6096E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -14944,7 +14944,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7778E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7778E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5307E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6101E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -16107,7 +16107,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7770E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7770E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5293E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6115E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP @@ -17270,7 +17270,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7762E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7762E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5280E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6129E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index d9665f4060..4ffc1f7f49 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -816,7 +816,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -1811,7 +1811,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -2806,7 +2806,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -3801,7 +3801,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -4796,7 +4796,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -5791,7 +5791,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -6786,7 +6786,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -7781,7 +7781,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP @@ -8776,7 +8776,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 2.0115E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a37bcc9e84..d46eece6bf 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3949,7 +3949,7 @@ ], "rconl": 0.0, "rcool": 0.005, - "rdewex": 0.0, + "r_cryostat_inboard": 0.0, "reactor_clrnc": 4.0, "reactor_fndtn_thk": 2.0, "reactor_hall_h": 0.0, @@ -10500,7 +10500,7 @@ "rcm": "", "rconl": "connection length ratio, outboard side", "rcool": "average radius of coolant channel (m) (`iteration variable 69`)", - "rdewex": "cryostat radius (m)", + "r_cryostat_inboard": "cryostat radius (m)", "reactor_clrnc": "clearance around reactor (m)", "reactor_fndtn_thk": "reactor building foundation thickness (m)", "reactor_hall_h": "reactor building length, width, height (m)", @@ -18128,7 +18128,7 @@ "pradloss", "ptfnuc", "ptfnucpm3", - "rdewex", + "r_cryostat_inboard", "zdewex", "rpf2dewar", "vdewex", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index f48a68a2af..5651e8eddf 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -990,7 +990,7 @@ No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP - Cryostat_internal_radius_(m)____________________________________________ (rdewex)______________________ 1.7805E+01 OP + Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7805E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5351E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6032E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 092651ce02..897efb896d 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1175,7 +1175,7 @@ class ExternalCryoGeometryParam(NamedTuple): hmax: Any = None tfcth: Any = None ddwex: Any = None - rdewex: Any = None + r_cryostat_inboard: Any = None rpf2dewar: Any = None zdewex: Any = None vdewex: Any = None @@ -1187,7 +1187,7 @@ class ExternalCryoGeometryParam(NamedTuple): zh: Any = None clh1: Any = None hcryopf: Any = None - expected_rdewex: Any = None + expected_r_cryostat_inboard: Any = None expected_zdewex: Any = None expected_vdewex: Any = None expected_vvmass: Any = None @@ -1204,7 +1204,7 @@ class ExternalCryoGeometryParam(NamedTuple): hmax=8.8182171641274945, tfcth=0.92672586247397692, ddwex=0.15000000000000002, - rdewex=0, + r_cryostat_inboard=0, rpf2dewar=0.5, zdewex=0, vdewex=0, @@ -1274,7 +1274,7 @@ class ExternalCryoGeometryParam(NamedTuple): ).transpose(), clh1=2.5, hcryopf=0, - expected_rdewex=17.805470903073743, + expected_r_cryostat_inboard=17.805470903073743, expected_zdewex=15.259637557000296, expected_vdewex=810.95017445543203, expected_vvmass=7927043.4756686538, @@ -1302,7 +1302,11 @@ def test_external_cryo_geometry( monkeypatch.setattr(build_variables, "hmax", externalcryogeometryparam.hmax) monkeypatch.setattr(build_variables, "tfcth", externalcryogeometryparam.tfcth) monkeypatch.setattr(build_variables, "ddwex", externalcryogeometryparam.ddwex) - monkeypatch.setattr(fwbs_variables, "rdewex", externalcryogeometryparam.rdewex) + monkeypatch.setattr( + fwbs_variables, + "r_cryostat_inboard", + externalcryogeometryparam.r_cryostat_inboard, + ) monkeypatch.setattr( fwbs_variables, "rpf2dewar", externalcryogeometryparam.rpf2dewar ) @@ -1319,8 +1323,8 @@ def test_external_cryo_geometry( blanket_library_fixture.external_cryo_geometry() - assert fwbs_variables.rdewex == pytest.approx( - externalcryogeometryparam.expected_rdewex + assert fwbs_variables.r_cryostat_inboard == pytest.approx( + externalcryogeometryparam.expected_r_cryostat_inboard ) assert fwbs_variables.zdewex == pytest.approx( externalcryogeometryparam.expected_zdewex diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py index 8846fa8dec..feead3c196 100644 --- a/tests/unit/test_buildings.py +++ b/tests/unit/test_buildings.py @@ -137,7 +137,7 @@ class BldgsSizesParam(NamedTuple): tlife: Any cplife: Any divlife: Any - rdewex: Any + r_cryostat_inboard: Any bktlife: Any hmax: Any tfcth: Any @@ -280,7 +280,7 @@ class BldgsSizesParam(NamedTuple): tlife=40, cplife=0, divlife=0, - rdewex=19.48258241468535, + r_cryostat_inboard=19.48258241468535, bktlife=0, hmax=9.0730900215620327, tfcth=1.208, @@ -419,7 +419,7 @@ class BldgsSizesParam(NamedTuple): tlife=40, cplife=0, divlife=6.1337250397740126, - rdewex=19.482980877139834, + r_cryostat_inboard=19.482980877139834, bktlife=19.216116010620578, hmax=9.0730900215620327, tfcth=1.208, @@ -678,7 +678,9 @@ def test_bldgs_sizes(buildings, bldgssizesparam, monkeypatch): monkeypatch.setattr(cost_variables, "tlife", bldgssizesparam.tlife) monkeypatch.setattr(cost_variables, "cplife", bldgssizesparam.cplife) monkeypatch.setattr(cost_variables, "divlife", bldgssizesparam.divlife) - monkeypatch.setattr(fwbs_variables, "rdewex", bldgssizesparam.rdewex) + monkeypatch.setattr( + fwbs_variables, "r_cryostat_inboard", bldgssizesparam.r_cryostat_inboard + ) monkeypatch.setattr(fwbs_variables, "bktlife", bldgssizesparam.bktlife) monkeypatch.setattr(build_variables, "hmax", bldgssizesparam.hmax) monkeypatch.setattr(build_variables, "tfcth", bldgssizesparam.tfcth) diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index e09d1cd114..547ebf4657 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -46,7 +46,7 @@ class CalcBuildingCostsParam(NamedTuple): estotftgj: Any = None - rdewex: Any = None + r_cryostat_inboard: Any = None zdewex: Any = None @@ -89,7 +89,7 @@ class CalcBuildingCostsParam(NamedTuple): ritfc=234156150, n_tf=18, estotftgj=130.10721529398921, - rdewex=18.314040399601147, + r_cryostat_inboard=18.314040399601147, zdewex=15.118436894660423, cost_factor_buildings=1, light_build_cost_per_vol=270, @@ -1189,7 +1189,7 @@ class CalcBuildingCostsParam(NamedTuple): ritfc=234156150, n_tf=18, estotftgj=129.99240835373195, - rdewex=18.31462428923539, + r_cryostat_inboard=18.31462428923539, zdewex=15.165858901796364, cost_factor_buildings=1, light_build_cost_per_vol=270, @@ -2312,7 +2312,9 @@ def test_calc_building_costs(calcbuildingcostsparam, monkeypatch, costs2015): monkeypatch.setattr(tfcoil_variables, "estotftgj", calcbuildingcostsparam.estotftgj) - monkeypatch.setattr(fwbs_variables, "rdewex", calcbuildingcostsparam.rdewex) + monkeypatch.setattr( + fwbs_variables, "r_cryostat_inboard", calcbuildingcostsparam.r_cryostat_inboard + ) monkeypatch.setattr(fwbs_variables, "zdewex", calcbuildingcostsparam.zdewex) @@ -2368,7 +2370,7 @@ class CalcLandCostsParam(NamedTuple): tfcth: Any = None - rdewex: Any = None + r_cryostat_inboard: Any = None cost_factor_land: Any = None @@ -2402,7 +2404,7 @@ class CalcLandCostsParam(NamedTuple): dr_tf_inner_bore=11.753025251709767, dh_tf_inner_bore=14.474776497695849, tfcth=0.91858999999999991, - rdewex=18.314040399601147, + r_cryostat_inboard=18.314040399601147, cost_factor_land=1, costexp=0.80000000000000004, s_kref=np.array( @@ -3490,7 +3492,7 @@ class CalcLandCostsParam(NamedTuple): dr_tf_inner_bore=11.753830505540675, dh_tf_inner_bore=14.450776497695848, tfcth=0.91858999999999991, - rdewex=18.31462428923539, + r_cryostat_inboard=18.31462428923539, cost_factor_land=1, costexp=0.80000000000000004, s_kref=np.array( @@ -4599,7 +4601,9 @@ def test_calc_land_costs(calclandcostsparam, monkeypatch, costs2015): monkeypatch.setattr(build_variables, "tfcth", calclandcostsparam.tfcth) - monkeypatch.setattr(fwbs_variables, "rdewex", calclandcostsparam.rdewex) + monkeypatch.setattr( + fwbs_variables, "r_cryostat_inboard", calclandcostsparam.r_cryostat_inboard + ) monkeypatch.setattr( cost_variables, "cost_factor_land", calclandcostsparam.cost_factor_land @@ -13731,7 +13735,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): vvmass: Any = None - rdewex: Any = None + r_cryostat_inboard: Any = None zdewex: Any = None @@ -13774,7 +13778,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): psechtmw=311.54038043019023, helpow=142703.41458500578, vvmass=8957118.946216708, - rdewex=18.314040399601147, + r_cryostat_inboard=18.314040399601147, zdewex=15.118436894660423, cost_factor_misc=1, costexp=0.80000000000000004, @@ -14870,7 +14874,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): psechtmw=640.27066522894324, helpow=823308.59959198488, vvmass=8948002.9350915737, - rdewex=18.31462428923539, + r_cryostat_inboard=18.31462428923539, zdewex=15.165858901796364, cost_factor_misc=1, costexp=0.80000000000000004, @@ -16008,7 +16012,11 @@ def test_calc_remaining_subsystems( monkeypatch.setattr(fwbs_variables, "vvmass", calcremainingsubsystemsparam.vvmass) - monkeypatch.setattr(fwbs_variables, "rdewex", calcremainingsubsystemsparam.rdewex) + monkeypatch.setattr( + fwbs_variables, + "r_cryostat_inboard", + calcremainingsubsystemsparam.r_cryostat_inboard, + ) monkeypatch.setattr(fwbs_variables, "zdewex", calcremainingsubsystemsparam.zdewex) From 25021c3612c351a7a70b2c43315f95872a495bb1 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 15 Jan 2025 13:57:25 +0000 Subject: [PATCH 02/16] =?UTF-8?q?=F0=9F=94=84=20Rename=20variable=20rpf2de?= =?UTF-8?q?war=20to=20dr=5Fpf=5Fcryostat=20for=20clarity=20and=20consisten?= =?UTF-8?q?cy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 2 +- process/stellarator.py | 2 +- source/fortran/fwbs_variables.f90 | 6 +++--- source/fortran/input.f90 | 6 +++--- tests/integration/ref_dicts.json | 10 +++++----- tests/regression/input_files/st_regression.IN.DAT | 2 +- tests/unit/test_blanket_library.py | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 5a2becd1d2..b0bfa0bfcc 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -371,7 +371,7 @@ def external_cryo_geometry(self): # ISSUE #508 Remove RFP option # rb(i) = outer radius of PF coil i (tokamaks) fwbs_variables.r_cryostat_inboard = ( - np.max(pfcoil_variables.rb) + fwbs_variables.rpf2dewar + np.max(pfcoil_variables.rb) + fwbs_variables.dr_pf_cryostat ) # Clearance between uppermost PF coil and cryostat lid (m). diff --git a/process/stellarator.py b/process/stellarator.py index 288db5d5f7..1211fbc766 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1840,7 +1840,7 @@ def stfwbs(self, output: bool): fwbs_variables.r_cryostat_inboard = ( build_variables.r_tf_outboard_mid + 0.5e0 * build_variables.tfthko - + fwbs_variables.rpf2dewar + + fwbs_variables.dr_pf_cryostat ) adewex = fwbs_variables.r_cryostat_inboard - physics_variables.rmajor diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 5c90716253..77ee26cff6 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -424,8 +424,8 @@ module fwbs_variables real(dp) :: zdewex !! cryostat height [m] - real(dp) :: rpf2dewar - !! radial distance between outer edge of largest (`ipfloc=3`) PF coil (or stellarator + real(dp) :: dr_pf_cryostat + !! Radial distance between outer edge of furthest away PF coil (or stellarator !! modular coil) and cryostat [m] real(dp) :: vdewex @@ -774,7 +774,7 @@ subroutine init_fwbs_variables ptfnucpm3 = 0.0D0 r_cryostat_inboard = 0.0D0 zdewex = 0.0D0 - rpf2dewar = 0.5D0 + dr_pf_cryostat = 0.5D0 vdewex = 0.0D0 vdewin = 0.0D0 vfshld = 0.25D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 541bcd4ba8..a71c4b473b 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -275,7 +275,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fblhebpi, fblss, inlet_temp, outlet_temp, fblbreed, qnuc, blpressure, & blpressure_liq, n_liq_recirc, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, & declblkt, fblhebmo, blkttype, afw, inuclear, declshld, hcdportsize, & - npdiv, peaking_factor, primary_pumping, rpf2dewar, secondary_cycle, secondary_cycle_liq, & + npdiv, peaking_factor, primary_pumping, dr_pf_cryostat, secondary_cycle, secondary_cycle_liq, & denstl, declfw, nphcdout, iblnkith, vfpblkt, fwinlet, wallpf, fblbe, & fhole, fwbsshape, coolp, tfwmatmax, irefprop, fw_channel_length, & li6enrich, etaiso, nblktmodto, fvoldw, i_shield_mat, i_bb_liq, & @@ -1372,8 +1372,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('rinboard') call parse_real_variable('rinboard', rinboard, 0.1D0, 10.0D0, & 'Plasma inboard radius (m)') - case ('rpf2dewar') - call parse_real_variable('rpf2dewar', rpf2dewar, 0.1D0, 5.0D0, & + case ('dr_pf_cryostat') + call parse_real_variable('dr_pf_cryostat', dr_pf_cryostat, 0.1D0, 5.0D0, & 'Outer PF coil to cryostat distance (m)') case ('i_r_cp_top') call parse_int_variable('i_r_cp_top', i_r_cp_top, 0, 2, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d46eece6bf..9240cbbbfe 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4262,7 +4262,7 @@ "rpf": 0.0, "rpf1": 0.0, "rpf2": -1.63, - "rpf2dewar": 0.5, + "dr_pf_cryostat": 0.5, "rpfac": 0.0, "res_plasma": 0.0, "rref": [ @@ -10572,7 +10572,7 @@ "rpf": "radius of PF coil i (m)", "rpf1": "offset (m) of radial position of `ipfloc=1` PF coils from being directly above\n the central solenoid", "rpf2": "offset (m) of radial position of `ipfloc=2` PF coils from being at\n rmajor (offset = rpf2triangrminor)", - "rpf2dewar": "radial distance between outer edge of largest (`ipfloc=3`) PF coil (or stellarator\n modular coil) and cryostat (m)", + "dr_pf_cryostat": "Radial distance between furthest PF coil (or stellarator\n modular coil) and cryostat (m)", "rpfac": "neo-classical correction factor to res_plasma", "res_plasma": "plasma resistance (ohm)", "rref": "PF coil radial positioning adjuster:\n", @@ -14203,7 +14203,7 @@ "lb": -3.0, "ub": 3.0 }, - "rpf2dewar": { + "dr_pf_cryostat": { "lb": 0.1, "ub": 5.0 }, @@ -18130,7 +18130,7 @@ "ptfnucpm3", "r_cryostat_inboard", "zdewex", - "rpf2dewar", + "dr_pf_cryostat", "vdewex", "vdewin", "vfshld", @@ -20693,7 +20693,7 @@ "row": "real_variable", "rpf1": "real_variable", "rpf2": "real_variable", - "rpf2dewar": "real_variable", + "dr_pf_cryostat": "real_variable", "rref": "real_array", "rrin": "real_variable", "rrmax": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 1e905a8de4..2ab00f65f8 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2227,7 +2227,7 @@ i_r_cp_top = 2 * DESCRIPTION: Cryostat wall thickness (m) * JUSTIFICATION: Not scaling cryostat height. -*rpf2dewar = +*dr_pf_cryostat = * DESCRIPTION: radial distance between outer edge of largest (`ipfloc=3`) PF coil (or stellarator * modular coil) and cryostat [m]) * JUSTIFICATION: Not scaling cryostat distance. diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 897efb896d..4f13315ce0 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1176,7 +1176,7 @@ class ExternalCryoGeometryParam(NamedTuple): tfcth: Any = None ddwex: Any = None r_cryostat_inboard: Any = None - rpf2dewar: Any = None + dr_pf_cryostat: Any = None zdewex: Any = None vdewex: Any = None vvmass: Any = None @@ -1205,7 +1205,7 @@ class ExternalCryoGeometryParam(NamedTuple): tfcth=0.92672586247397692, ddwex=0.15000000000000002, r_cryostat_inboard=0, - rpf2dewar=0.5, + dr_pf_cryostat=0.5, zdewex=0, vdewex=0, vvmass=0, @@ -1308,7 +1308,7 @@ def test_external_cryo_geometry( externalcryogeometryparam.r_cryostat_inboard, ) monkeypatch.setattr( - fwbs_variables, "rpf2dewar", externalcryogeometryparam.rpf2dewar + fwbs_variables, "dr_pf_cryostat", externalcryogeometryparam.dr_pf_cryostat ) monkeypatch.setattr(fwbs_variables, "zdewex", externalcryogeometryparam.zdewex) monkeypatch.setattr(fwbs_variables, "vdewex", externalcryogeometryparam.vdewex) From bca9fc7e9e8258692ca974a084456c82cd264f3a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 15 Jan 2025 14:04:20 +0000 Subject: [PATCH 03/16] =?UTF-8?q?=F0=9F=94=84=20Rename=20variable=20hcryop?= =?UTF-8?q?f=20to=20dz=5Fpf=5Fcryostat=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 6 ++++-- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- tests/unit/test_blanket_library.py | 16 +++++++++------- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index b0bfa0bfcc..5f7be0d1a2 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -376,13 +376,15 @@ def external_cryo_geometry(self): # Clearance between uppermost PF coil and cryostat lid (m). # Scaling from ITER by M. Kovari - blanket_library.hcryopf = ( + blanket_library.dz_pf_cryostat = ( build_variables.clhsf * (2.0 * fwbs_variables.r_cryostat_inboard) / 28.440 ) # Half-height of cryostat (m) # ISSUE #508 Remove RFP option - fwbs_variables.zdewex = np.max(pfcoil_variables.zh) + blanket_library.hcryopf + fwbs_variables.zdewex = ( + np.max(pfcoil_variables.zh) + blanket_library.dz_pf_cryostat + ) # Vertical clearance between TF coil and cryostat (m) buildings_variables.clh1 = fwbs_variables.zdewex - ( diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index ca0b482e4f..543583e3b2 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -42,7 +42,7 @@ module blanket_library real(dp) :: volvvi, volvvo !! Volume of inboard and outboard Vacuum Vessel (m3) - real(dp) :: hcryopf + real(dp) :: dz_pf_cryostat !! Clearance between uppermost PF coil and cryostat lid (m) real(dp) :: vfblkti, vfblkto @@ -129,7 +129,7 @@ subroutine init_blanket_library hblnkt = 0.0D0 hshld = 0.0D0 - hcryopf = 0.0D0 + dz_pf_cryostat = 0.0D0 hvv = 0.0D0 volshldi = 0.0D0 volshldo = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9240cbbbfe..232e29ca07 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2216,7 +2216,7 @@ "hcd_building_l": 70.0, "hcd_building_w": 40.0, "hcdportsize": 1.0, - "hcryopf": 0.0, + "dz_pf_cryostat": 0.0, "hcwt": 1.5, "heat_sink_h": 12.0, "heat_sink_l": 160.0, @@ -9743,7 +9743,7 @@ "hcd_building_l": "HCD building length, width, height (m)", "hcd_building_w": "HCD building length, width, height (m)", "hcdportsize": "switch for size of heating/current drive ports (`iblanket=2` (KIT HCPB)):\n
    \n
  • =1 'small'
    • \n
  • =2 'large'
    • \n
", - "hcryopf": "Clearance between uppermost PF coil and cryostat lid (m)", + "dz_pf_cryostat": "Clearance between uppermost PF coil and cryostat lid (m)", "hcwt": "hot cell wall thickness (m)", "heat_sink_h": "heat sinks length, width, height (m)", "heat_sink_l": "heat sinks length, width, height (m)", @@ -17262,7 +17262,7 @@ "shld_u_nuc_heating", "hblnkt", "hshld", - "hcryopf", + "dz_pf_cryostat", "hvv", "volshldi", "volshldo", @@ -18808,7 +18808,7 @@ "vfblkto", "hblnkt", "hshld", - "hcryopf", + "dz_pf_cryostat", "hvv", "volshldi", "volshldo" diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 4f13315ce0..12f38c8c98 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1186,14 +1186,14 @@ class ExternalCryoGeometryParam(NamedTuple): rb: Any = None zh: Any = None clh1: Any = None - hcryopf: Any = None + dz_pf_cryostat: Any = None expected_r_cryostat_inboard: Any = None expected_zdewex: Any = None expected_vdewex: Any = None expected_vvmass: Any = None expected_dewmkg: Any = None expected_clh1: Any = None - expected_hcryopf: Any = None + expected_dz_pf_cryostat: Any = None @pytest.mark.parametrize( @@ -1273,14 +1273,14 @@ class ExternalCryoGeometryParam(NamedTuple): order="F", ).transpose(), clh1=2.5, - hcryopf=0, + dz_pf_cryostat=0, expected_r_cryostat_inboard=17.805470903073743, expected_zdewex=15.259637557000296, expected_vdewex=810.95017445543203, expected_vvmass=7927043.4756686538, expected_dewmkg=14252454.836421024, expected_clh1=5.514694530398824, - expected_hcryopf=5.3441455565624985, + expected_dz_pf_cryostat=5.3441455565624985, ), ), ) @@ -1319,7 +1319,9 @@ def test_external_cryo_geometry( monkeypatch.setattr(pfcoil_variables, "rb", externalcryogeometryparam.rb) monkeypatch.setattr(pfcoil_variables, "zh", externalcryogeometryparam.zh) monkeypatch.setattr(buildings_variables, "clh1", externalcryogeometryparam.clh1) - monkeypatch.setattr(blanket_library, "hcryopf", externalcryogeometryparam.hcryopf) + monkeypatch.setattr( + blanket_library, "dz_pf_cryostat", externalcryogeometryparam.dz_pf_cryostat + ) blanket_library_fixture.external_cryo_geometry() @@ -1341,8 +1343,8 @@ def test_external_cryo_geometry( assert buildings_variables.clh1 == pytest.approx( externalcryogeometryparam.expected_clh1 ) - assert blanket_library.hcryopf == pytest.approx( - externalcryogeometryparam.expected_hcryopf + assert blanket_library.dz_pf_cryostat == pytest.approx( + externalcryogeometryparam.expected_dz_pf_cryostat ) From d0c94c3e876283cf74f904ab26304b98ac9fec89 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 15 Jan 2025 14:08:10 +0000 Subject: [PATCH 04/16] =?UTF-8?q?=F0=9F=94=84=20Rename=20variable=20zdewex?= =?UTF-8?q?=20to=20dz=5Fcryostat=5Fhalf=5Finside=20for=20clarity=20and=20c?= =?UTF-8?q?onsistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/blanket_library.py | 6 ++-- process/costs_2015.py | 11 ++++--- process/geometry/cryostat_geometry.py | 26 +++++++++++----- process/hcpb.py | 4 +-- process/io/plot_proc.py | 8 +++-- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 18 ++++++----- tests/unit/test_costs_2015.py | 24 ++++++++++----- 23 files changed, 112 insertions(+), 83 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index d8bf78f3c2..23014d1a2a 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -993,7 +993,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7769E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5292E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5292E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6091E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 7d2cb7cebf..fbaa901270 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 5b71d5636a..1802bf8421 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 73444013de..855b0b4063 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 7a828b6065..d6becf01ec 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 9c811f8e0a..398a03972e 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -817,7 +817,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -1812,7 +1812,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -2807,7 +2807,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -3802,7 +3802,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -4797,7 +4797,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -5792,7 +5792,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -6787,7 +6787,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -7782,7 +7782,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -8777,7 +8777,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index 5f7be0d1a2..975eaba1bc 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -382,12 +382,12 @@ def external_cryo_geometry(self): # Half-height of cryostat (m) # ISSUE #508 Remove RFP option - fwbs_variables.zdewex = ( + fwbs_variables.dz_cryostat_half_inside = ( np.max(pfcoil_variables.zh) + blanket_library.dz_pf_cryostat ) # Vertical clearance between TF coil and cryostat (m) - buildings_variables.clh1 = fwbs_variables.zdewex - ( + buildings_variables.clh1 = fwbs_variables.dz_cryostat_half_inside - ( build_variables.hmax + build_variables.tfcth ) @@ -395,7 +395,7 @@ def external_cryo_geometry(self): fwbs_variables.vdewex = ( (2.0 * np.pi * fwbs_variables.r_cryostat_inboard) * 2.0 - * fwbs_variables.zdewex + * fwbs_variables.dz_cryostat_half_inside + (2.0 * np.pi * fwbs_variables.r_cryostat_inboard**2) ) * build_variables.ddwex diff --git a/process/costs_2015.py b/process/costs_2015.py index 644bd9fa27..115833a19e 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -547,7 +547,7 @@ def calc_building_costs(self): self.s_k[1] = ( (np.pi * fwbs_variables.r_cryostat_inboard**2) * 2.0e0 - * fwbs_variables.zdewex + * fwbs_variables.dz_cryostat_half_inside ) self.s_kref[1] = 18712.0e0 self.s_cost[1] = ( @@ -980,7 +980,7 @@ def calc_remaining_subsystems(self): self.s_k[43] = ( (np.pi * fwbs_variables.r_cryostat_inboard**2.0e0) * 2.0e0 - * fwbs_variables.zdewex + * fwbs_variables.dz_cryostat_half_inside ) self.s_kref[43] = 18700.0e0 self.s_cost[43] = ( @@ -1012,7 +1012,7 @@ def calc_remaining_subsystems(self): * np.pi * fwbs_variables.r_cryostat_inboard * 2.0e0 - * fwbs_variables.zdewex + * fwbs_variables.dz_cryostat_half_inside + 2 * (np.pi * fwbs_variables.r_cryostat_inboard**2) ) self.s_kref[45] = 3902.0e0 @@ -1210,7 +1210,10 @@ def calc_remaining_subsystems(self): self.s_cref[59] = 129.0e6 # Scale with cryostat external volume (m) self.s_k[59] = ( - np.pi * fwbs_variables.r_cryostat_inboard**2 * 2.0e0 * fwbs_variables.zdewex + np.pi + * fwbs_variables.r_cryostat_inboard**2 + * 2.0e0 + * fwbs_variables.dz_cryostat_half_inside ) self.s_kref[59] = 18700.0e0 self.s_cost[59] = ( diff --git a/process/geometry/cryostat_geometry.py b/process/geometry/cryostat_geometry.py index dafc1b0d32..a8488729e5 100644 --- a/process/geometry/cryostat_geometry.py +++ b/process/geometry/cryostat_geometry.py @@ -6,7 +6,7 @@ def cryostat_geometry( - r_cryostat_inboard: float, ddwex: float, zdewex: float + r_cryostat_inboard: float, ddwex: float, dz_cryostat_half_inside: float ) -> list[RectangleGeometry]: """Calculates rectangular geometries of the cryostat @@ -14,8 +14,8 @@ def cryostat_geometry( :type r_cryostat_inboard: float :param ddwex: external cryostat thickness :type ddwex: float - :param zdewex: cryostat internal half-height - :type zdewex: float + :param dz_cryostat_half_inside: cryostat internal half-height + :type dz_cryostat_half_inside: float :return: list of RectangleGeometry - dataclass returning rectangular geometry parameters :rtype: List[RectangleGeometry] """ @@ -23,21 +23,33 @@ def cryostat_geometry( # rectangle representing vertical part of cryostat above the midplane rect1 = RectangleGeometry( - anchor_x=r_cryostat_inboard, anchor_z=0, width=ddwex, height=(zdewex + ddwex) + anchor_x=r_cryostat_inboard, + anchor_z=0, + width=ddwex, + height=(dz_cryostat_half_inside + ddwex), ) # rectangle representing vertical part of cryostat below the midplane rect2 = RectangleGeometry( - anchor_x=r_cryostat_inboard, anchor_z=0, width=ddwex, height=-(zdewex + ddwex) + anchor_x=r_cryostat_inboard, + anchor_z=0, + width=ddwex, + height=-(dz_cryostat_half_inside + ddwex), ) # rectangle representing horizontal part of cryostat above the midplane rect3 = RectangleGeometry( - anchor_x=0, anchor_z=zdewex, width=r_cryostat_inboard, height=ddwex + anchor_x=0, + anchor_z=dz_cryostat_half_inside, + width=r_cryostat_inboard, + height=ddwex, ) # rectangle representing horizontal part of cryostat below the midplane rect4 = RectangleGeometry( - anchor_x=0, anchor_z=-zdewex, width=r_cryostat_inboard, height=-ddwex + anchor_x=0, + anchor_z=-dz_cryostat_half_inside, + width=r_cryostat_inboard, + height=-ddwex, ) return [rect1, rect2, rect3, rect4] diff --git a/process/hcpb.py b/process/hcpb.py index 239b8f2fed..75a35bd7ce 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -1550,8 +1550,8 @@ def write_output(self): po.ovarre( self.outfile, "Cryostat internal half-height (m)", - "(zdewex)", - fwbs_variables.zdewex, + "(dz_cryostat_half_inside)", + fwbs_variables.dz_cryostat_half_inside, "OP ", ) po.ovarre( diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index e4ceeb8ba3..4ce5fcbf92 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -360,7 +360,9 @@ def plot_cryostat(axis, _mfile_data, _scan, colour_scheme): """Function to plot cryostat in poloidal cross-section""" rects = cryostat_geometry( - r_cryostat_inboard=r_cryostat_inboard, ddwex=ddwex, zdewex=zdewex + r_cryostat_inboard=r_cryostat_inboard, + ddwex=ddwex, + dz_cryostat_half_inside=dz_cryostat_half_inside, ) for rec in rects: @@ -3385,7 +3387,7 @@ def main(args=None): global gapsto global tfthko global r_cryostat_inboard - global zdewex + global dz_cryostat_half_inside global ddwex global j_plasma_0 @@ -3407,7 +3409,7 @@ def main(args=None): gapsto = m_file.data["gapsto"].get_scan(scan) tfthko = m_file.data["tfthko"].get_scan(scan) r_cryostat_inboard = m_file.data["r_cryostat_inboard"].get_scan(scan) - zdewex = m_file.data["zdewex"].get_scan(scan) + dz_cryostat_half_inside = m_file.data["dz_cryostat_half_inside"].get_scan(scan) ddwex = m_file.data["ddwex"].get_scan(scan) j_plasma_0 = m_file.data["j_plasma_0"].get_scan(scan) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 77ee26cff6..f5c1de29cf 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -421,7 +421,7 @@ module fwbs_variables real(dp) :: r_cryostat_inboard !! cryostat radius [m] - real(dp) :: zdewex + real(dp) :: dz_cryostat_half_inside !! cryostat height [m] real(dp) :: dr_pf_cryostat @@ -773,7 +773,7 @@ subroutine init_fwbs_variables ptfnuc = 0.0D0 ptfnucpm3 = 0.0D0 r_cryostat_inboard = 0.0D0 - zdewex = 0.0D0 + dz_cryostat_half_inside = 0.0D0 dr_pf_cryostat = 0.5D0 vdewex = 0.0D0 vdewin = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index cdd607849f..7090e9bd87 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -987,7 +987,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index be7c06c14c..428012182d 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index fc684b7bcb..7d29b6f6a5 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d3c67839d4..a63aa37135 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index a62da72cc7..cd35dc0ab8 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -991,7 +991,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7805E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5351E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5351E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6032E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 1316617725..583699d8fd 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -989,7 +989,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7774E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5301E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5301E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6076E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -2152,7 +2152,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7765E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5286E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5286E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6094E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -3315,7 +3315,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7758E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5274E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5274E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6107E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -4478,7 +4478,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7759E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5275E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5275E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6109E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -5641,7 +5641,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7766E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5286E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5286E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6097E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -6804,7 +6804,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7775E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5302E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5302E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6082E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -7967,7 +7967,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7776E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5304E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5304E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6084E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -9130,7 +9130,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7768E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5290E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5290E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6096E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -10293,7 +10293,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7760E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5277E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5277E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6103E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -11456,7 +11456,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7761E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5278E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5278E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6108E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -12619,7 +12619,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7769E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5292E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5292E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6104E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -13782,7 +13782,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7777E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5305E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5305E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6096E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -14945,7 +14945,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7778E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5307E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5307E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6101E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -16108,7 +16108,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7770E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5293E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5293E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6115E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -17271,7 +17271,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7762E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5280E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5280E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6129E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 4ffc1f7f49..78275b0f81 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -817,7 +817,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -1812,7 +1812,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -2807,7 +2807,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -3802,7 +3802,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -4797,7 +4797,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -5792,7 +5792,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -6787,7 +6787,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -7782,7 +7782,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -8777,7 +8777,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 232e29ca07..348f2bc02f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8581,7 +8581,7 @@ "z_ib": 0.0, "z_ob": 0.0, "zcls": 0.0, - "zdewex": 0.0, + "dz_cryostat_half_inside": 0.0, "zeff": 0.0, "zeff_div": 0.0, "zeffai": 0.0, @@ -11230,7 +11230,7 @@ "z_ib": "", "z_ob": "", "zcls": "", - "zdewex": "cryostat height (m)", + "dz_cryostat_half_inside": "cryostat height (m)", "zeff": "plasma effective charge", "zeff_div": "", "zeffai": "mass weighted plasma effective charge", @@ -18129,7 +18129,7 @@ "ptfnuc", "ptfnucpm3", "r_cryostat_inboard", - "zdewex", + "dz_cryostat_half_inside", "dr_pf_cryostat", "vdewex", "vdewin", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 5651e8eddf..381ba1c251 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -991,7 +991,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7805E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (zdewex)______________________ 1.5351E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5351E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6032E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 12f38c8c98..f183723d09 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1177,7 +1177,7 @@ class ExternalCryoGeometryParam(NamedTuple): ddwex: Any = None r_cryostat_inboard: Any = None dr_pf_cryostat: Any = None - zdewex: Any = None + dz_cryostat_half_inside: Any = None vdewex: Any = None vvmass: Any = None vdewin: Any = None @@ -1188,7 +1188,7 @@ class ExternalCryoGeometryParam(NamedTuple): clh1: Any = None dz_pf_cryostat: Any = None expected_r_cryostat_inboard: Any = None - expected_zdewex: Any = None + expected_dz_cryostat_half_inside: Any = None expected_vdewex: Any = None expected_vvmass: Any = None expected_dewmkg: Any = None @@ -1206,7 +1206,7 @@ class ExternalCryoGeometryParam(NamedTuple): ddwex=0.15000000000000002, r_cryostat_inboard=0, dr_pf_cryostat=0.5, - zdewex=0, + dz_cryostat_half_inside=0, vdewex=0, vvmass=0, vdewin=1016.2876250857248, @@ -1275,7 +1275,7 @@ class ExternalCryoGeometryParam(NamedTuple): clh1=2.5, dz_pf_cryostat=0, expected_r_cryostat_inboard=17.805470903073743, - expected_zdewex=15.259637557000296, + expected_dz_cryostat_half_inside=15.259637557000296, expected_vdewex=810.95017445543203, expected_vvmass=7927043.4756686538, expected_dewmkg=14252454.836421024, @@ -1310,7 +1310,11 @@ def test_external_cryo_geometry( monkeypatch.setattr( fwbs_variables, "dr_pf_cryostat", externalcryogeometryparam.dr_pf_cryostat ) - monkeypatch.setattr(fwbs_variables, "zdewex", externalcryogeometryparam.zdewex) + monkeypatch.setattr( + fwbs_variables, + "dz_cryostat_half_inside", + externalcryogeometryparam.dz_cryostat_half_inside, + ) monkeypatch.setattr(fwbs_variables, "vdewex", externalcryogeometryparam.vdewex) monkeypatch.setattr(fwbs_variables, "vvmass", externalcryogeometryparam.vvmass) monkeypatch.setattr(fwbs_variables, "vdewin", externalcryogeometryparam.vdewin) @@ -1328,8 +1332,8 @@ def test_external_cryo_geometry( assert fwbs_variables.r_cryostat_inboard == pytest.approx( externalcryogeometryparam.expected_r_cryostat_inboard ) - assert fwbs_variables.zdewex == pytest.approx( - externalcryogeometryparam.expected_zdewex + assert fwbs_variables.dz_cryostat_half_inside == pytest.approx( + externalcryogeometryparam.expected_dz_cryostat_half_inside ) assert fwbs_variables.vdewex == pytest.approx( externalcryogeometryparam.expected_vdewex diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index 547ebf4657..4ce7d5253a 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -48,7 +48,7 @@ class CalcBuildingCostsParam(NamedTuple): r_cryostat_inboard: Any = None - zdewex: Any = None + dz_cryostat_half_inside: Any = None cost_factor_buildings: Any = None @@ -90,7 +90,7 @@ class CalcBuildingCostsParam(NamedTuple): n_tf=18, estotftgj=130.10721529398921, r_cryostat_inboard=18.314040399601147, - zdewex=15.118436894660423, + dz_cryostat_half_inside=15.118436894660423, cost_factor_buildings=1, light_build_cost_per_vol=270, tok_build_cost_per_vol=1283, @@ -1190,7 +1190,7 @@ class CalcBuildingCostsParam(NamedTuple): n_tf=18, estotftgj=129.99240835373195, r_cryostat_inboard=18.31462428923539, - zdewex=15.165858901796364, + dz_cryostat_half_inside=15.165858901796364, cost_factor_buildings=1, light_build_cost_per_vol=270, tok_build_cost_per_vol=1283, @@ -2316,7 +2316,11 @@ def test_calc_building_costs(calcbuildingcostsparam, monkeypatch, costs2015): fwbs_variables, "r_cryostat_inboard", calcbuildingcostsparam.r_cryostat_inboard ) - monkeypatch.setattr(fwbs_variables, "zdewex", calcbuildingcostsparam.zdewex) + monkeypatch.setattr( + fwbs_variables, + "dz_cryostat_half_inside", + calcbuildingcostsparam.dz_cryostat_half_inside, + ) monkeypatch.setattr( cost_variables, @@ -13737,7 +13741,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): r_cryostat_inboard: Any = None - zdewex: Any = None + dz_cryostat_half_inside: Any = None cost_factor_misc: Any = None @@ -13779,7 +13783,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): helpow=142703.41458500578, vvmass=8957118.946216708, r_cryostat_inboard=18.314040399601147, - zdewex=15.118436894660423, + dz_cryostat_half_inside=15.118436894660423, cost_factor_misc=1, costexp=0.80000000000000004, s_kref=np.array( @@ -14875,7 +14879,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): helpow=823308.59959198488, vvmass=8948002.9350915737, r_cryostat_inboard=18.31462428923539, - zdewex=15.165858901796364, + dz_cryostat_half_inside=15.165858901796364, cost_factor_misc=1, costexp=0.80000000000000004, s_kref=np.array( @@ -16018,7 +16022,11 @@ def test_calc_remaining_subsystems( calcremainingsubsystemsparam.r_cryostat_inboard, ) - monkeypatch.setattr(fwbs_variables, "zdewex", calcremainingsubsystemsparam.zdewex) + monkeypatch.setattr( + fwbs_variables, + "dz_cryostat_half_inside", + calcremainingsubsystemsparam.dz_cryostat_half_inside, + ) monkeypatch.setattr( cost_variables, From fa20b39551188a079d06c1aa42c6437cf74d0eef Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 15 Jan 2025 14:10:36 +0000 Subject: [PATCH 05/16] =?UTF-8?q?=F0=9F=94=84=20Rename=20variable=20vdewex?= =?UTF-8?q?=20to=20vol=5Fcryostat=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 4 ++-- process/stellarator.py | 8 ++++---- source/fortran/fwbs_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_blanket_library.py | 16 +++++++++------- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 975eaba1bc..4bdf7d46ce 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -392,7 +392,7 @@ def external_cryo_geometry(self): ) # cryostat volume (m3) - fwbs_variables.vdewex = ( + fwbs_variables.vol_cryostat = ( (2.0 * np.pi * fwbs_variables.r_cryostat_inboard) * 2.0 * fwbs_variables.dz_cryostat_half_inside @@ -404,7 +404,7 @@ def external_cryo_geometry(self): # Sum of internal vacuum vessel and cryostat masses (kg) fwbs_variables.dewmkg = ( - fwbs_variables.vdewin + fwbs_variables.vdewex + fwbs_variables.vdewin + fwbs_variables.vol_cryostat ) * fwbs_variables.denstl def primary_coolant_properties(self, output: bool): diff --git a/process/stellarator.py b/process/stellarator.py index 1211fbc766..9623ceb062 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1846,7 +1846,7 @@ def stfwbs(self, output: bool): # External cryostat volume - fwbs_variables.vdewex = ( + fwbs_variables.vol_cryostat = ( 4.0e0 * (np.pi**2) * physics_variables.rmajor @@ -1883,7 +1883,7 @@ def stfwbs(self, output: bool): # Sum of internal vacuum vessel and external cryostat masses fwbs_variables.dewmkg = ( - fwbs_variables.vdewin + fwbs_variables.vdewex + fwbs_variables.vdewin + fwbs_variables.vol_cryostat ) * fwbs_variables.denstl if output: @@ -2252,8 +2252,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "External cryostat shell volume (m3)", - "(vdewex)", - fwbs_variables.vdewex, + "(vol_cryostat)", + fwbs_variables.vol_cryostat, ) po.ovarre( self.outfile, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index f5c1de29cf..cc3aaa7db4 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -428,7 +428,7 @@ module fwbs_variables !! Radial distance between outer edge of furthest away PF coil (or stellarator !! modular coil) and cryostat [m] - real(dp) :: vdewex + real(dp) :: vol_cryostat !! cryostat volume [m^3] real(dp) :: vdewin @@ -775,7 +775,7 @@ subroutine init_fwbs_variables r_cryostat_inboard = 0.0D0 dz_cryostat_half_inside = 0.0D0 dr_pf_cryostat = 0.5D0 - vdewex = 0.0D0 + vol_cryostat = 0.0D0 vdewin = 0.0D0 vfshld = 0.25D0 volblkt = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 348f2bc02f..ca0a63071e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7905,7 +7905,7 @@ "vcool": 20.0, "vcritx": 0.0, "vdalw": 20.0, - "vdewex": 0.0, + "vol_cryostat": 0.0, "vdewin": 0.0, "velblkti": 0.0, "velblkto": 0.0, @@ -11017,7 +11017,7 @@ "vcool": "inlet centrepost coolant flow speed at midplane (m/s) (`iteration variable 70`)", "vcritx": "", "vdalw": "max voltage across TF coil during quench (kV) (`iteration variable 52`)", - "vdewex": "cryostat volume (m3)", + "vol_cryostat": "cryostat volume (m3)", "vdewin": "vacuum vessel volume (m3)", "velblkti": "Inboard/outboard coolant velocity in blanket (m/s)", "velblkto": "Inboard/outboard coolant velocity in blanket (m/s)", @@ -18131,7 +18131,7 @@ "r_cryostat_inboard", "dz_cryostat_half_inside", "dr_pf_cryostat", - "vdewex", + "vol_cryostat", "vdewin", "vfshld", "volblkt", diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index f183723d09..607cd57c66 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1178,7 +1178,7 @@ class ExternalCryoGeometryParam(NamedTuple): r_cryostat_inboard: Any = None dr_pf_cryostat: Any = None dz_cryostat_half_inside: Any = None - vdewex: Any = None + vol_cryostat: Any = None vvmass: Any = None vdewin: Any = None denstl: Any = None @@ -1189,7 +1189,7 @@ class ExternalCryoGeometryParam(NamedTuple): dz_pf_cryostat: Any = None expected_r_cryostat_inboard: Any = None expected_dz_cryostat_half_inside: Any = None - expected_vdewex: Any = None + expected_vol_cryostat: Any = None expected_vvmass: Any = None expected_dewmkg: Any = None expected_clh1: Any = None @@ -1207,7 +1207,7 @@ class ExternalCryoGeometryParam(NamedTuple): r_cryostat_inboard=0, dr_pf_cryostat=0.5, dz_cryostat_half_inside=0, - vdewex=0, + vol_cryostat=0, vvmass=0, vdewin=1016.2876250857248, denstl=7800, @@ -1276,7 +1276,7 @@ class ExternalCryoGeometryParam(NamedTuple): dz_pf_cryostat=0, expected_r_cryostat_inboard=17.805470903073743, expected_dz_cryostat_half_inside=15.259637557000296, - expected_vdewex=810.95017445543203, + expected_vol_cryostat=810.95017445543203, expected_vvmass=7927043.4756686538, expected_dewmkg=14252454.836421024, expected_clh1=5.514694530398824, @@ -1315,7 +1315,9 @@ def test_external_cryo_geometry( "dz_cryostat_half_inside", externalcryogeometryparam.dz_cryostat_half_inside, ) - monkeypatch.setattr(fwbs_variables, "vdewex", externalcryogeometryparam.vdewex) + monkeypatch.setattr( + fwbs_variables, "vol_cryostat", externalcryogeometryparam.vol_cryostat + ) monkeypatch.setattr(fwbs_variables, "vvmass", externalcryogeometryparam.vvmass) monkeypatch.setattr(fwbs_variables, "vdewin", externalcryogeometryparam.vdewin) monkeypatch.setattr(fwbs_variables, "denstl", externalcryogeometryparam.denstl) @@ -1335,8 +1337,8 @@ def test_external_cryo_geometry( assert fwbs_variables.dz_cryostat_half_inside == pytest.approx( externalcryogeometryparam.expected_dz_cryostat_half_inside ) - assert fwbs_variables.vdewex == pytest.approx( - externalcryogeometryparam.expected_vdewex + assert fwbs_variables.vol_cryostat == pytest.approx( + externalcryogeometryparam.expected_vol_cryostat ) assert fwbs_variables.vvmass == pytest.approx( externalcryogeometryparam.expected_vvmass From d4cfa1d9fe2a6728f92be5189a98d56510238a41 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 15 Jan 2025 14:15:37 +0000 Subject: [PATCH 06/16] =?UTF-8?q?=F0=9F=94=84=20Rename=20variable=20ddwex?= =?UTF-8?q?=20to=20dr=5Fcryostat=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/fusion-devices/stellarator.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +-- examples/data/large_tokamak_1_MFILE.DAT | 4 +-- examples/data/large_tokamak_2_MFILE.DAT | 4 +-- examples/data/large_tokamak_3_MFILE.DAT | 4 +-- examples/data/large_tokamak_4_MFILE.DAT | 4 +-- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/mfile_to_csv_vars.json | 2 +- examples/data/scan_MFILE.DAT | 20 ++++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/blanket_library.py | 2 +- process/build.py | 4 +-- process/geometry/cryostat_geometry.py | 18 +++++------ process/io/mfile_to_csv_vars.json | 2 +- process/io/plot_proc.py | 8 ++--- process/stellarator.py | 2 +- source/fortran/build_variables.f90 | 4 +-- source/fortran/input.f90 | 6 ++-- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 20 ++++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 10 +++--- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- .../regression/input_files/stellarator.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_blanket_library.py | 8 +++-- 39 files changed, 106 insertions(+), 104 deletions(-) diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index 6b5473bb98..020fd4a81e 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -277,7 +277,7 @@ declfw = 0.075 *Neutron decay length in first wall (m) declshld = 0.075 *Neutron decay length in shield area (m) blnkith = 0.6 *Inboard blanket thickness (m) blnkoth = 0.6 *Outboard blanket thickness (m) -ddwex = 0.15 *Cryostat thickness (m) +dr_cryostat = 0.15 *Cryostat thickness (m) d_vv_in = 0.01 *Vacuum vessel thickness (TF coil / shield) (m) gapds = 0.025 *Gap between inboard vacuum vessel and tf coil (m) gapomin = 0.025 *Minimum gap between outboard vacuum vessel and TF coil (m) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 23014d1a2a..ff0cdeaa48 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -604,7 +604,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1523,7 +1523,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index fbaa901270..d3d46f4d7c 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -601,7 +601,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1517,7 +1517,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 1802bf8421..d19fd94c4c 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -601,7 +601,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1517,7 +1517,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 855b0b4063..0a4368cd61 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -601,7 +601,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1517,7 +1517,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index d6becf01ec..fac36528b7 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -601,7 +601,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1517,7 +1517,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 838e0942b0..6de0b0d43d 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -327,7 +327,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/examples/data/mfile_to_csv_vars.json b/examples/data/mfile_to_csv_vars.json index bfc69337e1..e5cac4559a 100644 --- a/examples/data/mfile_to_csv_vars.json +++ b/examples/data/mfile_to_csv_vars.json @@ -15,7 +15,7 @@ "ohcth", "cpttf", "dr_tf_wp", - "ddwex", + "dr_cryostat", "shldoth", "divfix", "rmajor" diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 398a03972e..ab9887f6aa 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -454,7 +454,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1449,7 +1449,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -2444,7 +2444,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -3439,7 +3439,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -4434,7 +4434,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -5429,7 +5429,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -6424,7 +6424,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -7419,7 +7419,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -8414,7 +8414,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -9081,7 +9081,7 @@ sweep = 5.8e8, 6.0e8, 6.2e8, 6.4e8, 6.6e8, 6.8e8, 7.0e8, 7.2e8, 7.4e8 blnkith = 0.755 * Inboard blanket thickness (m); blnkoth = 0.982 * Outboard blanket thickness (m) bore = 2.483 * Central solenoid inboard radius (m) -ddwex = 0.15 * Cryostat thickness (m) +dr_cryostat = 0.15 * Cryostat thickness (m) d_vv_in = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) d_vv_out = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 483bdf6301..95b289d5c2 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -327,7 +327,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/process/blanket_library.py b/process/blanket_library.py index 4bdf7d46ce..3bdb9bf4f3 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -397,7 +397,7 @@ def external_cryo_geometry(self): * 2.0 * fwbs_variables.dz_cryostat_half_inside + (2.0 * np.pi * fwbs_variables.r_cryostat_inboard**2) - ) * build_variables.ddwex + ) * build_variables.dr_cryostat # Vacuum vessel mass (kg) fwbs_variables.vvmass = fwbs_variables.vdewin * fwbs_variables.denstl diff --git a/process/build.py b/process/build.py index 8d825755c0..e9987bde5c 100644 --- a/process/build.py +++ b/process/build.py @@ -2357,8 +2357,8 @@ def calculate_radial_build(self, output: bool) -> None: po.ovarre( self.mfile, "External cryostat thickness (excludes structure) (m)", - "(ddwex)", - build_variables.ddwex, + "(dr_cryostat)", + build_variables.dr_cryostat, ) if (current_drive_variables.iefrf in [5, 8]) or ( diff --git a/process/geometry/cryostat_geometry.py b/process/geometry/cryostat_geometry.py index a8488729e5..9ff4e8b5af 100644 --- a/process/geometry/cryostat_geometry.py +++ b/process/geometry/cryostat_geometry.py @@ -6,14 +6,14 @@ def cryostat_geometry( - r_cryostat_inboard: float, ddwex: float, dz_cryostat_half_inside: float + r_cryostat_inboard: float, dr_cryostat: float, dz_cryostat_half_inside: float ) -> list[RectangleGeometry]: """Calculates rectangular geometries of the cryostat :param r_cryostat_inboard: cryostat internal radius :type r_cryostat_inboard: float - :param ddwex: external cryostat thickness - :type ddwex: float + :param dr_cryostat: external cryostat thickness + :type dr_cryostat: float :param dz_cryostat_half_inside: cryostat internal half-height :type dz_cryostat_half_inside: float :return: list of RectangleGeometry - dataclass returning rectangular geometry parameters @@ -25,16 +25,16 @@ def cryostat_geometry( rect1 = RectangleGeometry( anchor_x=r_cryostat_inboard, anchor_z=0, - width=ddwex, - height=(dz_cryostat_half_inside + ddwex), + width=dr_cryostat, + height=(dz_cryostat_half_inside + dr_cryostat), ) # rectangle representing vertical part of cryostat below the midplane rect2 = RectangleGeometry( anchor_x=r_cryostat_inboard, anchor_z=0, - width=ddwex, - height=-(dz_cryostat_half_inside + ddwex), + width=dr_cryostat, + height=-(dz_cryostat_half_inside + dr_cryostat), ) # rectangle representing horizontal part of cryostat above the midplane @@ -42,7 +42,7 @@ def cryostat_geometry( anchor_x=0, anchor_z=dz_cryostat_half_inside, width=r_cryostat_inboard, - height=ddwex, + height=dr_cryostat, ) # rectangle representing horizontal part of cryostat below the midplane @@ -50,6 +50,6 @@ def cryostat_geometry( anchor_x=0, anchor_z=-dz_cryostat_half_inside, width=r_cryostat_inboard, - height=-ddwex, + height=-dr_cryostat, ) return [rect1, rect2, rect3, rect4] diff --git a/process/io/mfile_to_csv_vars.json b/process/io/mfile_to_csv_vars.json index bfc69337e1..e5cac4559a 100644 --- a/process/io/mfile_to_csv_vars.json +++ b/process/io/mfile_to_csv_vars.json @@ -15,7 +15,7 @@ "ohcth", "cpttf", "dr_tf_wp", - "ddwex", + "dr_cryostat", "shldoth", "divfix", "rmajor" diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 4ce5fcbf92..105d4221f4 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -361,7 +361,7 @@ def plot_cryostat(axis, _mfile_data, _scan, colour_scheme): rects = cryostat_geometry( r_cryostat_inboard=r_cryostat_inboard, - ddwex=ddwex, + dr_cryostat=dr_cryostat, dz_cryostat_half_inside=dz_cryostat_half_inside, ) @@ -491,7 +491,7 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): arc_fill( axis, r_cryostat_inboard, - r_cryostat_inboard + ddwex, + r_cryostat_inboard + dr_cryostat, color=CRYOSTAT_COLOUR[colour_scheme - 1], ) @@ -3388,7 +3388,7 @@ def main(args=None): global tfthko global r_cryostat_inboard global dz_cryostat_half_inside - global ddwex + global dr_cryostat global j_plasma_0 bore = m_file.data["bore"].get_scan(scan) @@ -3410,7 +3410,7 @@ def main(args=None): tfthko = m_file.data["tfthko"].get_scan(scan) r_cryostat_inboard = m_file.data["r_cryostat_inboard"].get_scan(scan) dz_cryostat_half_inside = m_file.data["dz_cryostat_half_inside"].get_scan(scan) - ddwex = m_file.data["ddwex"].get_scan(scan) + dr_cryostat = m_file.data["dr_cryostat"].get_scan(scan) j_plasma_0 = m_file.data["j_plasma_0"].get_scan(scan) # Magnets related diff --git a/process/stellarator.py b/process/stellarator.py index 9623ceb062..8a9c8aaeee 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1851,7 +1851,7 @@ def stfwbs(self, output: bool): * (np.pi**2) * physics_variables.rmajor * adewex - * build_variables.ddwex + * build_variables.dr_cryostat ) # Internal vacuum vessel volume diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index fd40058398..e690dde955 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -63,7 +63,7 @@ module build_variables real(dp) :: clhsf !! cryostat lid height scaling factor (tokamaks) - real(dp) :: ddwex + real(dp) :: dr_cryostat !! cryostat thickness (m) real(dp) :: d_vv_in @@ -316,7 +316,7 @@ subroutine init_build_variables blnktth = 0.0D0 bore = 1.42D0 clhsf = 4.268D0 - ddwex = 0.07D0 + dr_cryostat = 0.07D0 d_vv_in = 0.07D0 d_vv_out = 0.07D0 d_vv_top = 0.07D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index a71c4b473b..68adedadeb 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -196,7 +196,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) shldtth, shldlth, vgap_vv_thermalshield, plleni, fwoth, vvblgap, & thshield_ib, thshield_ob, thshield_vb, iprecomp, & blbpith, aplasmin, blbuoth, tfcth, & - iohcl, tftsgap, clhsf, bore, plleno, scrapli, gapomin, ddwex, & + iohcl, tftsgap, clhsf, bore, plleno, scrapli, gapomin, dr_cryostat, & rinboard, blnkoth, fseppc, plsepo, blnkith, & ohcth, plsepi, blbmith, gapoh, fcspc, scraplo, vgaptop, & blbpoth, gapds, fwith, vgap_xpoint_divertor, shldith, sigallpc, tfootfi, f_avspace,& @@ -1315,8 +1315,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('clhsf') call parse_real_variable('clhsf', clhsf, 2.0D0, 10.0D0, & 'Cryostat lid height scaling factor (m)') - case ('ddwex') - call parse_real_variable('ddwex', ddwex, 0.0D0, 10.0D0, & + case ('dr_cryostat') + call parse_real_variable('dr_cryostat', dr_cryostat, 0.0D0, 10.0D0, & 'cryostat wall thickness (m)') case ('d_vv_in') call parse_real_variable('d_vv_in', d_vv_in, 0.0D0, 10.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 7090e9bd87..95e73cd644 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -600,7 +600,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1516,7 +1516,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 428012182d..4eb0f562f1 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -601,7 +601,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1517,7 +1517,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 7d29b6f6a5..a19481a936 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -601,7 +601,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1517,7 +1517,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index a63aa37135..37f88bf697 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -601,7 +601,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1517,7 +1517,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 838e0942b0..6de0b0d43d 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -327,7 +327,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index cd35dc0ab8..7496a2e84b 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -599,7 +599,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(excludes_structure)_(m)____________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(excludes_structure)_(m)____________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1518,7 +1518,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 8c6092dd97..40441cd868 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -96,7 +96,7 @@ boundl(140) = 0.4 blnkith = 0.7 * inboard blanket thickness (m); (calculated if `blktmodel>0`) (=0;0 if `iblnkith=0`) blnkoth = 1.0 * outboard blanket thickness (m); calculated if `blktmodel>0` bore = 2.003843190236783 * central solenoid inboard radius (m) (`iteration variable 29`) -ddwex = 0.15 * cryostat thickness (m) +dr_cryostat = 0.15 * cryostat thickness (m) d_vv_in = 0.3 * vacuum vessel inboard thickness (TF coil / shield) (m) d_vv_out = 0.3 * vacuum vessel outboard thickness (TF coil / shield) (m) d_vv_top = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 15421c2ad3..c4eb896a5f 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -102,7 +102,7 @@ ixc = 110 * ftaulimit blnkith = 0.755 * Inboard blanket thickness (m); blnkoth = 0.982 * Outboard blanket thickness (m) bore = 2.483 * Central solenoid inboard radius (m) -ddwex = 0.15 * Cryostat thickness (m) +dr_cryostat = 0.15 * Cryostat thickness (m) d_vv_in = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) d_vv_out = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 583699d8fd..6d0a2880ff 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -602,7 +602,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1765,7 +1765,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -2928,7 +2928,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -4091,7 +4091,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -5254,7 +5254,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -6417,7 +6417,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -7580,7 +7580,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -8743,7 +8743,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -9906,7 +9906,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -11069,7 +11069,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -12232,7 +12232,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -13395,7 +13395,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -14558,7 +14558,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -15721,7 +15721,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -16884,7 +16884,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -17803,7 +17803,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 78275b0f81..0966290860 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -454,7 +454,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1449,7 +1449,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -2444,7 +2444,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -3439,7 +3439,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -4434,7 +4434,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -5429,7 +5429,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -6424,7 +6424,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -7419,7 +7419,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -8414,7 +8414,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(m)_________________________________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -9081,7 +9081,7 @@ sweep = 5.8e8, 6.0e8, 6.2e8, 6.4e8, 6.6e8, 6.8e8, 7.0e8, 7.2e8, 7.4e8 blnkith = 0.755 * Inboard blanket thickness (m); blnkoth = 0.982 * Outboard blanket thickness (m) bore = 2.483 * Central solenoid inboard radius (m) -ddwex = 0.15 * Cryostat thickness (m) +dr_cryostat = 0.15 * Cryostat thickness (m) d_vv_in = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) d_vv_out = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index c16eba5660..6b60709067 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -102,7 +102,7 @@ ixc = 110 * ftaulimit blnkith = 0.755 * Inboard blanket thickness (m); blnkoth = 0.982 * Outboard blanket thickness (m) bore = 2.483 * Central solenoid inboard radius (m) -ddwex = 0.15 * Cryostat thickness (m) +dr_cryostat = 0.15 * Cryostat thickness (m) d_vv_in = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) d_vv_out = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index c6236d680a..45ef5c53d9 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -102,7 +102,7 @@ ixc = 110 * ftaulimit blnkith = 0.755 * Inboard blanket thickness (m); blnkoth = 0.982 * Outboard blanket thickness (m) bore = 2.483 * Central solenoid inboard radius (m) -ddwex = 0.15 * Cryostat thickness (m) +dr_cryostat = 0.15 * Cryostat thickness (m) d_vv_in = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) d_vv_out = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index ca0a63071e..93ad81341b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1609,7 +1609,7 @@ ], "dcondins": 1800.0, "dcopper": 8900.0, - "ddwex": 0.07, + "dr_cryostat": 0.07, "declblkt": 0.075, "declfw": 0.075, "declshld": 0.075, @@ -9264,7 +9264,7 @@ "dcond": "density of superconductor type given by i_tf_sc_mat/isumatoh/isumatpf (kg/m3)", "dcondins": "density of conduit + ground-wall insulation (kg/m3)", "dcopper": "density of copper (kg/m3)", - "ddwex": "cryostat thickness (m)", + "dr_cryostat": "cryostat thickness (m)", "declblkt": "neutron power deposition decay length of blanket structural material (m) (stellarators only)", "declfw": "neutron power deposition decay length of first wall structural material (m) (stellarators only)", "declshld": "neutron power deposition decay length of shield structural material (m) (stellarators only)", @@ -12167,7 +12167,7 @@ "lb": 8000.0, "ub": 10000.0 }, - "ddwex": { + "dr_cryostat": { "lb": 0.0, "ub": 10.0 }, @@ -17022,7 +17022,7 @@ "blnktth", "bore", "clhsf", - "ddwex", + "dr_cryostat", "d_vv_in", "d_vv_out", "d_vv_top", @@ -20164,7 +20164,7 @@ "dcond": "real_array", "dcondins": "real_variable", "dcopper": "real_variable", - "ddwex": "real_variable", + "dr_cryostat": "real_variable", "declblkt": "real_variable", "declfw": "real_variable", "declshld": "real_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 0addef0f8f..0852fc38d7 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -327,7 +327,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index da6f197d43..3fb7416435 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -309,7 +309,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index dcb3ee4e3c..b7715bede3 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -96,7 +96,7 @@ boundl(140) = 0.4 blnkith = 0.7 * inboard blanket thickness (m); (calculated if `blktmodel>0`) (=0;0 if `iblnkith=0`) blnkoth = 1.0 * outboard blanket thickness (m); calculated if `blktmodel>0` bore = 2.003843190236783 * central solenoid inboard radius (m) (`iteration variable 29`) -ddwex = 0.15 * cryostat thickness (m) +dr_cryostat = 0.15 * cryostat thickness (m) d_vv_in = 0.3 * vacuum vessel inboard thickness (TF coil / shield) (m) d_vv_out = 0.3 * vacuum vessel outboard thickness (TF coil / shield) (m) d_vv_top = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 2ab00f65f8..3dfc3362e9 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2223,7 +2223,7 @@ i_r_cp_top = 2 * DESCRIPTION: Cryostat lid height scaling factor (m) * JUSTIFICATION: Not scaling cryostat height. -*ddwex = +*dr_cryostat = * DESCRIPTION: Cryostat wall thickness (m) * JUSTIFICATION: Not scaling cryostat height. diff --git a/tests/regression/input_files/stellarator.IN.DAT b/tests/regression/input_files/stellarator.IN.DAT index b551ecc672..4e34214433 100644 --- a/tests/regression/input_files/stellarator.IN.DAT +++ b/tests/regression/input_files/stellarator.IN.DAT @@ -149,7 +149,7 @@ shear = 0.5 *Magnetic shear, derivative of iotabar blnkith = 0.6 *Inboard blanket thickness (m) blnkoth = 0.6 *Outboard blanket thickness (m) -ddwex = 0.15 *Cryostat thickness (m) +dr_cryostat = 0.15 *Cryostat thickness (m) d_vv_in = 0.5 *Vacuum vessel thickness (TF coil / shield) (m) d_vv_out = 0.5 gapds = 0.1 *0.025 *Gap between inboard vacuum vessel and tf coil (m) -- what is with "gapsto" ?? diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 693f434c9d..63a371df34 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -327,7 +327,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 381ba1c251..e5e3c26e57 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -599,7 +599,7 @@ Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 - External_cryostat_thickness_(excludes_structure)_(m)____________________ (ddwex)_______________________ 1.5000E-01 + External_cryostat_thickness_(excludes_structure)_(m)____________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # @@ -1518,7 +1518,7 @@ scraplo = 0.25 blnkoth = 1.0 * Cryostat thickness [m] -ddwex = 0.15 +dr_cryostat = 0.15 * Outboard shield thickness [m] shldoth = 0.800 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 607cd57c66..e1c39bc6c1 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1174,7 +1174,7 @@ class ExternalCryoGeometryParam(NamedTuple): clhsf: Any = None hmax: Any = None tfcth: Any = None - ddwex: Any = None + dr_cryostat: Any = None r_cryostat_inboard: Any = None dr_pf_cryostat: Any = None dz_cryostat_half_inside: Any = None @@ -1203,7 +1203,7 @@ class ExternalCryoGeometryParam(NamedTuple): clhsf=4.2679999999999998, hmax=8.8182171641274945, tfcth=0.92672586247397692, - ddwex=0.15000000000000002, + dr_cryostat=0.15000000000000002, r_cryostat_inboard=0, dr_pf_cryostat=0.5, dz_cryostat_half_inside=0, @@ -1301,7 +1301,9 @@ def test_external_cryo_geometry( monkeypatch.setattr(build_variables, "clhsf", externalcryogeometryparam.clhsf) monkeypatch.setattr(build_variables, "hmax", externalcryogeometryparam.hmax) monkeypatch.setattr(build_variables, "tfcth", externalcryogeometryparam.tfcth) - monkeypatch.setattr(build_variables, "ddwex", externalcryogeometryparam.ddwex) + monkeypatch.setattr( + build_variables, "dr_cryostat", externalcryogeometryparam.dr_cryostat + ) monkeypatch.setattr( fwbs_variables, "r_cryostat_inboard", From 5d3d80c7fa5ac0ab51ed1e2faf8f9c28bb9517ca Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 15 Jan 2025 14:19:57 +0000 Subject: [PATCH 07/16] =?UTF-8?q?=F0=9F=94=84=20Rename=20variable=20dz=5Fc?= =?UTF-8?q?ryostat=5Fhalf=5Finside=20to=20z=5Fcryostat=5Fhalf=5Finside=20f?= =?UTF-8?q?or=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/blanket_library.py | 6 ++-- process/costs_2015.py | 8 ++--- process/geometry/cryostat_geometry.py | 14 ++++----- process/hcpb.py | 4 +-- process/io/plot_proc.py | 6 ++-- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 16 +++++----- tests/unit/test_costs_2015.py | 20 ++++++------- 23 files changed, 86 insertions(+), 86 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index ff0cdeaa48..365a626b7c 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -993,7 +993,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7769E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5292E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5292E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6091E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index d3d46f4d7c..8e320ad4d4 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index d19fd94c4c..d99b484702 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 0a4368cd61..b6371bc14c 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index fac36528b7..b8242541ff 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index ab9887f6aa..0288307510 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -817,7 +817,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -1812,7 +1812,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -2807,7 +2807,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -3802,7 +3802,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -4797,7 +4797,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -5792,7 +5792,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -6787,7 +6787,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -7782,7 +7782,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -8777,7 +8777,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index 3bdb9bf4f3..62229f616b 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -382,12 +382,12 @@ def external_cryo_geometry(self): # Half-height of cryostat (m) # ISSUE #508 Remove RFP option - fwbs_variables.dz_cryostat_half_inside = ( + fwbs_variables.z_cryostat_half_inside = ( np.max(pfcoil_variables.zh) + blanket_library.dz_pf_cryostat ) # Vertical clearance between TF coil and cryostat (m) - buildings_variables.clh1 = fwbs_variables.dz_cryostat_half_inside - ( + buildings_variables.clh1 = fwbs_variables.z_cryostat_half_inside - ( build_variables.hmax + build_variables.tfcth ) @@ -395,7 +395,7 @@ def external_cryo_geometry(self): fwbs_variables.vol_cryostat = ( (2.0 * np.pi * fwbs_variables.r_cryostat_inboard) * 2.0 - * fwbs_variables.dz_cryostat_half_inside + * fwbs_variables.z_cryostat_half_inside + (2.0 * np.pi * fwbs_variables.r_cryostat_inboard**2) ) * build_variables.dr_cryostat diff --git a/process/costs_2015.py b/process/costs_2015.py index 115833a19e..46565a7c43 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -547,7 +547,7 @@ def calc_building_costs(self): self.s_k[1] = ( (np.pi * fwbs_variables.r_cryostat_inboard**2) * 2.0e0 - * fwbs_variables.dz_cryostat_half_inside + * fwbs_variables.z_cryostat_half_inside ) self.s_kref[1] = 18712.0e0 self.s_cost[1] = ( @@ -980,7 +980,7 @@ def calc_remaining_subsystems(self): self.s_k[43] = ( (np.pi * fwbs_variables.r_cryostat_inboard**2.0e0) * 2.0e0 - * fwbs_variables.dz_cryostat_half_inside + * fwbs_variables.z_cryostat_half_inside ) self.s_kref[43] = 18700.0e0 self.s_cost[43] = ( @@ -1012,7 +1012,7 @@ def calc_remaining_subsystems(self): * np.pi * fwbs_variables.r_cryostat_inboard * 2.0e0 - * fwbs_variables.dz_cryostat_half_inside + * fwbs_variables.z_cryostat_half_inside + 2 * (np.pi * fwbs_variables.r_cryostat_inboard**2) ) self.s_kref[45] = 3902.0e0 @@ -1213,7 +1213,7 @@ def calc_remaining_subsystems(self): np.pi * fwbs_variables.r_cryostat_inboard**2 * 2.0e0 - * fwbs_variables.dz_cryostat_half_inside + * fwbs_variables.z_cryostat_half_inside ) self.s_kref[59] = 18700.0e0 self.s_cost[59] = ( diff --git a/process/geometry/cryostat_geometry.py b/process/geometry/cryostat_geometry.py index 9ff4e8b5af..2af9f9a96a 100644 --- a/process/geometry/cryostat_geometry.py +++ b/process/geometry/cryostat_geometry.py @@ -6,7 +6,7 @@ def cryostat_geometry( - r_cryostat_inboard: float, dr_cryostat: float, dz_cryostat_half_inside: float + r_cryostat_inboard: float, dr_cryostat: float, z_cryostat_half_inside: float ) -> list[RectangleGeometry]: """Calculates rectangular geometries of the cryostat @@ -14,8 +14,8 @@ def cryostat_geometry( :type r_cryostat_inboard: float :param dr_cryostat: external cryostat thickness :type dr_cryostat: float - :param dz_cryostat_half_inside: cryostat internal half-height - :type dz_cryostat_half_inside: float + :param z_cryostat_half_inside: cryostat internal half-height + :type z_cryostat_half_inside: float :return: list of RectangleGeometry - dataclass returning rectangular geometry parameters :rtype: List[RectangleGeometry] """ @@ -26,7 +26,7 @@ def cryostat_geometry( anchor_x=r_cryostat_inboard, anchor_z=0, width=dr_cryostat, - height=(dz_cryostat_half_inside + dr_cryostat), + height=(z_cryostat_half_inside + dr_cryostat), ) # rectangle representing vertical part of cryostat below the midplane @@ -34,13 +34,13 @@ def cryostat_geometry( anchor_x=r_cryostat_inboard, anchor_z=0, width=dr_cryostat, - height=-(dz_cryostat_half_inside + dr_cryostat), + height=-(z_cryostat_half_inside + dr_cryostat), ) # rectangle representing horizontal part of cryostat above the midplane rect3 = RectangleGeometry( anchor_x=0, - anchor_z=dz_cryostat_half_inside, + anchor_z=z_cryostat_half_inside, width=r_cryostat_inboard, height=dr_cryostat, ) @@ -48,7 +48,7 @@ def cryostat_geometry( # rectangle representing horizontal part of cryostat below the midplane rect4 = RectangleGeometry( anchor_x=0, - anchor_z=-dz_cryostat_half_inside, + anchor_z=-z_cryostat_half_inside, width=r_cryostat_inboard, height=-dr_cryostat, ) diff --git a/process/hcpb.py b/process/hcpb.py index 75a35bd7ce..d091385d62 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -1550,8 +1550,8 @@ def write_output(self): po.ovarre( self.outfile, "Cryostat internal half-height (m)", - "(dz_cryostat_half_inside)", - fwbs_variables.dz_cryostat_half_inside, + "(z_cryostat_half_inside)", + fwbs_variables.z_cryostat_half_inside, "OP ", ) po.ovarre( diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 105d4221f4..01fb60cfcb 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -362,7 +362,7 @@ def plot_cryostat(axis, _mfile_data, _scan, colour_scheme): rects = cryostat_geometry( r_cryostat_inboard=r_cryostat_inboard, dr_cryostat=dr_cryostat, - dz_cryostat_half_inside=dz_cryostat_half_inside, + z_cryostat_half_inside=z_cryostat_half_inside, ) for rec in rects: @@ -3387,7 +3387,7 @@ def main(args=None): global gapsto global tfthko global r_cryostat_inboard - global dz_cryostat_half_inside + global z_cryostat_half_inside global dr_cryostat global j_plasma_0 @@ -3409,7 +3409,7 @@ def main(args=None): gapsto = m_file.data["gapsto"].get_scan(scan) tfthko = m_file.data["tfthko"].get_scan(scan) r_cryostat_inboard = m_file.data["r_cryostat_inboard"].get_scan(scan) - dz_cryostat_half_inside = m_file.data["dz_cryostat_half_inside"].get_scan(scan) + z_cryostat_half_inside = m_file.data["z_cryostat_half_inside"].get_scan(scan) dr_cryostat = m_file.data["dr_cryostat"].get_scan(scan) j_plasma_0 = m_file.data["j_plasma_0"].get_scan(scan) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index cc3aaa7db4..a920190722 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -421,7 +421,7 @@ module fwbs_variables real(dp) :: r_cryostat_inboard !! cryostat radius [m] - real(dp) :: dz_cryostat_half_inside + real(dp) :: z_cryostat_half_inside !! cryostat height [m] real(dp) :: dr_pf_cryostat @@ -773,7 +773,7 @@ subroutine init_fwbs_variables ptfnuc = 0.0D0 ptfnucpm3 = 0.0D0 r_cryostat_inboard = 0.0D0 - dz_cryostat_half_inside = 0.0D0 + z_cryostat_half_inside = 0.0D0 dr_pf_cryostat = 0.5D0 vol_cryostat = 0.0D0 vdewin = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 95e73cd644..5efb75ba76 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -987,7 +987,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 4eb0f562f1..41ad0e7c26 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index a19481a936..f5e3f3ad44 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 37f88bf697..f91ef4346f 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -988,7 +988,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5339E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 7496a2e84b..3cf3abfbc6 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -991,7 +991,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7805E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5351E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5351E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6032E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 6d0a2880ff..5262bb0ab3 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -989,7 +989,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7774E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5301E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5301E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6076E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -2152,7 +2152,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7765E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5286E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5286E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6094E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -3315,7 +3315,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7758E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5274E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5274E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6107E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -4478,7 +4478,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7759E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5275E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5275E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6109E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -5641,7 +5641,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7766E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5286E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5286E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6097E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -6804,7 +6804,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7775E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5302E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5302E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6082E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -7967,7 +7967,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7776E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5304E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5304E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6084E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -9130,7 +9130,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7768E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5290E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5290E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6096E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -10293,7 +10293,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7760E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5277E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5277E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6103E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -11456,7 +11456,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7761E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5278E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5278E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6108E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -12619,7 +12619,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7769E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5292E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5292E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6104E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -13782,7 +13782,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7777E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5305E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5305E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6096E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -14945,7 +14945,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7778E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5307E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5307E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6101E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -16108,7 +16108,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7770E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5293E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5293E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6115E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP @@ -17271,7 +17271,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7762E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5280E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5280E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6129E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 0966290860..6d8f601fe8 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -817,7 +817,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -1812,7 +1812,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -2807,7 +2807,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -3802,7 +3802,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -4797,7 +4797,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -5792,7 +5792,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -6787,7 +6787,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -7782,7 +7782,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP @@ -8777,7 +8777,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.6623E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 93ad81341b..f042aca2ba 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8581,7 +8581,7 @@ "z_ib": 0.0, "z_ob": 0.0, "zcls": 0.0, - "dz_cryostat_half_inside": 0.0, + "z_cryostat_half_inside": 0.0, "zeff": 0.0, "zeff_div": 0.0, "zeffai": 0.0, @@ -11230,7 +11230,7 @@ "z_ib": "", "z_ob": "", "zcls": "", - "dz_cryostat_half_inside": "cryostat height (m)", + "z_cryostat_half_inside": "cryostat height (m)", "zeff": "plasma effective charge", "zeff_div": "", "zeffai": "mass weighted plasma effective charge", @@ -18129,7 +18129,7 @@ "ptfnuc", "ptfnucpm3", "r_cryostat_inboard", - "dz_cryostat_half_inside", + "z_cryostat_half_inside", "dr_pf_cryostat", "vol_cryostat", "vdewin", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index e5e3c26e57..03f19cab7e 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -991,7 +991,7 @@ Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7805E+01 OP - Cryostat_internal_half-height_(m)_______________________________________ (dz_cryostat_half_inside)______________________ 1.5351E+01 OP + Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5351E+01 OP Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6032E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index e1c39bc6c1..e064d07f0f 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1177,7 +1177,7 @@ class ExternalCryoGeometryParam(NamedTuple): dr_cryostat: Any = None r_cryostat_inboard: Any = None dr_pf_cryostat: Any = None - dz_cryostat_half_inside: Any = None + z_cryostat_half_inside: Any = None vol_cryostat: Any = None vvmass: Any = None vdewin: Any = None @@ -1188,7 +1188,7 @@ class ExternalCryoGeometryParam(NamedTuple): clh1: Any = None dz_pf_cryostat: Any = None expected_r_cryostat_inboard: Any = None - expected_dz_cryostat_half_inside: Any = None + expected_z_cryostat_half_inside: Any = None expected_vol_cryostat: Any = None expected_vvmass: Any = None expected_dewmkg: Any = None @@ -1206,7 +1206,7 @@ class ExternalCryoGeometryParam(NamedTuple): dr_cryostat=0.15000000000000002, r_cryostat_inboard=0, dr_pf_cryostat=0.5, - dz_cryostat_half_inside=0, + z_cryostat_half_inside=0, vol_cryostat=0, vvmass=0, vdewin=1016.2876250857248, @@ -1275,7 +1275,7 @@ class ExternalCryoGeometryParam(NamedTuple): clh1=2.5, dz_pf_cryostat=0, expected_r_cryostat_inboard=17.805470903073743, - expected_dz_cryostat_half_inside=15.259637557000296, + expected_z_cryostat_half_inside=15.259637557000296, expected_vol_cryostat=810.95017445543203, expected_vvmass=7927043.4756686538, expected_dewmkg=14252454.836421024, @@ -1314,8 +1314,8 @@ def test_external_cryo_geometry( ) monkeypatch.setattr( fwbs_variables, - "dz_cryostat_half_inside", - externalcryogeometryparam.dz_cryostat_half_inside, + "z_cryostat_half_inside", + externalcryogeometryparam.z_cryostat_half_inside, ) monkeypatch.setattr( fwbs_variables, "vol_cryostat", externalcryogeometryparam.vol_cryostat @@ -1336,8 +1336,8 @@ def test_external_cryo_geometry( assert fwbs_variables.r_cryostat_inboard == pytest.approx( externalcryogeometryparam.expected_r_cryostat_inboard ) - assert fwbs_variables.dz_cryostat_half_inside == pytest.approx( - externalcryogeometryparam.expected_dz_cryostat_half_inside + assert fwbs_variables.z_cryostat_half_inside == pytest.approx( + externalcryogeometryparam.expected_z_cryostat_half_inside ) assert fwbs_variables.vol_cryostat == pytest.approx( externalcryogeometryparam.expected_vol_cryostat diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index 4ce7d5253a..407a288173 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -48,7 +48,7 @@ class CalcBuildingCostsParam(NamedTuple): r_cryostat_inboard: Any = None - dz_cryostat_half_inside: Any = None + z_cryostat_half_inside: Any = None cost_factor_buildings: Any = None @@ -90,7 +90,7 @@ class CalcBuildingCostsParam(NamedTuple): n_tf=18, estotftgj=130.10721529398921, r_cryostat_inboard=18.314040399601147, - dz_cryostat_half_inside=15.118436894660423, + z_cryostat_half_inside=15.118436894660423, cost_factor_buildings=1, light_build_cost_per_vol=270, tok_build_cost_per_vol=1283, @@ -1190,7 +1190,7 @@ class CalcBuildingCostsParam(NamedTuple): n_tf=18, estotftgj=129.99240835373195, r_cryostat_inboard=18.31462428923539, - dz_cryostat_half_inside=15.165858901796364, + z_cryostat_half_inside=15.165858901796364, cost_factor_buildings=1, light_build_cost_per_vol=270, tok_build_cost_per_vol=1283, @@ -2318,8 +2318,8 @@ def test_calc_building_costs(calcbuildingcostsparam, monkeypatch, costs2015): monkeypatch.setattr( fwbs_variables, - "dz_cryostat_half_inside", - calcbuildingcostsparam.dz_cryostat_half_inside, + "z_cryostat_half_inside", + calcbuildingcostsparam.z_cryostat_half_inside, ) monkeypatch.setattr( @@ -13741,7 +13741,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): r_cryostat_inboard: Any = None - dz_cryostat_half_inside: Any = None + z_cryostat_half_inside: Any = None cost_factor_misc: Any = None @@ -13783,7 +13783,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): helpow=142703.41458500578, vvmass=8957118.946216708, r_cryostat_inboard=18.314040399601147, - dz_cryostat_half_inside=15.118436894660423, + z_cryostat_half_inside=15.118436894660423, cost_factor_misc=1, costexp=0.80000000000000004, s_kref=np.array( @@ -14879,7 +14879,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): helpow=823308.59959198488, vvmass=8948002.9350915737, r_cryostat_inboard=18.31462428923539, - dz_cryostat_half_inside=15.165858901796364, + z_cryostat_half_inside=15.165858901796364, cost_factor_misc=1, costexp=0.80000000000000004, s_kref=np.array( @@ -16024,8 +16024,8 @@ def test_calc_remaining_subsystems( monkeypatch.setattr( fwbs_variables, - "dz_cryostat_half_inside", - calcremainingsubsystemsparam.dz_cryostat_half_inside, + "z_cryostat_half_inside", + calcremainingsubsystemsparam.z_cryostat_half_inside, ) monkeypatch.setattr( From 56a1b37ec485fc4c0c2a6d80052cdaba41bf5935 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 15 Jan 2025 15:10:46 +0000 Subject: [PATCH 08/16] :art: Refactor external_cryo_geometry method for improved clarity and documentation --- process/blanket_library.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 62229f616b..14b263a865 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -363,25 +363,31 @@ def apply_coverage_factors(self): # changes in the same location. fwbs_variables.vdewin = fwbs_variables.fvoldw * fwbs_variables.vdewin - def external_cryo_geometry(self): - """Calculate cryostat geometry - author: J. Morris, CCFE, Culham Science Centre + @staticmethod + def external_cryo_geometry() -> None: + """Calculate cryostat geometry. + + This method calculates the geometry of the cryostat, including the inboard radius, + the vertical clearance between the uppermost PF coil and the cryostat lid, the half-height + of the cryostat, the vertical clearance between the TF coil and the cryostat, the cryostat volume, + the vacuum vessel mass, and the sum of internal vacuum vessel and cryostat masses. + """ - # cryostat radius (m) - # ISSUE #508 Remove RFP option - # rb(i) = outer radius of PF coil i (tokamaks) + + # Cryostat radius [m] + # Take radius of furthest PF coil and add clearance fwbs_variables.r_cryostat_inboard = ( np.max(pfcoil_variables.rb) + fwbs_variables.dr_pf_cryostat ) - # Clearance between uppermost PF coil and cryostat lid (m). + # Clearance between uppermost PF coil and cryostat lid [m]. # Scaling from ITER by M. Kovari blanket_library.dz_pf_cryostat = ( build_variables.clhsf * (2.0 * fwbs_variables.r_cryostat_inboard) / 28.440 ) - # Half-height of cryostat (m) - # ISSUE #508 Remove RFP option + # Half-height of cryostat [m] + # Take height of furthest PF coil and add clearance fwbs_variables.z_cryostat_half_inside = ( np.max(pfcoil_variables.zh) + blanket_library.dz_pf_cryostat ) @@ -391,7 +397,7 @@ def external_cryo_geometry(self): build_variables.hmax + build_variables.tfcth ) - # cryostat volume (m3) + # Cryostat volume [m^3] fwbs_variables.vol_cryostat = ( (2.0 * np.pi * fwbs_variables.r_cryostat_inboard) * 2.0 From ba3ccaada3166a69a911f5736142ea79213d1823 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Sat, 25 Jan 2025 17:09:48 +0000 Subject: [PATCH 09/16] =?UTF-8?q?=F0=9F=94=84=20Rename=20variable=20clhsf?= =?UTF-8?q?=20to=20f=5Fz=5Fcryostat=20for=20clarity=20and=20consistency=20?= =?UTF-8?q?in=20documentation=20and=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eng-models/cryostat-and-vacuum-system.md | 4 ++-- process/blanket_library.py | 4 +++- source/fortran/build_variables.f90 | 4 ++-- source/fortran/input.f90 | 6 +++--- tests/integration/ref_dicts.json | 10 +++++----- tests/regression/input_files/st_regression.IN.DAT | 2 +- tests/unit/test_blanket_library.py | 8 +++++--- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md index c035b963be..bb6ef9712f 100644 --- a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md +++ b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md @@ -1,9 +1,9 @@ # Cryostat The _vacuum vessel_ provides a toroidal evacuated chamber containing the plasma, first wall, blanket and shield. The _cryostat_ is a cylindrical chamber enclosing the entire reactor, including the vacuum vessel and all the coils and the intercoil structure. It provides a vacuum for thermal insulation. -The top flange of the cryostat will be a large structure taking a considerable load from atmospheric pressure. PROCESS does not calculate the required thickness, but the vertical distance *h* between the uppermost PF coil and the top flange of the cryostat is set using `clhsf` (default value 4.268 m); a scaling based on ITER is used: +The top flange of the cryostat will be a large structure taking a considerable load from atmospheric pressure. PROCESS does not calculate the required thickness, but the vertical distance *h* between the uppermost PF coil and the top flange of the cryostat is set using `f_z_cryostat` (default value 4.268 m); a scaling based on ITER is used: $$ -h = \mathtt{clhsf} \left( \frac{2 \times \mathtt{r_cryostat_inboard}}{28.440}\right) +h = \mathtt{f_z_cryostat} \left( \frac{2 \times \mathtt{r_cryostat_inboard}}{28.440}\right) $$ # Cryogenics diff --git a/process/blanket_library.py b/process/blanket_library.py index 14b263a865..41947e060c 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -383,7 +383,9 @@ def external_cryo_geometry() -> None: # Clearance between uppermost PF coil and cryostat lid [m]. # Scaling from ITER by M. Kovari blanket_library.dz_pf_cryostat = ( - build_variables.clhsf * (2.0 * fwbs_variables.r_cryostat_inboard) / 28.440 + build_variables.f_z_cryostat + * (2.0 * fwbs_variables.r_cryostat_inboard) + / 28.440 ) # Half-height of cryostat [m] diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index e690dde955..0bdbfb12d3 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -60,7 +60,7 @@ module build_variables real(dp) :: bore !! central solenoid inboard radius (m) (`iteration variable 29`) - real(dp) :: clhsf + real(dp) :: f_z_cryostat !! cryostat lid height scaling factor (tokamaks) real(dp) :: dr_cryostat @@ -315,7 +315,7 @@ subroutine init_build_variables blnkoth = 0.235D0 blnktth = 0.0D0 bore = 1.42D0 - clhsf = 4.268D0 + f_z_cryostat = 4.268D0 dr_cryostat = 0.07D0 d_vv_in = 0.07D0 d_vv_out = 0.07D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 68adedadeb..f4b4e05958 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -196,7 +196,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) shldtth, shldlth, vgap_vv_thermalshield, plleni, fwoth, vvblgap, & thshield_ib, thshield_ob, thshield_vb, iprecomp, & blbpith, aplasmin, blbuoth, tfcth, & - iohcl, tftsgap, clhsf, bore, plleno, scrapli, gapomin, dr_cryostat, & + iohcl, tftsgap, f_z_cryostat, bore, plleno, scrapli, gapomin, dr_cryostat, & rinboard, blnkoth, fseppc, plsepo, blnkith, & ohcth, plsepi, blbmith, gapoh, fcspc, scraplo, vgaptop, & blbpoth, gapds, fwith, vgap_xpoint_divertor, shldith, sigallpc, tfootfi, f_avspace,& @@ -1312,8 +1312,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('bore') call parse_real_variable('bore', bore, 0.0D0, 50.0D0, & 'Machine bore (m)') - case ('clhsf') - call parse_real_variable('clhsf', clhsf, 2.0D0, 10.0D0, & + case ('f_z_cryostat') + call parse_real_variable('f_z_cryostat', f_z_cryostat, 2.0D0, 10.0D0, & 'Cryostat lid height scaling factor (m)') case ('dr_cryostat') call parse_real_variable('dr_cryostat', dr_cryostat, 0.0D0, 10.0D0, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f042aca2ba..ab8a3fe95a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1459,7 +1459,7 @@ "clgsmass": 0.0, "clh1": 2.5, "clh2": 15.0, - "clhsf": 4.268, + "f_z_cryostat": 4.268, "cm": null, "beam_current": 0.0, "cnorm": null, @@ -9125,7 +9125,7 @@ "clgsmass": "gravity support structure for TF coil, PF coil and intercoil support systems (kg)", "clh1": "vertical clearance from TF coil to cryostat (m) (calculated for tokamaks)", "clh2": "clearance beneath TF coil to foundation (including basement) (m)", - "clhsf": "cryostat lid height scaling factor (tokamaks)", + "f_z_cryostat": "cryostat lid height scaling factor (tokamaks)", "cm": "", "beam_current": "neutral beam current (A)", "cnorm": "", @@ -11919,7 +11919,7 @@ "lb": 0.0, "ub": 30.0 }, - "clhsf": { + "f_z_cryostat": { "lb": 2.0, "ub": 10.0 }, @@ -17021,7 +17021,7 @@ "blnkoth", "blnktth", "bore", - "clhsf", + "f_z_cryostat", "dr_cryostat", "d_vv_in", "d_vv_out", @@ -20100,7 +20100,7 @@ "cland": "real_variable", "clh1": "real_variable", "clh2": "real_variable", - "clhsf": "real_variable", + "f_z_cryostat": "real_variable", "coheof": "real_variable", "conf_mag": "real_variable", "control_buildings_h": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 3dfc3362e9..9868d7563e 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2219,7 +2219,7 @@ i_r_cp_top = 2 * Cryostat * *----------* -*clhsf = +*f_z_cryostat = * DESCRIPTION: Cryostat lid height scaling factor (m) * JUSTIFICATION: Not scaling cryostat height. diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index e064d07f0f..655e27135e 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1171,7 +1171,7 @@ def test_apply_coverage_factors( class ExternalCryoGeometryParam(NamedTuple): - clhsf: Any = None + f_z_cryostat: Any = None hmax: Any = None tfcth: Any = None dr_cryostat: Any = None @@ -1200,7 +1200,7 @@ class ExternalCryoGeometryParam(NamedTuple): "externalcryogeometryparam", ( ExternalCryoGeometryParam( - clhsf=4.2679999999999998, + f_z_cryostat=4.2679999999999998, hmax=8.8182171641274945, tfcth=0.92672586247397692, dr_cryostat=0.15000000000000002, @@ -1298,7 +1298,9 @@ def test_external_cryo_geometry( :param monkeypatch: pytest fixture used to mock module/class variables :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(build_variables, "clhsf", externalcryogeometryparam.clhsf) + monkeypatch.setattr( + build_variables, "f_z_cryostat", externalcryogeometryparam.f_z_cryostat + ) monkeypatch.setattr(build_variables, "hmax", externalcryogeometryparam.hmax) monkeypatch.setattr(build_variables, "tfcth", externalcryogeometryparam.tfcth) monkeypatch.setattr( From 555a21d04bb6cfebd3e0f00b357589157ba55e03 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Sat, 25 Jan 2025 17:30:53 +0000 Subject: [PATCH 10/16] =?UTF-8?q?=F0=9F=94=84=20Rename=20variable=20clh1?= =?UTF-8?q?=20to=20dz=5Ftf=5Fcryostat=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20in=20documentation=20and=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eng-models/cryostat-and-vacuum-system.md | 43 +++++++++++++++++-- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 ++++---- process/blanket_library.py | 2 +- process/build.py | 36 ++++++++-------- process/buildings.py | 4 +- process/hcpb.py | 4 +- source/fortran/buildings_variables.f90 | 4 +- source/fortran/input.f90 | 6 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++++------- tests/integration/data/scan_MFILE.DAT | 18 ++++---- tests/integration/ref_dicts.json | 10 ++--- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- tests/unit/test_blanket_library.py | 16 ++++--- tests/unit/test_buildings.py | 10 +++-- 24 files changed, 134 insertions(+), 93 deletions(-) diff --git a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md index bb6ef9712f..79df0c183a 100644 --- a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md +++ b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md @@ -1,10 +1,47 @@ # Cryostat -The _vacuum vessel_ provides a toroidal evacuated chamber containing the plasma, first wall, blanket and shield. The _cryostat_ is a cylindrical chamber enclosing the entire reactor, including the vacuum vessel and all the coils and the intercoil structure. It provides a vacuum for thermal insulation. -The top flange of the cryostat will be a large structure taking a considerable load from atmospheric pressure. PROCESS does not calculate the required thickness, but the vertical distance *h* between the uppermost PF coil and the top flange of the cryostat is set using `f_z_cryostat` (default value 4.268 m); a scaling based on ITER is used: +The _vacuum vessel_ provides a toroidal evacuated chamber containing the plasma, first wall, blanket and shield. The _cryostat_ is a cylindrical chamber enclosing the entire reactor, including the vacuum vessel and all the coils and the intercoil structure. It provides a vacuum for thermal insulation. + +------------- + +## Cryostat geometry | `external_cryo_geometry()` + +### Calculate inboard radius + +The radius of the inboard side of the cryostat is found by taking the radius of the furthest out PF coil and adding a clearance gap: + +$$ +\mathtt{r\_cryostat\_inboard}, r_{\text{cryostat}} = \text{max}(r_{\text{PF}}) + \mathtt{dr\_pf\_cryostat} +$$ + +where $\mathtt{dr\_pf\_cryostat}$ is the radial PF coil to cryostat gap specified by the user at input. + +---------------- + +### Vertical clearance + +The top flange of the cryostat will be a large structure taking a considerable load from atmospheric pressure. The vertical distance $\mathrm{d}z_{\text{PF,cryostat}}$ between the uppermost PF coil and the top inside flange of the cryostat is set using a scaling based on ITER is used: + +$$ +\mathtt{dz\_pf\_cryostat}, \mathrm{d}z_{\text{PF,cryostat}} = \texttt{f_z_cryostat} \left( \frac{2 \times \texttt{r_cryostat_inboard}}{28.440}\right) $$ -h = \mathtt{f_z_cryostat} \left( \frac{2 \times \mathtt{r_cryostat_inboard}}{28.440}\right) + +------------------- + +### Half-height + +The internal half height of the cryostat is then calculated by taking the maximum vertical height of the PF coils and adding the calculated clearance, $\mathtt{dz\_pf\_cryostat}$. + $$ +\mathrm{z\_cryostat\_half\_inside} = \text{max}(z_{\text{PF}}) + \mathtt{dz\_pf\_cryostat} +$$ + +------------------- + +### Vertical clearance of TF coil + + +---------------------- # Cryogenics The model for the cryogenic cooling power, and the electric power to provide this, is based on D.S. Slack, J.A. Kern, J.R., Miller, Cryogenic system design for a compact tokamak reactor, UCRL-98733, DE89 003176 (1989). See related issues for comments. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 365a626b7c..437c61bdae 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -994,7 +994,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7769E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5292E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6091E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6091E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 8e320ad4d4..f5e79b7979 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -989,7 +989,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index d99b484702..6e6a49f838 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -989,7 +989,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index b6371bc14c..ab81affe3b 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -989,7 +989,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index b8242541ff..7bc67064f0 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -989,7 +989,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 0288307510..5abda44580 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -818,7 +818,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -1813,7 +1813,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -2808,7 +2808,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -3803,7 +3803,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -4798,7 +4798,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -5793,7 +5793,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -6788,7 +6788,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -7783,7 +7783,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -8778,7 +8778,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/process/blanket_library.py b/process/blanket_library.py index 41947e060c..35c0b05b6c 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -395,7 +395,7 @@ def external_cryo_geometry() -> None: ) # Vertical clearance between TF coil and cryostat (m) - buildings_variables.clh1 = fwbs_variables.z_cryostat_half_inside - ( + buildings_variables.dz_tf_cryostat = fwbs_variables.z_cryostat_half_inside - ( build_variables.hmax + build_variables.tfcth ) diff --git a/process/build.py b/process/build.py index e9987bde5c..4e9927be69 100644 --- a/process/build.py +++ b/process/build.py @@ -131,7 +131,7 @@ def calculate_vertical_build(self, output: bool) -> None: # Start at the top and work down. vbuild = ( - buildings_variables.clh1 + buildings_variables.dz_tf_cryostat + build_variables.tfcth + build_variables.tftsgap + build_variables.thshield_vb @@ -149,17 +149,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Cryostat roof structure*", - buildings_variables.clh1, + buildings_variables.dz_tf_cryostat, vbuild, - "(clh1)", + "(dz_tf_cryostat)", ) po.ovarre( self.mfile, "Cryostat roof structure*", - "(clh1)", - buildings_variables.clh1, + "(dz_tf_cryostat)", + buildings_variables.dz_tf_cryostat, ) - vbuild = vbuild - buildings_variables.clh1 + vbuild = vbuild - buildings_variables.dz_tf_cryostat # Top of TF coil tf_top = vbuild @@ -384,13 +384,13 @@ def calculate_vertical_build(self, output: bool) -> None: # Inner vertical dimension of TF coil build_variables.dh_tf_inner_bore = tf_height - 2 * build_variables.tfcth - vbuild = vbuild - buildings_variables.clh1 + vbuild = vbuild - buildings_variables.dz_tf_cryostat po.obuild( self.outfile, "Cryostat floor structure**", - buildings_variables.clh1, + buildings_variables.dz_tf_cryostat, vbuild, - "(clh1)", + "(dz_tf_cryostat)", ) # To calculate vertical offset between TF coil centre and plasma centre @@ -402,7 +402,7 @@ def calculate_vertical_build(self, output: bool) -> None: # write(self.outfile, 20) vbuild = ( - buildings_variables.clh1 + buildings_variables.dz_tf_cryostat + build_variables.tfcth + build_variables.tftsgap + build_variables.thshield_vb @@ -422,17 +422,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Cryostat roof structure*", - buildings_variables.clh1, + buildings_variables.dz_tf_cryostat, vbuild, - "(clh1)", + "(dz_tf_cryostat)", ) po.ovarre( self.mfile, "Cryostat roof structure*", - "(clh1)", - buildings_variables.clh1, + "(dz_tf_cryostat)", + buildings_variables.dz_tf_cryostat, ) - vbuild = vbuild - buildings_variables.clh1 + vbuild = vbuild - buildings_variables.dz_tf_cryostat # Top of TF coil tf_top = vbuild @@ -675,14 +675,14 @@ def calculate_vertical_build(self, output: bool) -> None: # Inner vertical dimension of TF coil build_variables.dh_tf_inner_bore = tf_height - 2 * build_variables.tfcth - vbuild = vbuild - buildings_variables.clh1 + vbuild = vbuild - buildings_variables.dz_tf_cryostat po.obuild( self.outfile, "Cryostat floor structure**", - buildings_variables.clh1, + buildings_variables.dz_tf_cryostat, vbuild, - "(clh1)", + "(dz_tf_cryostat)", ) # To calculate vertical offset between TF coil centre and plasma centre diff --git a/process/buildings.py b/process/buildings.py index 843de654ae..0dca4ba3d4 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -201,14 +201,14 @@ def bldgs( crcl = 9.41e-6 * wt + 5.1e0 # Building height (m) - # clh1 : clearance from TF coil to cryostat top, m + # dz_tf_cryostat : clearance from TF coil to cryostat top, m # clh2 : clearance beneath TF coil to foundation, including basement, m # stcl : clearance above crane to roof, m # Additional tfh allows TF coil to be lifted right out hrbi = ( buildings_variables.clh2 + 2.0e0 * tfh - + buildings_variables.clh1 + + buildings_variables.dz_tf_cryostat + buildings_variables.trcl + crcl + buildings_variables.stcl diff --git a/process/hcpb.py b/process/hcpb.py index d091385d62..1677fc107a 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -1557,8 +1557,8 @@ def write_output(self): po.ovarre( self.outfile, "Vertical clearance from TF coil to cryostat (m)", - "(clh1)", - buildings_variables.clh1, + "(dz_tf_cryostat)", + buildings_variables.dz_tf_cryostat, "OP ", ) po.ovarre( diff --git a/source/fortran/buildings_variables.f90 b/source/fortran/buildings_variables.f90 index 2e56a85d49..4ce2c827a2 100644 --- a/source/fortran/buildings_variables.f90 +++ b/source/fortran/buildings_variables.f90 @@ -34,7 +34,7 @@ module buildings_variables real(dp) :: chemlab_l, chemlab_w, chemlab_h !! Chemistry labs and treatment buldings length, width, height (m) - real(dp) :: clh1 + real(dp) :: dz_tf_cryostat !! vertical clearance from TF coil to cryostat (m) (calculated for tokamaks) real(dp) :: clh2 @@ -328,7 +328,7 @@ subroutine init_buildings_variables chemlab_l = 50.0D0 chemlab_w = 30.0D0 chemlab_h = 6.0D0 - clh1 = 2.5D0 + dz_tf_cryostat = 2.5D0 clh2 = 15.0D0 control_buildings_l = 80.0D0 control_buildings_w = 60.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index f4b4e05958..e53a4cee14 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -202,7 +202,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) blbpoth, gapds, fwith, vgap_xpoint_divertor, shldith, sigallpc, tfootfi, f_avspace,& r_cp_top, d_vv_in, d_vv_out, d_vv_top, d_vv_bot, f_r_cp, i_r_cp_top use buildings_variables, only: hcwt, conv, wgt, trcl, rbwt, & - esbldgm3, fndt, row, wgt2, pibv, clh1, stcl, clh2, & + esbldgm3, fndt, row, wgt2, pibv, dz_tf_cryostat, stcl, clh2, & tfcbv, hccl, rbrt, triv, shov, admv, i_bldgs_v, i_bldgs_size, & mbvfac, pfbldgm3, wsvfac, rbvfac, rxcl, shmf, & aux_build_l, aux_build_w, aux_build_h, auxcool_l, auxcool_w, auxcool_h, & @@ -2766,8 +2766,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('admv') call parse_real_variable('admv', admv, 1.0D4, 1.0D6, & 'Administration building volume (m3)') - case ('clh1') - call parse_real_variable('clh1', clh1, 0.0D0, 20.0D0, & + case ('dz_tf_cryostat') + call parse_real_variable('dz_tf_cryostat', dz_tf_cryostat, 0.0D0, 20.0D0, & 'Clearance TF coil to cryostat top (m)') case ('clh2') call parse_real_variable('clh2', clh2, 0.0D0, 30.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 5efb75ba76..93f02ef64b 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -988,7 +988,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 41ad0e7c26..31418922b3 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -989,7 +989,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index f5e3f3ad44..49280fde57 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -989,7 +989,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index f91ef4346f..310b446e58 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -989,7 +989,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5339E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6044E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6044E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 3cf3abfbc6..96442a6102 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -587,7 +587,7 @@ TF_coil_outboard_leg_radial_thickness_(m)_______________________________ (tfthko)______________________ 9.2950E-01 # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 - Cryostat_roof_structure*________________________________________________ (clh1)________________________ 5.6032E+00 + Cryostat_roof_structure*________________________________________________ (dz_tf_cryostat)________________________ 5.6032E+00 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 @@ -992,7 +992,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7805E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5351E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6032E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6032E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 5262bb0ab3..4fb14a0bff 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -990,7 +990,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7774E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5301E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6076E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6076E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -2153,7 +2153,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7765E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5286E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6094E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6094E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -3316,7 +3316,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7758E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5274E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6107E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6107E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -4479,7 +4479,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7759E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5275E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6109E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6109E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -5642,7 +5642,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7766E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5286E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6097E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6097E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -6805,7 +6805,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7775E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5302E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6082E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6082E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -7968,7 +7968,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7776E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5304E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6084E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6084E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -9131,7 +9131,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7768E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5290E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6096E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6096E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -10294,7 +10294,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7760E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5277E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6103E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6103E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -11457,7 +11457,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7761E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5278E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6108E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6108E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -12620,7 +12620,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7769E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5292E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6104E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6104E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -13783,7 +13783,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7777E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5305E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6096E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6096E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -14946,7 +14946,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7778E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5307E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6101E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6101E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -16109,7 +16109,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7770E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5293E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6115E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6115E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # @@ -17272,7 +17272,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7762E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5280E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6129E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6129E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 6d8f601fe8..6d08e423bc 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -818,7 +818,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -1813,7 +1813,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -2808,7 +2808,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -3803,7 +3803,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -4798,7 +4798,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -5793,7 +5793,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -6788,7 +6788,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -7783,7 +7783,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # @@ -8778,7 +8778,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.6623E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.9786E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.9786E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.8951E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 4.6430E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index ab8a3fe95a..282eb2ea4a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1457,7 +1457,7 @@ "circumference_target": 0.0, "cland": 19.2, "clgsmass": 0.0, - "clh1": 2.5, + "dz_tf_cryostat": 2.5, "clh2": 15.0, "f_z_cryostat": 4.268, "cm": null, @@ -9123,7 +9123,7 @@ "circumference_target": "", "cland": "cost of land (M$)", "clgsmass": "gravity support structure for TF coil, PF coil and intercoil support systems (kg)", - "clh1": "vertical clearance from TF coil to cryostat (m) (calculated for tokamaks)", + "dz_tf_cryostat": "vertical clearance from TF coil to cryostat (m) (calculated for tokamaks)", "clh2": "clearance beneath TF coil to foundation (including basement) (m)", "f_z_cryostat": "cryostat lid height scaling factor (tokamaks)", "cm": "", @@ -11911,7 +11911,7 @@ "lb": 10.0, "ub": 100.0 }, - "clh1": { + "dz_tf_cryostat": { "lb": 0.0, "ub": 20.0 }, @@ -17103,7 +17103,7 @@ "chemlab_l", "chemlab_w", "chemlab_h", - "clh1", + "dz_tf_cryostat", "clh2", "control_buildings_l", "control_buildings_w", @@ -20098,7 +20098,7 @@ "chmatf": "real_array", "chrad": "real_variable", "cland": "real_variable", - "clh1": "real_variable", + "dz_tf_cryostat": "real_variable", "clh2": "real_variable", "f_z_cryostat": "real_variable", "coheof": "real_variable", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 03f19cab7e..60266fcceb 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -587,7 +587,7 @@ TF_coil_outboard_leg_radial_thickness_(m)_______________________________ (tfthko)______________________ 9.2950E-01 # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 - Cryostat_roof_structure*________________________________________________ (clh1)________________________ 5.6032E+00 + Cryostat_roof_structure*________________________________________________ (dz_tf_cryostat)________________________ 5.6032E+00 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 @@ -992,7 +992,7 @@ First_wall_area_(m2)____________________________________________________ (fwarea)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7805E+01 OP Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________ 1.5351E+01 OP - Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (clh1)________________________ 5.6032E+00 OP + Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________ 5.6032E+00 OP Divertor_area_(m2)______________________________________________________ (divsur)______________________ 1.4879E+02 OP Divertor_mass_(kg)______________________________________________________ (divmas)______________________ 3.6453E+04 OP # Superconducting TF Coil Power Conversion # diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 655e27135e..acf8b8aeb7 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1185,14 +1185,14 @@ class ExternalCryoGeometryParam(NamedTuple): dewmkg: Any = None rb: Any = None zh: Any = None - clh1: Any = None + dz_tf_cryostat: Any = None dz_pf_cryostat: Any = None expected_r_cryostat_inboard: Any = None expected_z_cryostat_half_inside: Any = None expected_vol_cryostat: Any = None expected_vvmass: Any = None expected_dewmkg: Any = None - expected_clh1: Any = None + expected_dz_tf_cryostat: Any = None expected_dz_pf_cryostat: Any = None @@ -1272,14 +1272,14 @@ class ExternalCryoGeometryParam(NamedTuple): ), order="F", ).transpose(), - clh1=2.5, + dz_tf_cryostat=2.5, dz_pf_cryostat=0, expected_r_cryostat_inboard=17.805470903073743, expected_z_cryostat_half_inside=15.259637557000296, expected_vol_cryostat=810.95017445543203, expected_vvmass=7927043.4756686538, expected_dewmkg=14252454.836421024, - expected_clh1=5.514694530398824, + expected_dz_tf_cryostat=5.514694530398824, expected_dz_pf_cryostat=5.3441455565624985, ), ), @@ -1328,7 +1328,9 @@ def test_external_cryo_geometry( monkeypatch.setattr(fwbs_variables, "dewmkg", externalcryogeometryparam.dewmkg) monkeypatch.setattr(pfcoil_variables, "rb", externalcryogeometryparam.rb) monkeypatch.setattr(pfcoil_variables, "zh", externalcryogeometryparam.zh) - monkeypatch.setattr(buildings_variables, "clh1", externalcryogeometryparam.clh1) + monkeypatch.setattr( + buildings_variables, "dz_tf_cryostat", externalcryogeometryparam.dz_tf_cryostat + ) monkeypatch.setattr( blanket_library, "dz_pf_cryostat", externalcryogeometryparam.dz_pf_cryostat ) @@ -1350,8 +1352,8 @@ def test_external_cryo_geometry( assert fwbs_variables.dewmkg == pytest.approx( externalcryogeometryparam.expected_dewmkg ) - assert buildings_variables.clh1 == pytest.approx( - externalcryogeometryparam.expected_clh1 + assert buildings_variables.dz_tf_cryostat == pytest.approx( + externalcryogeometryparam.expected_dz_tf_cryostat ) assert blanket_library.dz_pf_cryostat == pytest.approx( externalcryogeometryparam.expected_dz_pf_cryostat diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py index feead3c196..69240ec452 100644 --- a/tests/unit/test_buildings.py +++ b/tests/unit/test_buildings.py @@ -726,7 +726,7 @@ class BldgsParam(NamedTuple): wgt: Any shmf: Any clh2: Any - clh1: Any + dz_tf_cryostat: Any stcl: Any rbvfac: Any rbwt: Any @@ -790,7 +790,7 @@ class BldgsParam(NamedTuple): wgt=500000, shmf=0.5, clh2=15, - clh1=5.7514039424138126, + dz_tf_cryostat=5.7514039424138126, stcl=3, rbvfac=1.6000000000000001, rbwt=2, @@ -850,7 +850,7 @@ class BldgsParam(NamedTuple): wgt=500000, shmf=0.5, clh2=15, - clh1=5.8405005070918357, + dz_tf_cryostat=5.8405005070918357, stcl=3, rbvfac=1.6000000000000001, rbwt=2, @@ -912,7 +912,9 @@ def test_bldgs(buildings, bldgsparam, monkeypatch): monkeypatch.setattr(buildings_variables, "wgt", bldgsparam.wgt) monkeypatch.setattr(buildings_variables, "shmf", bldgsparam.shmf) monkeypatch.setattr(buildings_variables, "clh2", bldgsparam.clh2) - monkeypatch.setattr(buildings_variables, "clh1", bldgsparam.clh1) + monkeypatch.setattr( + buildings_variables, "dz_tf_cryostat", bldgsparam.dz_tf_cryostat + ) monkeypatch.setattr(buildings_variables, "stcl", bldgsparam.stcl) monkeypatch.setattr(buildings_variables, "rbvfac", bldgsparam.rbvfac) monkeypatch.setattr(buildings_variables, "rbwt", bldgsparam.rbwt) From e23ece0906355469ba5c28e4e6e22578b1875b08 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Sat, 25 Jan 2025 17:46:10 +0000 Subject: [PATCH 11/16] :art: Update cryostat documentation to include vertical clearance calculation and cryostat volume section for improved clarity --- .../eng-models/cryostat-and-vacuum-system.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md index 79df0c183a..e8d4c59881 100644 --- a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md +++ b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md @@ -33,16 +33,31 @@ $$ The internal half height of the cryostat is then calculated by taking the maximum vertical height of the PF coils and adding the calculated clearance, $\mathtt{dz\_pf\_cryostat}$. $$ -\mathrm{z\_cryostat\_half\_inside} = \text{max}(z_{\text{PF}}) + \mathtt{dz\_pf\_cryostat} +\mathtt{z\_cryostat\_half\_inside} = \text{max}(z_{\text{PF}}) + \mathtt{dz\_pf\_cryostat} $$ ------------------- ### Vertical clearance of TF coil +The vertical clearance between the top of the TF coil and the inside of the cryostat is then calculated: + +$$ +\mathtt{dz\_tf\_cryostat} = \mathtt{z\_cryostat\_half\_inside} - (z_{\text{TF}} + \mathrm{d}z_{\text{TF}}) +$$ + +where $z_{\text{TF}}$ is the height of the inside of the TF leg and $\mathrm{d}z_{\text{TF}}$ is its thickness. ---------------------- + +### Calculate cryostat volume + + + + +------------------- + # Cryogenics The model for the cryogenic cooling power, and the electric power to provide this, is based on D.S. Slack, J.A. Kern, J.R., Miller, Cryogenic system design for a compact tokamak reactor, UCRL-98733, DE89 003176 (1989). See related issues for comments. From 782bf6e2a3be01be56dc3d321449b332f98fae7f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 27 Jan 2025 14:41:47 +0000 Subject: [PATCH 12/16] :art: Enhance cryostat documentation and comments for volume calculation clarity --- .../eng-models/cryostat-and-vacuum-system.md | 7 +++++++ process/blanket_library.py | 18 +++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md index e8d4c59881..82cc41c636 100644 --- a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md +++ b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md @@ -53,8 +53,15 @@ where $z_{\text{TF}}$ is the height of the inside of the TF leg and $\mathrm{d}z ### Calculate cryostat volume +We calculate the cryostat volume by taking the outer dimensions of the cryostat structure and then remove that of the inside structure. This is just subtracting the volumes of two cylinders. +$$ +\mathtt{vol\_cryostat}, V_{\text{cryostat}} = \\ +\underbrace{\left[\pi \left(r_{\text{cryostat}}+dr_{\text{cryostat}}\right)^2 \times 2\left(\mathtt{z\_cryostat\_half\_inside}+ dr_{\text{cryostat}}\right)\right]}_{\text{Outer shell}} \\ +- \underbrace{\left[\pi r_{\text{cryostat}}+^2 \times 2\left(\mathtt{z\_cryostat\_half\_inside}\right) \right]}_{\text{Inner shell}} +$$ +where $dr_{\text{cryostat}}$ is the uniform thickness of the cryostat that is set at input by the user with `dr_cryostat =` ------------------- diff --git a/process/blanket_library.py b/process/blanket_library.py index 35c0b05b6c..77531fd1bd 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -399,13 +399,21 @@ def external_cryo_geometry() -> None: build_variables.hmax + build_variables.tfcth ) - # Cryostat volume [m^3] + # Cryostat structure volume [m^3] + # Calculate by taking the volume of the outer cryostat and subtracting the volume of the inner cryostat fwbs_variables.vol_cryostat = ( - (2.0 * np.pi * fwbs_variables.r_cryostat_inboard) - * 2.0 + ( + np.pi + * (fwbs_variables.r_cryostat_inboard + build_variables.dr_cryostat) ** 2 + ) + * 2 + * (build_variables.dr_cryostat + fwbs_variables.z_cryostat_half_inside) + ) - ( + np.pi + * (fwbs_variables.r_cryostat_inboard) ** 2 + * 2 * fwbs_variables.z_cryostat_half_inside - + (2.0 * np.pi * fwbs_variables.r_cryostat_inboard**2) - ) * build_variables.dr_cryostat + ) # Vacuum vessel mass (kg) fwbs_variables.vvmass = fwbs_variables.vdewin * fwbs_variables.denstl From 3122776fb470121efbaaa721d55aee6039016d84 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 27 Jan 2025 14:46:36 +0000 Subject: [PATCH 13/16] =?UTF-8?q?=F0=9F=A7=AA=20Update=20expected=20values?= =?UTF-8?q?=20in=20ExternalCryoGeometryParam=20test=20for=20accuracy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/unit/test_blanket_library.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index acf8b8aeb7..ee962b893d 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1276,9 +1276,9 @@ class ExternalCryoGeometryParam(NamedTuple): dz_pf_cryostat=0, expected_r_cryostat_inboard=17.805470903073743, expected_z_cryostat_half_inside=15.259637557000296, - expected_vol_cryostat=810.95017445543203, + expected_vol_cryostat=818.1630389343372, expected_vvmass=7927043.4756686538, - expected_dewmkg=14252454.836421024, + expected_dewmkg=14308715.179356484, expected_dz_tf_cryostat=5.514694530398824, expected_dz_pf_cryostat=5.3441455565624985, ), From 9caa9d97a283f36cebe1443494645f390d5cd8bd Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 27 Jan 2025 15:05:31 +0000 Subject: [PATCH 14/16] :sparkle: Add `vol_cryostat_internal` to represent the void space inside the cryostat. --- process/blanket_library.py | 15 +++++++++------ process/stellarator.py | 8 +++++++- source/fortran/fwbs_variables.f90 | 6 +++++- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 77531fd1bd..0e628a36f6 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -399,6 +399,14 @@ def external_cryo_geometry() -> None: build_variables.hmax + build_variables.tfcth ) + # Internal cryostat space volume [m^3] + fwbs_variables.vol_cryostat_internal = ( + np.pi + * (fwbs_variables.r_cryostat_inboard) ** 2 + * 2 + * fwbs_variables.z_cryostat_half_inside + ) + # Cryostat structure volume [m^3] # Calculate by taking the volume of the outer cryostat and subtracting the volume of the inner cryostat fwbs_variables.vol_cryostat = ( @@ -408,12 +416,7 @@ def external_cryo_geometry() -> None: ) * 2 * (build_variables.dr_cryostat + fwbs_variables.z_cryostat_half_inside) - ) - ( - np.pi - * (fwbs_variables.r_cryostat_inboard) ** 2 - * 2 - * fwbs_variables.z_cryostat_half_inside - ) + ) - (fwbs_variables.vol_cryostat_internal) # Vacuum vessel mass (kg) fwbs_variables.vvmass = fwbs_variables.vdewin * fwbs_variables.denstl diff --git a/process/stellarator.py b/process/stellarator.py index 8a9c8aaeee..d19abc1406 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2251,10 +2251,16 @@ def stfwbs(self, output: bool): ) po.ovarre( self.outfile, - "External cryostat shell volume (m3)", + "External cryostat shell volume (m^3)", "(vol_cryostat)", fwbs_variables.vol_cryostat, ) + po.ovarre( + self.outfile, + "Internal volume of the cryostat structure (m^3)", + "(vol_cryostat_internal)", + fwbs_variables.vol_cryostat_internal, + ) po.ovarre( self.outfile, "External cryostat mass (kg)", diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index a920190722..98a2cf67ec 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -429,7 +429,10 @@ module fwbs_variables !! modular coil) and cryostat [m] real(dp) :: vol_cryostat - !! cryostat volume [m^3] + !! Cryostat structure volume [m^3] + + real(dp) :: vol_cryostat_internal + !! Internal volume of the cryostat [m^3] real(dp) :: vdewin !! vacuum vessel volume [m^3] @@ -776,6 +779,7 @@ subroutine init_fwbs_variables z_cryostat_half_inside = 0.0D0 dr_pf_cryostat = 0.5D0 vol_cryostat = 0.0D0 + vol_cryostat_internal = 0.0D0 vdewin = 0.0D0 vfshld = 0.25D0 volblkt = 0.0D0 From f52cac429f96cc80520a96c9b4c0bb47a2be9888 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 28 Jan 2025 13:58:15 +0000 Subject: [PATCH 15/16] :art: Add cryostat_output method to output cryostat geometry details to the output file --- process/build.py | 56 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/process/build.py b/process/build.py index 4e9927be69..255f6edcd4 100644 --- a/process/build.py +++ b/process/build.py @@ -3,6 +3,7 @@ import numpy as np from process.fortran import ( + blanket_library, build_variables, buildings_variables, constants, @@ -703,6 +704,10 @@ def calculate_vertical_build(self, output: bool) -> None: # Other build quantities + # Output the cryostat geometry + _ = self.cryostat_output() + + # Output the cdivertor geometry divht = self.divgeom(output) # Issue #481 Remove build_variables.vgaptf if build_variables.vgap_xpoint_divertor < 0.00001e0: @@ -745,6 +750,50 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.hpfu - (build_variables.hmax + build_variables.tfcth) ) / 2.0e0 + def cryostat_output(self) -> None: + """ + Outputs the cryostat geometry details to the output file. + + Returns: + None + """ + po.oheadr(self.outfile, "Cryostat build") + po.ovarrf( + self.outfile, + "Cryostat thickness (m)", + "(dr_cryostat)", + build_variables.dr_cryostat, + "OP ", + ) + po.ovarrf( + self.outfile, + "Cryostat intenral half height (m)", + "(z_cryostat_half_inside)", + fwbs_variables.z_cryostat_half_inside, + "OP ", + ) + po.ovarrf( + self.outfile, + "Vertical clearance from highest PF coil to cryostat (m)", + "(dz_pf_cryostat)", + blanket_library.dz_pf_cryostat, + "OP ", + ) + po.ovarrf( + self.outfile, + "Cryostat structure volume (m^3)", + "(vol_cryostat)", + fwbs_variables.vol_cryostat, + "OP ", + ) + po.ovarrf( + self.outfile, + "Cryostat internal volume (m^3)", + "(vol_cryostat_internal)", + fwbs_variables.vol_cryostat_internal, + "OP ", + ) + def divgeom(self, output: bool): """ Divertor geometry calculation @@ -2354,13 +2403,6 @@ def calculate_radial_build(self, output: bool) -> None: radius, ) - po.ovarre( - self.mfile, - "External cryostat thickness (excludes structure) (m)", - "(dr_cryostat)", - build_variables.dr_cryostat, - ) - if (current_drive_variables.iefrf in [5, 8]) or ( current_drive_variables.iefrffix in [5, 8] ): From 17d23bfb085f12bd9f11d3f5c6c4821d27593c21 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 28 Jan 2025 14:03:37 +0000 Subject: [PATCH 16/16] :fire: Remove redundant output variables from CCFE_HCPB class for cleaner code --- process/hcpb.py | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/process/hcpb.py b/process/hcpb.py index 1677fc107a..5df40f251e 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -3,7 +3,6 @@ from process.coolprop_interface import FluidProperties from process.fortran import ( build_variables, - buildings_variables, ccfe_hcpb_module, constants, constraint_variables, @@ -1531,47 +1530,3 @@ def write_output(self): "(etaiso)", fwbs_variables.etaiso, ) - - po.osubhd(self.outfile, "Other volumes, masses and areas :") - po.ovarre( - self.outfile, - "First wall area (m2)", - "(fwarea)", - build_variables.fwarea, - "OP ", - ) - po.ovarre( - self.outfile, - "Cryostat internal radius (m)", - "(r_cryostat_inboard)", - fwbs_variables.r_cryostat_inboard, - "OP ", - ) - po.ovarre( - self.outfile, - "Cryostat internal half-height (m)", - "(z_cryostat_half_inside)", - fwbs_variables.z_cryostat_half_inside, - "OP ", - ) - po.ovarre( - self.outfile, - "Vertical clearance from TF coil to cryostat (m)", - "(dz_tf_cryostat)", - buildings_variables.dz_tf_cryostat, - "OP ", - ) - po.ovarre( - self.outfile, - "Divertor area (m2)", - "(divsur)", - divertor_variables.divsur, - "OP ", - ) - po.ovarre( - self.outfile, - "Divertor mass (kg)", - "(divmas)", - divertor_variables.divmas, - "OP ", - )