From be463ec4c5dc18ee6d626cae8ceda87912474138 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 3 Feb 2025 11:06:02 +0000 Subject: [PATCH 01/17] :sparkle: Add new z_plasma_xpoint_upper and z_plasma_xpoint_lower variables in the vertical build --- .../proc-pages/eng-models/machine-build.md | 4 +- process/blanket_library.py | 6 +- process/build.py | 84 ++++++++++--------- process/hcpb.py | 2 +- process/io/plot_proc.py | 6 +- process/sctfcoil.py | 5 +- source/fortran/build_variables.f90 | 8 ++ tests/unit/test_blanket_library.py | 20 +++-- tests/unit/test_sctfcoil.py | 5 +- 9 files changed, 80 insertions(+), 60 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index c93a35e9fe..0b4de58eda 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -72,9 +72,9 @@ case the machine is not symmetric about the midplane. Top blanket 0.869 7.516 (blnktth) Top first wall 0.018 6.647 (fwtth) Top scrape-off 0.600 6.629 (vgaptop) - Plasma top 6.029 6.029 (rminor*kappa) + Plasma top 6.029 6.029 (z_plasma_xpoint_upper) Midplane 0.000 -0.000 - Plasma bottom 6.029 -6.029 (rminor*kappa) + Plasma bottom 6.029 -6.029 (z_plasma_xpoint_upper) Lower scrape-off 2.002 -8.031 (vgap) Divertor structure 0.621 -8.652 (divfix) Vacuum vessel (and shielding) 1.000 -9.652 (d_vv_bot+shldlth) diff --git a/process/blanket_library.py b/process/blanket_library.py index d9479e2606..bea03a88ab 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -96,7 +96,7 @@ def component_half_height(self, icomponent: int): # Blanket if icomponent == 0: hbot = ( - physics_variables.rminor * physics_variables.kappa + build_variables.z_plasma_xpoint_lower + build_variables.vgap_xpoint_divertor + divertor_variables.divfix - build_variables.blnktth @@ -104,7 +104,7 @@ def component_half_height(self, icomponent: int): # Sheild elif icomponent == 1: hbot = ( - physics_variables.rminor * physics_variables.kappa + build_variables.z_plasma_xpoint_lower + build_variables.vgap_xpoint_divertor + divertor_variables.divfix ) @@ -124,7 +124,7 @@ def component_half_height(self, icomponent: int): htop = hbot else: # Blanket - htop = physics_variables.rminor * physics_variables.kappa + 0.5 * ( + htop = build_variables.z_plasma_xpoint_upper + 0.5 * ( build_variables.dr_fw_plasma_gap_inboard + build_variables.dr_fw_plasma_gap_outboard + build_variables.dr_fw_inboard diff --git a/process/build.py b/process/build.py index ac633ae4b3..aeed38845e 100644 --- a/process/build.py +++ b/process/build.py @@ -104,18 +104,25 @@ def portsz(self): def calculate_vertical_build(self, output: bool) -> None: """ - This method determines the vertical build of the machine. - It calculates various parameters related to the build of the machine, - such as thicknesses, radii, and areas. - Results can be outputted with the `output` flag. + Determines the vertical build of the machine. - Args: - output (bool): Flag indicating whether to output results - - Returns: - None + This method calculates various parameters related to the vertical build of the machine, + such as thicknesses, radii, and areas. Results can be outputted with the `output` flag. + :param output: Flag indicating whether to output results + :type output: bool + :returns: None """ + + # Set the X-point heights for the top and bottom of the plasma + # Assumes top-down plasma symmetry + build_variables.z_plasma_xpoint_upper = ( + physics_variables.rminor * physics_variables.kappa + ) + build_variables.z_plasma_xpoint_lower = ( + physics_variables.rminor * physics_variables.kappa + ) + if output: po.oheadr(self.outfile, "Vertical Build") @@ -141,7 +148,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.shldtth + divertor_variables.divfix + build_variables.vgaptop - + physics_variables.rminor * physics_variables.kappa + + build_variables.z_plasma_xpoint_upper ) # To calculate vertical offset between TF coil centre and plasma centre @@ -267,28 +274,28 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, - "Plasma top", - physics_variables.rminor * physics_variables.kappa, + "Plasma upper X-point height (m)", + build_variables.z_plasma_xpoint_upper, vbuild, - "(rminor*kappa)", + "(z_plasma_xpoint_upper)", ) po.ovarre( self.mfile, - "Plasma half-height (m)", - "(rminor*kappa)", - physics_variables.rminor * physics_variables.kappa, + "Plasma upper X-point height (m)", + "(z_plasma_xpoint_upper)", + build_variables.z_plasma_xpoint_upper, ) - vbuild = vbuild - physics_variables.rminor * physics_variables.kappa + vbuild = vbuild - build_variables.z_plasma_xpoint_upper po.obuild(self.outfile, "Midplane", 0.0e0, vbuild) - vbuild = vbuild - physics_variables.rminor * physics_variables.kappa + vbuild = vbuild - build_variables.z_plasma_xpoint_lower po.obuild( self.outfile, - "Plasma bottom", - physics_variables.rminor * physics_variables.kappa, + "Plasma lower X-point height (m)", + build_variables.z_plasma_xpoint_lower, vbuild, - "(rminor*kappa)", + "(z_plasma_xpoint_lower)", ) vbuild = vbuild - build_variables.vgap_xpoint_divertor @@ -417,7 +424,7 @@ def calculate_vertical_build(self, output: bool) -> None: + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) + build_variables.vgaptop - + physics_variables.rminor * physics_variables.kappa + + build_variables.z_plasma_xpoint_upper ) # To calculate vertical offset between TF coil centre and plasma centre @@ -563,28 +570,28 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, - "Plasma top", - physics_variables.rminor * physics_variables.kappa, + "Plasma upper X-point height (m)", + build_variables.z_plasma_xpoint_upper, vbuild, - "(rminor*kappa)", + "(z_plasma_xpoint_upper)", ) po.ovarre( self.mfile, - "Plasma half-height (m)", - "(rminor*kappa)", - physics_variables.rminor * physics_variables.kappa, + "Plasma upper X-point height (m)", + "(z_plasma_xpoint_upper)", + build_variables.z_plasma_xpoint_upper, ) - vbuild = vbuild - physics_variables.rminor * physics_variables.kappa + vbuild = vbuild - build_variables.z_plasma_xpoint_upper po.obuild(self.outfile, "Midplane", 0.0e0, vbuild) - vbuild = vbuild - physics_variables.rminor * physics_variables.kappa + vbuild = vbuild - build_variables.z_plasma_xpoint_lower po.obuild( self.outfile, - "Plasma bottom", - physics_variables.rminor * physics_variables.kappa, + "Plasma lower X-point height (m)", + build_variables.z_plasma_xpoint_lower, vbuild, - "(rminor*kappa)", + "(z_plasma_xpoint_upper)", ) vbuild = vbuild - build_variables.vgap_xpoint_divertor @@ -725,7 +732,7 @@ def calculate_vertical_build(self, output: bool) -> None: # Height to inside edge of TF coil. TF coils are assumed to be symmetrical. # Therefore this applies to single and double null cases. build_variables.hmax = ( - physics_variables.rminor * physics_variables.kappa + build_variables.z_plasma_xpoint_upper + build_variables.vgap_xpoint_divertor + divertor_variables.divfix + build_variables.shldlth @@ -752,7 +759,7 @@ def calculate_vertical_build(self, output: bool) -> None: + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) + build_variables.vgaptop - + physics_variables.rminor * physics_variables.kappa + + build_variables.z_plasma_xpoint_upper ) build_variables.hpfdif = ( build_variables.hpfu @@ -1966,7 +1973,7 @@ def calculate_radial_build(self, output: bool) -> None: # Half-height of first wall (internal surface) hbot = ( - physics_variables.rminor * physics_variables.kappa + build_variables.z_plasma_xpoint_lower + build_variables.vgap_xpoint_divertor + divertor_variables.divfix - build_variables.blnktth @@ -1975,10 +1982,7 @@ def calculate_radial_build(self, output: bool) -> None: if physics_variables.idivrt == 2: # (i.e. physics_variables.i_single_null=0) htop = hbot else: - htop = ( - physics_variables.rminor * physics_variables.kappa - + build_variables.vgaptop - ) + htop = build_variables.z_plasma_xpoint_upper + build_variables.vgaptop hfw = 0.5e0 * (htop + hbot) diff --git a/process/hcpb.py b/process/hcpb.py index 307bac4ad6..2158620ea4 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -67,7 +67,7 @@ def run(self, output: bool): ) # Half height of the CP at the largest shield radius [m] - h_sh_max_r = physics_variables.rminor * physics_variables.kappa + h_sh_max_r = build_variables.z_plasma_xpoint_upper # Solid angle fraction of neutrons that hit the centrepost shield [-] # Calculating the CP solid angle coverage fraction diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 098ae4d6ec..c1a55d95d9 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -152,7 +152,7 @@ def parse_args(args): ] vertical_lower = [ - "rminor*kappa", + "z_plasma_xpoint_lower", "vgap_xpoint_divertor", "divfix", "shldlth", @@ -3643,7 +3643,7 @@ def main(args=None): global vertical_upper if int(m_file.data["i_single_null"].get_scan(scan)) == 0: vertical_upper = [ - "rminor*kappa", + "z_plasma_xpoint_upper", "vgaptop", "divfix", "shldtth", @@ -3655,7 +3655,7 @@ def main(args=None): ] else: vertical_upper = [ - "rminor*kappa", + "z_plasma_xpoint_upper", "vgaptop", "fwtth", "blnktth", diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 22d59c9483..56020cd99a 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1511,8 +1511,7 @@ def tf_global_geometry(self): # Vertical distance from the midplane to the top of the tapered section [m] if physics_variables.itart == 1: sctfcoil_module.h_cp_top = ( - physics_variables.rminor * physics_variables.kappa - + tfcoil_variables.dztop + build_variables.z_plasma_xpoint_upper + tfcoil_variables.dztop ) # --- @@ -2322,7 +2321,7 @@ def vv_stress_on_quench(self): rm_coil = build_variables.r_tf_inboard_out + tfcoil_variables.tfa[0] H_vv = ( - physics_variables.rminor * physics_variables.kappa + build_variables.z_plasma_xpoint_upper + build_variables.vgap_xpoint_divertor + divertor_variables.divfix + build_variables.shldtth diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index 26789fa2e2..6d2f51cc19 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -294,6 +294,12 @@ module build_variables real(dp) :: rspo !! outboard strike point radius (m) + real(dp) :: z_plasma_xpoint_upper + !! Vertical height of the upper plasma x-point (m) + + real(dp) :: z_plasma_xpoint_lower + !! Vertical height of the lower plasma x-point (m) + contains subroutine init_build_variables @@ -386,5 +392,7 @@ subroutine init_build_variables plsepo = 1.5D0 rspo = 0.0D0 r_sh_inboard_in = 0.0D0 + z_plasma_xpoint_upper = 0.0D0 + z_plasma_xpoint_lower = 0.0D0 end subroutine init_build_variables end module build_variables diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index e2d5afa66e..3c046ba550 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -368,8 +368,8 @@ class ComponentHalfHeightParam(NamedTuple): dr_fw_outboard: Any = None d_vv_bot: Any = None d_vv_top: Any = None - rminor: Any = None - kappa: Any = None + z_plasma_xpoint_lower: Any = None + z_plasma_xpoint_upper: Any = None idivrt: Any = None divfix: Any = None icomponent: Any = None @@ -392,8 +392,8 @@ class ComponentHalfHeightParam(NamedTuple): dr_fw_outboard=0.018000000000000002, d_vv_bot=0.30000000000000004, d_vv_top=0.30000000000000004, - rminor=2.6666666666666665, - kappa=1.8500000000000001, + z_plasma_xpoint_lower=4.93333333333333333, + z_plasma_xpoint_upper=4.93333333333333333, idivrt=1, divfix=0.62000000000000011, icomponent=0, @@ -447,8 +447,16 @@ def test_component_half_height( ) monkeypatch.setattr(build_variables, "d_vv_bot", componenthalfheightparam.d_vv_bot) monkeypatch.setattr(build_variables, "d_vv_top", componenthalfheightparam.d_vv_top) - monkeypatch.setattr(physics_variables, "rminor", componenthalfheightparam.rminor) - monkeypatch.setattr(physics_variables, "kappa", componenthalfheightparam.kappa) + monkeypatch.setattr( + build_variables, + "z_plasma_xpoint_lower", + componenthalfheightparam.z_plasma_xpoint_lower, + ) + monkeypatch.setattr( + build_variables, + "z_plasma_xpoint_upper", + componenthalfheightparam.z_plasma_xpoint_upper, + ) monkeypatch.setattr(physics_variables, "idivrt", componenthalfheightparam.idivrt) monkeypatch.setattr(divertor_variables, "divfix", componenthalfheightparam.divfix) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 230c627657..abe6ae767c 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -14098,8 +14098,9 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): ) monkeypatch.setattr(build_variables, "dr_tf_outboard", 0) # simplifies - monkeypatch.setattr(physics_variables, "rminor", 2.96) # Baseline 2018 - monkeypatch.setattr(physics_variables, "kappa", 1.848) # Baseline 2018 + monkeypatch.setattr( + build_variables, "z_plasma_xpoint_upper", 5.47008 + ) # Baseline 2018 monkeypatch.setattr(sctfcoil_module, "a_tf_steel", 0.55) # Section 3 From 3205ccefe2df8b8cb9d84188191dacf153964b05 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 10:53:23 +0000 Subject: [PATCH 02/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20thshield=5Fvb=20t?= =?UTF-8?q?o=20dz=5Fshld=5Fthermal=20for=20consistency=20across=20multiple?= =?UTF-8?q?=20files?= 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/large_tokamak_IN.DAT | 2 +- examples/data/scan_example_file_IN.DAT | 2 +- process/build.py | 40 +++++++++---------- process/buildings.py | 4 +- process/io/mfile_comparison.py | 4 +- process/io/obsolete_vars.py | 6 ++- process/io/plot_proc.py | 6 +-- source/fortran/build_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 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 2 +- .../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 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_buildings.py | 10 +++-- 29 files changed, 64 insertions(+), 58 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 02e170d3c5..3fef22efd3 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1487,7 +1487,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 10e487f9b1..ff2121bfdf 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 847e86c95c..ff36d00966 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 396c1613e0..595eb55aae 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a6bdf2d151..746f34b4c4 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 95029ac392..c09234be01 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -291,7 +291,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index cf10665c88..c4ddf76e80 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -291,7 +291,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/process/build.py b/process/build.py index aeed38845e..b0104e0109 100644 --- a/process/build.py +++ b/process/build.py @@ -142,7 +142,7 @@ def calculate_vertical_build(self, output: bool) -> None: buildings_variables.dz_tf_cryostat + build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap - + build_variables.thshield_vb + + build_variables.dz_shld_thermal + build_variables.vgap_vv_thermalshield + build_variables.d_vv_top + build_variables.shldtth @@ -193,18 +193,18 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Thermal shield, vertical", - build_variables.thshield_vb, + build_variables.dz_shld_thermal, vbuild, - "(thshield_vb)", + "(dz_shld_thermal)", ) po.ovarre( self.mfile, "Thermal shield, vertical (m)", - "(thshield_vb)", - build_variables.thshield_vb, + "(dz_shld_thermal)", + build_variables.dz_shld_thermal, ) - vbuild = vbuild - build_variables.thshield_vb + vbuild = vbuild - build_variables.dz_shld_thermal po.obuild( self.outfile, @@ -360,13 +360,13 @@ def calculate_vertical_build(self, output: bool) -> None: "(vgap_vv_thermalshield)", ) - vbuild = vbuild - build_variables.thshield_vb + vbuild = vbuild - build_variables.dz_shld_thermal po.obuild( self.outfile, "Thermal shield, vertical", - build_variables.thshield_vb, + build_variables.dz_shld_thermal, vbuild, - "(thshield_vb)", + "(dz_shld_thermal)", ) vbuild = vbuild - build_variables.dr_tf_shld_gap @@ -415,7 +415,7 @@ def calculate_vertical_build(self, output: bool) -> None: buildings_variables.dz_tf_cryostat + build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap - + build_variables.thshield_vb + + build_variables.dz_shld_thermal + build_variables.vgap_vv_thermalshield + 0.5e0 * (build_variables.d_vv_top + build_variables.d_vv_bot) + build_variables.dr_shld_blkt_gap @@ -469,17 +469,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Thermal shield, vertical", - build_variables.thshield_vb, + build_variables.dz_shld_thermal, vbuild, - "(thshield_vb)", + "(dz_shld_thermal)", ) po.ovarre( self.mfile, "Thermal shield, vertical (m)", - "(thshield_vb)", - build_variables.thshield_vb, + "(dz_shld_thermal)", + build_variables.dz_shld_thermal, ) - vbuild = vbuild - build_variables.thshield_vb + vbuild = vbuild - build_variables.dz_shld_thermal po.obuild( self.outfile, @@ -656,13 +656,13 @@ def calculate_vertical_build(self, output: bool) -> None: "(vgap_vv_thermalshield)", ) - vbuild = vbuild - build_variables.thshield_vb + vbuild = vbuild - build_variables.dz_shld_thermal po.obuild( self.outfile, "Thermal shield, vertical", - build_variables.thshield_vb, + build_variables.dz_shld_thermal, vbuild, - "(thshield_vb)", + "(dz_shld_thermal)", ) vbuild = vbuild - build_variables.dr_tf_shld_gap @@ -738,7 +738,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.shldlth + build_variables.d_vv_bot + build_variables.vgap_vv_thermalshield - + build_variables.thshield_vb + + build_variables.dz_shld_thermal + build_variables.dr_tf_shld_gap ) @@ -750,7 +750,7 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.hpfu = ( build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap - + build_variables.thshield_vb + + build_variables.dz_shld_thermal + build_variables.vgap_vv_thermalshield + build_variables.d_vv_top + build_variables.shldtth diff --git a/process/buildings.py b/process/buildings.py index c7f2df7cfb..0d905b35c7 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -542,7 +542,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): - ( build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap - + build_variables.thshield_vb + + build_variables.dz_shld_thermal + build_variables.vgap_vv_thermalshield ) ) @@ -587,7 +587,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): - ( build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap - + build_variables.thshield_vb + + build_variables.dz_shld_thermal + build_variables.vgap_vv_thermalshield ) ) diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index b6e705ebd1..f369578b81 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -151,7 +151,7 @@ "deltf", "dr_shld_thermal_inboard", "dr_shld_thermal_outboard", - "thshield_vb", + "dz_shld_thermal", "dr_shld_vv_gap_inboard", "dr_vv_inboard", "dr_vv_outboard", @@ -244,7 +244,7 @@ "dr_tf_shld_gap", "dr_shld_thermal_inboard", "dr_shld_thermal_outboard", - "thshield_vb", + "dz_shld_thermal", "dr_shld_vv_gap_inboard", "dr_vv_inboard", "dr_shld_inboard", diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index e783474086..b9ce072db8 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -73,7 +73,11 @@ "pcoreradmw": "p_plasma_inner_rad_mw", "pedgeradmw": "p_plasma_outer_rad_mw", "rad_fraction_core": "rad_fraction_LCFS", - "thshield": ["dr_shld_thermal_inboard", "dr_shld_thermal_outboard", "thshield_vb"], + "thshield": [ + "dr_shld_thermal_inboard", + "dr_shld_thermal_outboard", + "dz_shld_thermal", + ], "igeom": None, "fgamp": None, "divleg_profile_inner": None, diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index c1a55d95d9..7c7d66466f 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -158,7 +158,7 @@ def parse_args(args): "shldlth", "d_vv_bot", "vgap_vv_thermalshield", - "thshield_vb", + "dz_shld_thermal", "dr_tf_shld_gap", "dr_tf_inboard", ] @@ -3649,7 +3649,7 @@ def main(args=None): "shldtth", "d_vv_top", "vgap_vv_thermalshield", - "thshield_vb", + "dz_shld_thermal", "dr_tf_shld_gap", "dr_tf_inboard", ] @@ -3663,7 +3663,7 @@ def main(args=None): "shldtth", "d_vv_top", "vgap_vv_thermalshield", - "thshield_vb", + "dz_shld_thermal", "dr_tf_shld_gap", "dr_tf_inboard", ] diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index 6d2f51cc19..d935567dc9 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -264,7 +264,7 @@ module build_variables real(dp) :: dr_shld_thermal_outboard !! TF-VV thermal shield thickness, outboard (m) - real(dp) :: thshield_vb + real(dp) :: dz_shld_thermal !! TF-VV thermal shield thickness, vertical build (m) real(dp) :: vgap_vv_thermalshield @@ -381,7 +381,7 @@ subroutine init_build_variables dr_tf_shld_gap = 0.05D0 dr_shld_thermal_inboard = 0.05D0 dr_shld_thermal_outboard = 0.05D0 - thshield_vb = 0.05D0 + dz_shld_thermal = 0.05D0 vgap_vv_thermalshield = 0.163D0 vgap_xpoint_divertor= 0.0D0 vgaptop = 0.60D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 90ad844640..4a6802cc23 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -192,7 +192,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use global_variables, only: run_tests, verbose, maxcal, runtitle use build_variables, only: tf_in_cs, blbmoth, blbuith, dr_shld_outboard, & shldtth, shldlth, vgap_vv_thermalshield, plleni, dr_fw_outboard, dr_shld_blkt_gap, & - dr_shld_thermal_inboard, dr_shld_thermal_outboard, thshield_vb, i_cs_precomp, & + dr_shld_thermal_inboard, dr_shld_thermal_outboard, dz_shld_thermal, i_cs_precomp, & blbpith, aplasmin, blbuoth, dr_tf_inboard, & iohcl, dr_tf_shld_gap, f_z_cryostat, dr_bore, plleno, dr_fw_plasma_gap_inboard, gapomin, dr_cryostat, & rinboard, dr_blkt_outboard, fseppc, plsepo, dr_blkt_inboard, & @@ -1422,8 +1422,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dr_shld_thermal_outboard') call parse_real_variable('dr_shld_thermal_outboard', dr_shld_thermal_outboard, 0.0D0, 10.0D0, & 'TF/VV thermal shield thickness, outboard (m)') - case ('thshield_vb') - call parse_real_variable('thshield_vb', thshield_vb, 0.0D0, 10.0D0, & + case ('dz_shld_thermal') + call parse_real_variable('dz_shld_thermal', dz_shld_thermal, 0.0D0, 10.0D0, & 'TF/VV thermal shield thickness, vertical build (m)') case ('vgap_xpoint_divertor') call parse_real_variable('vgap_xpoint_divertor', vgap_xpoint_divertor, 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 69aa4555d7..89b2f3def3 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1480,7 +1480,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index c5d9624dc5..7f5bb8374b 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ab5512a4e0..2344ee9ffe 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index ee13b45f9d..68431153c8 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index be8c6b964f..bd7c844041 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -291,7 +291,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index d8c0c6aef6..6c0164d48a 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1482,7 +1482,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 540d2aa62a..ae57b8dcf5 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -110,7 +110,7 @@ dr_shld_outboard = 0.800 * outboard shield thickness (m) (`iteration variable 9 dr_tf_inboard = 1.2 * inboard TF coil thickness; (centrepost for ST) (m) dr_shld_thermal_inboard = 0.050 * TF-VV thermal shield thickness; inboard (m) dr_shld_thermal_outboard = 0.050 * TF-VV thermal shield thickness; outboard (m) -thshield_vb = 0.050 * TF-VV thermal shield thickness; vertical build (m) +dz_shld_thermal = 0.050 * TF-VV thermal shield thickness; vertical build (m) dr_shld_blkt_gap = 0.02 * gap between vacuum vessel and blanket (m) *---------------Buildings Variables----------------* diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 74c4f99f64..9a6dc5c911 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -17767,7 +17767,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 0b28522c22..78b6c367ad 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -291,7 +291,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 26cdd3cb63..4f41c0ec3e 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -273,7 +273,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 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 893eebffac..8ce604f074 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -110,7 +110,7 @@ dr_shld_outboard = 0.800 * outboard shield thickness (m) (`iteration variable 9 dr_tf_inboard = 1.2 * inboard TF coil thickness; (centrepost for ST) (m) dr_shld_thermal_inboard = 0.050 * TF-VV thermal shield thickness; inboard (m) dr_shld_thermal_outboard = 0.050 * TF-VV thermal shield thickness; outboard (m) -thshield_vb = 0.050 * TF-VV thermal shield thickness; vertical build (m) +dz_shld_thermal = 0.050 * TF-VV thermal shield thickness; vertical build (m) dr_shld_blkt_gap = 0.02 * gap between vacuum vessel and blanket (m) *---------------Buildings Variables----------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index c693737da0..fd2a63700d 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2172,7 +2172,7 @@ shldlth = 0.6 * DESCRIPTION: top blanket thickness (m) * JUSTIFICATION: No longer an input variable -thshield_vb = 0.075 +dz_shld_thermal = 0.075 * DESCRIPTION: TF-VV Thermal Shield Thickness (m) * JUSTIFICATION: diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index bec25666fc..ad37f02853 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -291,7 +291,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index bfd59fffbc..d16cfcd9f6 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1482,7 +1482,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py index 7e2c4170e0..91d561e916 100644 --- a/tests/unit/test_buildings.py +++ b/tests/unit/test_buildings.py @@ -144,7 +144,7 @@ class BldgsSizesParam(NamedTuple): dr_tf_shld_gap: Any dr_shld_thermal_inboard: Any dr_shld_thermal_outboard: Any - thshield_vb: Any + dz_shld_thermal: Any dr_shld_inboard: Any dr_shld_outboard: Any dr_fw_plasma_gap_inboard: Any @@ -287,7 +287,7 @@ class BldgsSizesParam(NamedTuple): dr_tf_shld_gap=0.05000000000000001, dr_shld_thermal_inboard=0.050000000000000003, dr_shld_thermal_outboard=0.050000000000000003, - thshield_vb=0.050000000000000003, + dz_shld_thermal=0.050000000000000003, dr_shld_inboard=0.30000000000000004, dr_shld_outboard=0.80000000000000004, dr_fw_plasma_gap_inboard=0.22500000000000003, @@ -426,7 +426,7 @@ class BldgsSizesParam(NamedTuple): dr_tf_shld_gap=0.05000000000000001, dr_shld_thermal_inboard=0.050000000000000003, dr_shld_thermal_outboard=0.050000000000000003, - thshield_vb=0.050000000000000003, + dz_shld_thermal=0.050000000000000003, dr_shld_inboard=0.30000000000000004, dr_shld_outboard=0.80000000000000004, dr_fw_plasma_gap_inboard=0.22500000000000003, @@ -699,7 +699,9 @@ def test_bldgs_sizes(buildings, bldgssizesparam, monkeypatch): "dr_shld_thermal_outboard", bldgssizesparam.dr_shld_thermal_outboard, ) - monkeypatch.setattr(build_variables, "thshield_vb", bldgssizesparam.thshield_vb) + monkeypatch.setattr( + build_variables, "dz_shld_thermal", bldgssizesparam.dz_shld_thermal + ) monkeypatch.setattr( build_variables, "dr_shld_inboard", bldgssizesparam.dr_shld_inboard ) From 146c8c4afe6bfb38d4720e7607e40364b8e7452e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 10:55:26 +0000 Subject: [PATCH 03/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20vgap=5Fxpoint=5Fd?= =?UTF-8?q?ivertor=20to=20dz=5Fxpoint=5Fdivertor=20for=20consistency=20acr?= =?UTF-8?q?oss=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 4 +-- process/build.py | 30 +++++++++---------- process/divertor.py | 16 +++++----- process/init.py | 2 +- process/io/mfile_comparison.py | 2 +- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 2 +- process/sctfcoil.py | 2 +- process/utilities/errorlist.json | 2 +- source/fortran/build_variables.f90 | 6 ++-- source/fortran/input.f90 | 6 ++-- tests/integration/ref_dicts.json | 12 ++++---- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_blanket_library.py | 8 ++--- tests/unit/test_divertor.py | 4 +-- tests/unit/test_sctfcoil.py | 2 +- 16 files changed, 51 insertions(+), 51 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index bea03a88ab..accaafed03 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -97,7 +97,7 @@ def component_half_height(self, icomponent: int): if icomponent == 0: hbot = ( build_variables.z_plasma_xpoint_lower - + build_variables.vgap_xpoint_divertor + + build_variables.dz_xpoint_divertor + divertor_variables.divfix - build_variables.blnktth ) @@ -105,7 +105,7 @@ def component_half_height(self, icomponent: int): elif icomponent == 1: hbot = ( build_variables.z_plasma_xpoint_lower - + build_variables.vgap_xpoint_divertor + + build_variables.dz_xpoint_divertor + divertor_variables.divfix ) # Vacuum vessel diff --git a/process/build.py b/process/build.py index b0104e0109..3af40fab82 100644 --- a/process/build.py +++ b/process/build.py @@ -298,19 +298,19 @@ def calculate_vertical_build(self, output: bool) -> None: "(z_plasma_xpoint_lower)", ) - vbuild = vbuild - build_variables.vgap_xpoint_divertor + vbuild = vbuild - build_variables.dz_xpoint_divertor po.obuild( self.outfile, "Lower scrape-off", - build_variables.vgap_xpoint_divertor, + build_variables.dz_xpoint_divertor, vbuild, - "(vgap_xpoint_divertor)", + "(dz_xpoint_divertor)", ) po.ovarre( self.mfile, "Bottom scrape-off vertical thickness (m)", - "(vgap_xpoint_divertor)", - build_variables.vgap_xpoint_divertor, + "(dz_xpoint_divertor)", + build_variables.dz_xpoint_divertor, ) vbuild = vbuild - divertor_variables.divfix @@ -594,19 +594,19 @@ def calculate_vertical_build(self, output: bool) -> None: "(z_plasma_xpoint_upper)", ) - vbuild = vbuild - build_variables.vgap_xpoint_divertor + vbuild = vbuild - build_variables.dz_xpoint_divertor po.obuild( self.outfile, "Lower scrape-off", - build_variables.vgap_xpoint_divertor, + build_variables.dz_xpoint_divertor, vbuild, - "(vgap_xpoint_divertor)", + "(dz_xpoint_divertor)", ) po.ovarre( self.mfile, "Bottom scrape-off vertical thickness (m)", - "(vgap_xpoint_divertor)", - build_variables.vgap_xpoint_divertor, + "(dz_xpoint_divertor)", + build_variables.dz_xpoint_divertor, ) vbuild = vbuild - divertor_variables.divfix @@ -724,16 +724,16 @@ def calculate_vertical_build(self, output: bool) -> None: # Output the cdivertor geometry divht = self.divgeom(output) # Issue #481 Remove build_variables.vgaptf - if build_variables.vgap_xpoint_divertor < 0.00001e0: - build_variables.vgap_xpoint_divertor = divht + if build_variables.dz_xpoint_divertor < 0.00001e0: + build_variables.dz_xpoint_divertor = divht - # If build_variables.vgap_xpoint_divertor /= 0 use the value set by the user. + # If build_variables.dz_xpoint_divertor /= 0 use the value set by the user. # Height to inside edge of TF coil. TF coils are assumed to be symmetrical. # Therefore this applies to single and double null cases. build_variables.hmax = ( build_variables.z_plasma_xpoint_upper - + build_variables.vgap_xpoint_divertor + + build_variables.dz_xpoint_divertor + divertor_variables.divfix + build_variables.shldlth + build_variables.d_vv_bot @@ -1974,7 +1974,7 @@ def calculate_radial_build(self, output: bool) -> None: # Half-height of first wall (internal surface) hbot = ( build_variables.z_plasma_xpoint_lower - + build_variables.vgap_xpoint_divertor + + build_variables.dz_xpoint_divertor + divertor_variables.divfix - build_variables.blnktth - 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) diff --git a/process/divertor.py b/process/divertor.py index 8bb6ff47f4..02bac08915 100644 --- a/process/divertor.py +++ b/process/divertor.py @@ -39,7 +39,7 @@ def run(self, output: bool) -> None: pv.rminor, pv.triang, bv.dr_fw_plasma_gap_inboard, - bv.vgap_xpoint_divertor, + bv.dz_xpoint_divertor, pv.pdivt, output=output, ) @@ -753,7 +753,7 @@ def divtart( rminor: float, triang: float, dr_fw_plasma_gap_inboard: float, - vgap_xpoint_divertor: float, + dz_xpoint_divertor: float, pdivt: float, output: bool, ) -> float: @@ -778,8 +778,8 @@ def divtart( :param dr_fw_plasma_gap_inboard: inboard scrape-off width (m) :type dr_fw_plasma_gap_inboard: float - :param vgap_xpoint_divertor: top scrape-off width (m) - :type vgap_xpoint_divertor: float + :param dz_xpoint_divertor: top scrape-off width (m) + :type dz_xpoint_divertor: float :param pdivt: power to the divertor (MW) :type pdivt: float @@ -801,15 +801,15 @@ def divtart( # Angle of diagonal divertor plate from horizontal - if vgap_xpoint_divertor <= 0.0e0: - eh.fdiags[0] = vgap_xpoint_divertor + if dz_xpoint_divertor <= 0.0e0: + eh.fdiags[0] = dz_xpoint_divertor eh.report_error(22) - theta = math.atan(vgap_xpoint_divertor / (r2 - r1)) + theta = math.atan(dz_xpoint_divertor / (r2 - r1)) # Vertical plate area - a1 = 2.0e0 * constants.pi * r1 * vgap_xpoint_divertor + a1 = 2.0e0 * constants.pi * r1 * dz_xpoint_divertor # Horizontal plate area diff --git a/process/init.py b/process/init.py index 25b559c673..bd7d32a7d9 100644 --- a/process/init.py +++ b/process/init.py @@ -658,7 +658,7 @@ def check_process(): if fortran.physics_variables.i_single_null == 0: fortran.physics_variables.idivrt = 2 - fortran.build_variables.vgaptop = fortran.build_variables.vgap_xpoint_divertor + fortran.build_variables.vgaptop = fortran.build_variables.dz_xpoint_divertor fortran.build_variables.shldtth = fortran.build_variables.shldlth fortran.build_variables.d_vv_top = fortran.build_variables.d_vv_bot warn("Double-null: Upper vertical build forced to match lower", stacklevel=2) diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index f369578b81..09704f0123 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -260,7 +260,7 @@ "dr_shld_vv_gap_outboard", "dr_tf_shld_gap", "dr_tf_outboard", - "vgap_xpoint_divertor", + "dz_xpoint_divertor", "divfix", "d_vv_bot", "shldlth", diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index b9ce072db8..8146c1a886 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -124,7 +124,7 @@ "bootipf": "bootstrap_current_fraction", "bscfmax": "bootstrap_current_fraction_max", "vgap2": "vgap_vv_thermalshield", - "vgap": "vgap_xpoint_divertor", + "vgap": "dz_xpoint_divertor", "ftritbm": "f_tritium_bream", "enbeam": "beam_energy", "fdeut": "f_deuterium", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 7c7d66466f..52686b6e16 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -153,7 +153,7 @@ def parse_args(args): vertical_lower = [ "z_plasma_xpoint_lower", - "vgap_xpoint_divertor", + "dz_xpoint_divertor", "divfix", "shldlth", "d_vv_bot", diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 56020cd99a..924ee8fac2 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -2322,7 +2322,7 @@ def vv_stress_on_quench(self): H_vv = ( build_variables.z_plasma_xpoint_upper - + build_variables.vgap_xpoint_divertor + + build_variables.dz_xpoint_divertor + divertor_variables.divfix + build_variables.shldtth + (build_variables.d_vv_top / 2) diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 2dd809addb..30c0177dc6 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -118,7 +118,7 @@ { "no": 22, "level": 3, - "message": "DIVCALL: Non-positive vgap_xpoint_divertor" + "message": "DIVCALL: Non-positive dz_xpoint_divertor" }, { "no": 23, diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index d935567dc9..2b83dba0f8 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -270,11 +270,11 @@ module build_variables real(dp) :: vgap_vv_thermalshield !! vertical gap between vacuum vessel and thermal shields (m) - real(dp) :: vgap_xpoint_divertor + real(dp) :: dz_xpoint_divertor !! vertical gap between x-point and divertor (m) (if = 0, it is calculated) real(dp) :: vgaptop - !! vertical gap between top of plasma and first wall (m) (= vgap_xpoint_divertor if double-null) + !! vertical gap between top of plasma and first wall (m) (= dz_xpoint_divertor if double-null) real(dp) :: dr_shld_blkt_gap !! gap between vacuum vessel and blanket (m) @@ -383,7 +383,7 @@ subroutine init_build_variables dr_shld_thermal_outboard = 0.05D0 dz_shld_thermal = 0.05D0 vgap_vv_thermalshield = 0.163D0 - vgap_xpoint_divertor= 0.0D0 + dz_xpoint_divertor= 0.0D0 vgaptop = 0.60D0 dr_shld_blkt_gap = 0.05D0 plleni = 1.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 4a6802cc23..d2c9a16e79 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -197,7 +197,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) iohcl, dr_tf_shld_gap, f_z_cryostat, dr_bore, plleno, dr_fw_plasma_gap_inboard, gapomin, dr_cryostat, & rinboard, dr_blkt_outboard, fseppc, plsepo, dr_blkt_inboard, & dr_cs, plsepi, blbmith, dr_cs_tf_gap, fcspc, dr_fw_plasma_gap_outboard, vgaptop, & - blbpoth, dr_shld_vv_gap_inboard, dr_fw_inboard, vgap_xpoint_divertor, dr_shld_inboard, sigallpc, tfootfi, f_avspace,& + blbpoth, dr_shld_vv_gap_inboard, dr_fw_inboard, dz_xpoint_divertor, dr_shld_inboard, sigallpc, tfootfi, f_avspace,& r_cp_top, dr_vv_inboard, dr_vv_outboard, 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, dz_tf_cryostat, stcl, clh2, & @@ -1425,8 +1425,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dz_shld_thermal') call parse_real_variable('dz_shld_thermal', dz_shld_thermal, 0.0D0, 10.0D0, & 'TF/VV thermal shield thickness, vertical build (m)') - case ('vgap_xpoint_divertor') - call parse_real_variable('vgap_xpoint_divertor', vgap_xpoint_divertor, 0.0D0, 10.0D0, & + case ('dz_xpoint_divertor') + call parse_real_variable('dz_xpoint_divertor', dz_xpoint_divertor, 0.0D0, 10.0D0, & 'Vert gap between x-pnt and divertor (m)') case ('vgap_vv_thermalshield') call parse_real_variable('vgap_vv_thermalshield', vgap_vv_thermalshield, 0.0D0, 10.0D0, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e8d1fb3b72..a2bc50905e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7924,7 +7924,7 @@ "vfpblkt": 0.1, "vfshld": 0.25, "vftf": 0.4, - "vgap_xpoint_divertor": 0.0, + "dz_xpoint_divertor": 0.0, "vgap_vv_thermalshield": 0.163, "vgaptop": 0.6, "vlabel": "", @@ -11033,9 +11033,9 @@ "vfpblkt": "He purge gas fraction of blanket by volume (`i_blanket_type= 1,3` (CCFE HCPB))", "vfshld": "coolant void fraction in shield", "vftf": "coolant fraction of TFC 'cable' (`i_tf_sup=1`), or of TFC leg (`i_tf_ssup=0`)", - "vgap_xpoint_divertor": "vertical gap between x-point and divertor (m) (if = 0, it is calculated)", + "dz_xpoint_divertor": "vertical gap between x-point and divertor (m) (if = 0, it is calculated)", "vgap_vv_thermalshield": "vertical gap between vacuum vessel and thermal shields (m)", - "vgaptop": "vertical gap between top of plasma and first wall (m) (= vgap_xpoint_divertor if double-null)", + "vgaptop": "vertical gap between top of plasma and first wall (m) (= dz_xpoint_divertor if double-null)", "vlabel": "scan value name label", "vlabel_2": "scan value name label (2nd dimension)", "vlam": "", @@ -14965,7 +14965,7 @@ "lb": 0.0, "ub": 1.0 }, - "vgap_xpoint_divertor": { + "dz_xpoint_divertor": { "lb": 0.0, "ub": 10.0 }, @@ -17067,7 +17067,7 @@ "dr_tf_shld_gap", "thshield", "vgap_vv_thermalshield", - "vgap_xpoint_divertor", + "dz_xpoint_divertor", "vgaptop", "dr_shld_blkt_gap", "plleni", @@ -20880,7 +20880,7 @@ "vfpblkt": "real_variable", "vfshld": "real_variable", "vftf": "real_variable", - "vgap_xpoint_divertor": "real_variable", + "dz_xpoint_divertor": "real_variable", "vgap_vv_thermalshield": "real_variable", "vgaptop": "real_variable", "dr_shld_blkt_gap": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index fd2a63700d..93912ed8c2 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2148,7 +2148,7 @@ tfootfi = 1.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Vertical Build~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~* *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -vgap_xpoint_divertor = 0.75 +dz_xpoint_divertor = 0.75 * DESCRIPTION: Vertical Gap Between x-point and Divertor (m) * JUSTIFICATION: diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 3c046ba550..54c017c615 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -358,7 +358,7 @@ def test_pumppower_secondary_pb_li(monkeypatch, blanket_library_fixture): class ComponentHalfHeightParam(NamedTuple): hmax: Any = None - vgap_xpoint_divertor: Any = None + dz_xpoint_divertor: Any = None vgap_vv_thermalshield: Any = None blnktth: Any = None shldtth: Any = None @@ -382,7 +382,7 @@ class ComponentHalfHeightParam(NamedTuple): ( ComponentHalfHeightParam( hmax=8.8182171641274945, - vgap_xpoint_divertor=2.0018838307941582, + dz_xpoint_divertor=2.0018838307941582, vgap_vv_thermalshield=0.16300000000000001, blnktth=0.85000000000000009, shldtth=0.59999999999999998, @@ -419,8 +419,8 @@ def test_component_half_height( monkeypatch.setattr(build_variables, "hmax", componenthalfheightparam.hmax) monkeypatch.setattr( build_variables, - "vgap_xpoint_divertor", - componenthalfheightparam.vgap_xpoint_divertor, + "dz_xpoint_divertor", + componenthalfheightparam.dz_xpoint_divertor, ) monkeypatch.setattr( build_variables, diff --git a/tests/unit/test_divertor.py b/tests/unit/test_divertor.py index 2f5ae25579..76a3e4558b 100644 --- a/tests/unit/test_divertor.py +++ b/tests/unit/test_divertor.py @@ -137,7 +137,7 @@ def test_divtart(self, monkeypatch, divertor): rminor = 0.97142857142857153 triang = 0.5 dr_fw_plasma_gap_inboard = 0.09595 - vgap_xpoint_divertor = 0.5 + dz_xpoint_divertor = 0.5 pdivt = 7.7197999809272062 monkeypatch.setattr(dv, "i_hldiv", 1) @@ -148,7 +148,7 @@ def test_divtart(self, monkeypatch, divertor): rminor, triang, dr_fw_plasma_gap_inboard, - vgap_xpoint_divertor, + dz_xpoint_divertor, pdivt, False, ) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index abe6ae767c..10c0a1c7ab 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -14108,7 +14108,7 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): monkeypatch.setattr(sctfcoil_module, "a_case_front", 0.47) monkeypatch.setattr(sctfcoil_module, "a_case_nose", 0.47) - monkeypatch.setattr(build_variables, "vgap_xpoint_divertor", 0.05) # Baseline 2018 + monkeypatch.setattr(build_variables, "dz_xpoint_divertor", 0.05) # Baseline 2018 monkeypatch.setattr(build_variables, "shldtth", 0.3) # Baseline 2018 monkeypatch.setattr( divertor_variables, "divfix", 2.05 From e601ab181b858df4ed84a2022a3aace22cfcb283 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 10:56:55 +0000 Subject: [PATCH 04/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20divfix=20to=20dz?= =?UTF-8?q?=5Fdivertor=20for=20consistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/machine-build.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 | 4 +-- process/build.py | 36 +++++++++---------- process/buildings.py | 2 +- process/geometry/blanket_geometry.py | 4 +-- process/geometry/firstwall_geometry.py | 4 +-- process/geometry/shield_geometry.py | 2 +- process/io/mfile_comparison.py | 2 +- process/io/mfile_to_csv_vars.json | 2 +- process/io/plot_proc.py | 4 +-- process/sctfcoil.py | 2 +- source/fortran/divertor_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 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_blanket_library.py | 8 +++-- tests/unit/test_buildings.py | 8 ++--- tests/unit/test_sctfcoil.py | 2 +- 44 files changed, 123 insertions(+), 121 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index 0b4de58eda..f59f603bec 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -76,7 +76,7 @@ case the machine is not symmetric about the midplane. Midplane 0.000 -0.000 Plasma bottom 6.029 -6.029 (z_plasma_xpoint_upper) Lower scrape-off 2.002 -8.031 (vgap) - Divertor structure 0.621 -8.652 (divfix) + Divertor structure 0.621 -8.652 (dz_divertor) Vacuum vessel (and shielding) 1.000 -9.652 (d_vv_bot+shldlth) Gap 0.050 -9.702 (vgap_vv_thermalshield) Thermal shield 0.050 -9.752 (thshield) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 3fef22efd3..d7e15d1203 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -601,7 +601,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1529,7 +1529,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index ff2121bfdf..ba61c7207f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -598,7 +598,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index ff36d00966..1a5051b791 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -598,7 +598,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 595eb55aae..bc14b9e3bc 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -598,7 +598,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 746f34b4c4..4c83c2b917 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -598,7 +598,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index c09234be01..63738b6f92 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -333,7 +333,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/mfile_to_csv_vars.json b/examples/data/mfile_to_csv_vars.json index 1e089ba71c..01c82202d4 100644 --- a/examples/data/mfile_to_csv_vars.json +++ b/examples/data/mfile_to_csv_vars.json @@ -17,7 +17,7 @@ "dr_tf_wp", "dr_cryostat", "dr_shld_outboard", - "divfix", + "dz_divertor", "rmajor" ] } diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 916cf5431a..0cfc899b22 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -451,7 +451,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1446,7 +1446,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -2441,7 +2441,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -3436,7 +3436,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -4431,7 +4431,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -5426,7 +5426,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -6421,7 +6421,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -7416,7 +7416,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -8411,7 +8411,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -9154,7 +9154,7 @@ pheat = 50.0 *----------------Divertor Variables----------------* divdum = 1 * Switch for divertor zeff model; 0=calc; 1=input -divfix = 0.621 * Divertor structure vertical thickness (m) +dz_divertor = 0.621 * Divertor structure vertical thickness (m) hldivlim = 10 * Heat load limit (mw/m2) ksic = 1.4 * Power fraction for outboard double-null scrape-off plasma prn1 = 0.4 * N-scrape-off / n-average plasma; diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index c4ddf76e80..4520d996ab 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -333,7 +333,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/process/blanket_library.py b/process/blanket_library.py index accaafed03..46f2693d97 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -98,7 +98,7 @@ def component_half_height(self, icomponent: int): hbot = ( build_variables.z_plasma_xpoint_lower + build_variables.dz_xpoint_divertor - + divertor_variables.divfix + + divertor_variables.dz_divertor - build_variables.blnktth ) # Sheild @@ -106,7 +106,7 @@ def component_half_height(self, icomponent: int): hbot = ( build_variables.z_plasma_xpoint_lower + build_variables.dz_xpoint_divertor - + divertor_variables.divfix + + divertor_variables.dz_divertor ) # Vacuum vessel elif icomponent == 2: diff --git a/process/build.py b/process/build.py index 3af40fab82..2e429045d2 100644 --- a/process/build.py +++ b/process/build.py @@ -146,7 +146,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.vgap_vv_thermalshield + build_variables.d_vv_top + build_variables.shldtth - + divertor_variables.divfix + + divertor_variables.dz_divertor + build_variables.vgaptop + build_variables.z_plasma_xpoint_upper ) @@ -245,17 +245,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Divertor structure", - divertor_variables.divfix, + divertor_variables.dz_divertor, vbuild, - "(divfix)", + "(dz_divertor)", ) po.ovarre( self.mfile, "Divertor structure vertical thickness (m)", - "(divfix)", - divertor_variables.divfix, + "(dz_divertor)", + divertor_variables.dz_divertor, ) - vbuild = vbuild - divertor_variables.divfix + vbuild = vbuild - divertor_variables.dz_divertor po.obuild( self.outfile, @@ -313,19 +313,19 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.dz_xpoint_divertor, ) - vbuild = vbuild - divertor_variables.divfix + vbuild = vbuild - divertor_variables.dz_divertor po.obuild( self.outfile, "Divertor structure", - divertor_variables.divfix, + divertor_variables.dz_divertor, vbuild, - "(divfix)", + "(dz_divertor)", ) po.ovarre( self.mfile, "Divertor structure vertical thickness (m)", - "(divfix)", - divertor_variables.divfix, + "(dz_divertor)", + divertor_variables.dz_divertor, ) vbuild = vbuild - build_variables.shldlth @@ -609,19 +609,19 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.dz_xpoint_divertor, ) - vbuild = vbuild - divertor_variables.divfix + vbuild = vbuild - divertor_variables.dz_divertor po.obuild( self.outfile, "Divertor structure", - divertor_variables.divfix, + divertor_variables.dz_divertor, vbuild, - "(divfix)", + "(dz_divertor)", ) po.ovarre( self.mfile, "Divertor structure vertical thickness (m)", - "(divfix)", - divertor_variables.divfix, + "(dz_divertor)", + divertor_variables.dz_divertor, ) vbuild = vbuild - build_variables.shldlth @@ -734,7 +734,7 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.hmax = ( build_variables.z_plasma_xpoint_upper + build_variables.dz_xpoint_divertor - + divertor_variables.divfix + + divertor_variables.dz_divertor + build_variables.shldlth + build_variables.d_vv_bot + build_variables.vgap_vv_thermalshield @@ -1975,7 +1975,7 @@ def calculate_radial_build(self, output: bool) -> None: hbot = ( build_variables.z_plasma_xpoint_lower + build_variables.dz_xpoint_divertor - + divertor_variables.divfix + + divertor_variables.dz_divertor - build_variables.blnktth - 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) ) diff --git a/process/buildings.py b/process/buildings.py index 0d905b35c7..8071225081 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -627,7 +627,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): # Divertor # Note: this estimation developed before the divertor design has been finalised if cost_variables.divlife != 0.0e0: - hcomp_height = divertor_variables.divfix + hcomp_height = divertor_variables.dz_divertor hcomp_rad_thk = 2 * physics_variables.rminor hcomp_tor_thk = physics_variables.rmajor + physics_variables.rminor hcomp_footprint = (hcomp_height + buildings_variables.hot_sepdist) * ( diff --git a/process/geometry/blanket_geometry.py b/process/geometry/blanket_geometry.py index 4f58536331..0f5693cbee 100644 --- a/process/geometry/blanket_geometry.py +++ b/process/geometry/blanket_geometry.py @@ -64,7 +64,7 @@ def blanket_geometry_single_null( ) # Lower blanket - divgap = cumulative_lower["divfix"] + divgap = cumulative_lower["dz_divertor"] ( rs_lower_outboard, @@ -175,7 +175,7 @@ def blanket_geometry_double_null( :rtype: ArbitraryGeometry """ # Lower blanket - divgap = cumulative_lower["divfix"] + divgap = cumulative_lower["dz_divertor"] ( rs_lower_outboard, diff --git a/process/geometry/firstwall_geometry.py b/process/geometry/firstwall_geometry.py index 0b83d78a42..a97f5b5439 100644 --- a/process/geometry/firstwall_geometry.py +++ b/process/geometry/firstwall_geometry.py @@ -66,7 +66,7 @@ def first_wall_geometry_single_null( ) # Lower first wall - divgap = cumulative_lower["divfix"] + divgap = cumulative_lower["dz_divertor"] top_point = divgap + blnktth ( rs_lower_outboard, @@ -180,7 +180,7 @@ def first_wall_geometry_double_null( :rtype: ArbitraryGeometry """ # Lower first wall - divgap = cumulative_lower["divfix"] + divgap = cumulative_lower["dz_divertor"] top_point = divgap + blnktth ( rs_lower_outboard, diff --git a/process/geometry/shield_geometry.py b/process/geometry/shield_geometry.py index cb3da54f62..4b4920d2c0 100644 --- a/process/geometry/shield_geometry.py +++ b/process/geometry/shield_geometry.py @@ -114,7 +114,7 @@ def shield_geometry_lower( ) # Side nearest to plasma - kapx = (cumulative_lower["divfix"]) / rminx_near + kapx = (cumulative_lower["dz_divertor"]) / rminx_near rs_lower_inboard, zs_lower_inboard = dh_vertices( radx_near, rminx_near, triang, kapx ) diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 09704f0123..7ba438c4d8 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -261,7 +261,7 @@ "dr_tf_shld_gap", "dr_tf_outboard", "dz_xpoint_divertor", - "divfix", + "dz_divertor", "d_vv_bot", "shldlth", "vgap_vv_thermalshield", diff --git a/process/io/mfile_to_csv_vars.json b/process/io/mfile_to_csv_vars.json index 1e089ba71c..01c82202d4 100644 --- a/process/io/mfile_to_csv_vars.json +++ b/process/io/mfile_to_csv_vars.json @@ -17,7 +17,7 @@ "dr_tf_wp", "dr_cryostat", "dr_shld_outboard", - "divfix", + "dz_divertor", "rmajor" ] } diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 52686b6e16..c0d69f2ea2 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -154,7 +154,7 @@ def parse_args(args): vertical_lower = [ "z_plasma_xpoint_lower", "dz_xpoint_divertor", - "divfix", + "dz_divertor", "shldlth", "d_vv_bot", "vgap_vv_thermalshield", @@ -3645,7 +3645,7 @@ def main(args=None): vertical_upper = [ "z_plasma_xpoint_upper", "vgaptop", - "divfix", + "dz_divertor", "shldtth", "d_vv_top", "vgap_vv_thermalshield", diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 924ee8fac2..d675b3d9cc 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -2323,7 +2323,7 @@ def vv_stress_on_quench(self): H_vv = ( build_variables.z_plasma_xpoint_upper + build_variables.dz_xpoint_divertor - + divertor_variables.divfix + + divertor_variables.dz_divertor + build_variables.shldtth + (build_variables.d_vv_top / 2) ) diff --git a/source/fortran/divertor_variables.f90 b/source/fortran/divertor_variables.f90 index 68fd2d4a34..c150eade29 100644 --- a/source/fortran/divertor_variables.f90 +++ b/source/fortran/divertor_variables.f90 @@ -72,7 +72,7 @@ module divertor_variables !! - =1 input !#TODO: switch name should be changed to i_ - real(dp) :: divfix + real(dp) :: dz_divertor !! divertor structure vertical thickness (m) real(dp) :: divmas @@ -194,7 +194,7 @@ subroutine init_divertor_variables divclfr = 0.3D0 divdens = 1.0D4 divdum = 0 - divfix = 0.2D0 + dz_divertor = 0.2D0 divmas = 0.0D0 divplt = 0.035D0 divsur = 0.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index d2c9a16e79..ccfaf4a4d5 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -262,7 +262,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use divertor_variables, only: fdfs, anginc, divdens, divclfr, c4div, & c5div, ksic, fififi, flux_exp, divplt, delld, c2div, beta_div, betao, divdum, tdiv, c6div, & omegan, prn1, frrp, xpertin, c1div, betai, bpsout, xparain, fdiva, & - zeffdiv, hldivlim, rlenmax, divfix, c3div, & + zeffdiv, hldivlim, rlenmax, dz_divertor, c3div, & hldiv, i_hldiv use fwbs_variables, only: fblhebpo, vfblkt, fdiv, fvolso, i_fw_coolant_type, & dx_fw_module, i_blanket_type, blktmodel, afwi, fblli2o, nphcdin, breeder_multiplier, & @@ -1194,8 +1194,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('divdum') call parse_int_variable('divdum', divdum, 0, 1, & 'Switch for divertor Zeff value') - case ('divfix') - call parse_real_variable('divfix', divfix, 0.1D0, 5.0D0, & + case ('dz_divertor') + call parse_real_variable('dz_divertor', dz_divertor, 0.1D0, 5.0D0, & 'Divertor structure vertical extent (m)') case ('divplt') call parse_real_variable('divplt', divplt, 0.01D0, 1.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 89b2f3def3..ddecdea4b0 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -597,7 +597,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1522,7 +1522,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 7f5bb8374b..2c519aa0b3 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -598,7 +598,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 2344ee9ffe..a602e2a8bb 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -598,7 +598,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 68431153c8..134ef8a955 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -598,7 +598,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index bd7c844041..731bfdf282 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -333,7 +333,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 6c0164d48a..29fe773730 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -596,7 +596,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)____________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1524,7 +1524,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index ae57b8dcf5..441b3c573b 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -175,7 +175,7 @@ pinjalw = 200.0 * maximum allowable value for injected power (MW) (`constraint *----------------Divertor Variables----------------* -divfix = 0.62 * divertor structure vertical thickness (m) +dz_divertor = 0.62 * divertor structure vertical thickness (m) *------------------Error Handling------------------* diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index a89c66b28f..6e78863a92 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -175,7 +175,7 @@ pheat = 50.0 *----------------Divertor Variables----------------* divdum = 1 * Switch for divertor zeff model; 0=calc; 1=input -divfix = 0.621 * Divertor structure vertical thickness (m) +dz_divertor = 0.621 * Divertor structure vertical thickness (m) hldivlim = 10 * Heat load limit (mw/m2) ksic = 1.4 * Power fraction for outboard double-null scrape-off plasma prn1 = 0.4 * N-scrape-off / n-average plasma; diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 9a6dc5c911..f68015e3e9 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -599,7 +599,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1762,7 +1762,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -2925,7 +2925,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -4088,7 +4088,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -5251,7 +5251,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -6414,7 +6414,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -7577,7 +7577,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -8740,7 +8740,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -9903,7 +9903,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -11066,7 +11066,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -12229,7 +12229,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -13392,7 +13392,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -14555,7 +14555,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -15718,7 +15718,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -16881,7 +16881,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -17809,7 +17809,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index ebd14858dc..99812a999c 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -451,7 +451,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1446,7 +1446,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -2441,7 +2441,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -3436,7 +3436,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -4431,7 +4431,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -5426,7 +5426,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -6421,7 +6421,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -7416,7 +7416,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -8411,7 +8411,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -9154,7 +9154,7 @@ pheat = 50.0 *----------------Divertor Variables----------------* divdum = 1 * Switch for divertor zeff model; 0=calc; 1=input -divfix = 0.621 * Divertor structure vertical thickness (m) +dz_divertor = 0.621 * Divertor structure vertical thickness (m) hldivlim = 10 * Heat load limit (mw/m2) ksic = 1.4 * Power fraction for outboard double-null scrape-off plasma prn1 = 0.4 * N-scrape-off / n-average plasma; diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index b5b3cf78d5..100a73215d 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -175,7 +175,7 @@ pheat = 50.0 *----------------Divertor Variables----------------* divdum = 1 * Switch for divertor zeff model; 0=calc; 1=input -divfix = 0.621 * Divertor structure vertical thickness (m) +dz_divertor = 0.621 * Divertor structure vertical thickness (m) hldivlim = 10 * Heat load limit (mw/m2) ksic = 1.4 * Power fraction for outboard double-null scrape-off plasma prn1 = 0.4 * N-scrape-off / n-average plasma; diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 59dd7fff86..96619a287f 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -175,7 +175,7 @@ pheat = 50.0 *----------------Divertor Variables----------------* divdum = 1 * Switch for divertor zeff model; 0=calc; 1=input -divfix = 0.621 * Divertor structure vertical thickness (m) +dz_divertor = 0.621 * Divertor structure vertical thickness (m) hldivlim = 10 * Heat load limit (mw/m2) ksic = 1.4 * Power fraction for outboard double-null scrape-off plasma prn1 = 0.4 * N-scrape-off / n-average plasma; diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a2bc50905e..3d5021ba9c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1649,7 +1649,7 @@ "divcst": 0.0, "divdens": 10000.0, "divdum": 0.0, - "divfix": 0.2, + "dz_divertor": 0.2, "divlife": 0.0, "divmas": 0.0, "divplt": 0.035, @@ -9301,7 +9301,7 @@ "divcst": "divertor direct cost (M$)", "divdens": "divertor structure density (kg/m3)", "divdum": "switch for divertor Zeff model:\n
    \n
  • =0 calc
    • \n
  • =1 input
    • \n
", - "divfix": "divertor structure vertical thickness (m)", + "dz_divertor": "divertor structure vertical thickness (m)", "divlife": "Full power lifetime of divertor (y)", "divmas": "divertor plate mass (kg)", "divplt": "divertor plate thickness (m) (from Spears, Sept 1990)", @@ -12233,7 +12233,7 @@ "lb": 0, "ub": 1 }, - "divfix": { + "dz_divertor": { "lb": 0.1, "ub": 5.0 }, @@ -17908,7 +17908,7 @@ "divclfr", "divdens", "divdum", - "divfix", + "dz_divertor", "divmas", "divplt", "divsur", @@ -20165,7 +20165,7 @@ "divclfr": "real_variable", "divdens": "real_variable", "divdum": "int_variable", - "divfix": "real_variable", + "dz_divertor": "real_variable", "divplt": "real_variable", "beta_norm_max": "real_variable", "dp_he": "real_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 78b6c367ad..e6cbf3db8d 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -333,7 +333,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 4f41c0ec3e..c4c4308927 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -315,7 +315,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 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 8ce604f074..c22a430055 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -175,7 +175,7 @@ pinjalw = 200.0 * maximum allowable value for injected power (MW) (`constraint *----------------Divertor Variables----------------* -divfix = 0.62 * divertor structure vertical thickness (m) +dz_divertor = 0.62 * divertor structure vertical thickness (m) *------------------Error Handling------------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 93912ed8c2..20b5327a85 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2156,7 +2156,7 @@ dz_xpoint_divertor = 0.75 * DESCRIPTION: Top vert gap between plasma and first wall (m) * JUSTIFICATION: Not yet set -divfix = 1.0 +dz_divertor = 1.0 * DESCRIPTION: Divertor Structure Vertical Thickness (m) * JUSTIFICATION: diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index ad37f02853..c292d0e616 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -333,7 +333,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index d16cfcd9f6..d73a6faaeb 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -596,7 +596,7 @@ Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 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)____________________ (dr_cryostat)_______________________ 1.5000E-01 @@ -1524,7 +1524,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 54c017c615..2c1d23a76e 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -371,7 +371,7 @@ class ComponentHalfHeightParam(NamedTuple): z_plasma_xpoint_lower: Any = None z_plasma_xpoint_upper: Any = None idivrt: Any = None - divfix: Any = None + dz_divertor: Any = None icomponent: Any = None expected_icomponent: Any = None expected_half_height: Any = None @@ -395,7 +395,7 @@ class ComponentHalfHeightParam(NamedTuple): z_plasma_xpoint_lower=4.93333333333333333, z_plasma_xpoint_upper=4.93333333333333333, idivrt=1, - divfix=0.62000000000000011, + dz_divertor=0.62000000000000011, icomponent=0, expected_icomponent=0, expected_half_height=5.9532752487304119, @@ -458,7 +458,9 @@ def test_component_half_height( componenthalfheightparam.z_plasma_xpoint_upper, ) monkeypatch.setattr(physics_variables, "idivrt", componenthalfheightparam.idivrt) - monkeypatch.setattr(divertor_variables, "divfix", componenthalfheightparam.divfix) + monkeypatch.setattr( + divertor_variables, "dz_divertor", componenthalfheightparam.dz_divertor + ) half_height = blanket_library_fixture.component_half_height( componenthalfheightparam.icomponent diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py index 91d561e916..48ba9a7a2f 100644 --- a/tests/unit/test_buildings.py +++ b/tests/unit/test_buildings.py @@ -154,7 +154,7 @@ class BldgsSizesParam(NamedTuple): dr_blkt_inboard: Any dr_blkt_outboard: Any r_cp_top: Any - divfix: Any + dz_divertor: Any rmajor: Any rminor: Any tf_radial_dim: Any @@ -297,7 +297,7 @@ class BldgsSizesParam(NamedTuple): dr_blkt_inboard=0.75500000000000012, dr_blkt_outboard=0.98199999999999998, r_cp_top=4.20194118510911, - divfix=0.62100000000000011, + dz_divertor=0.62100000000000011, rmajor=8.8901000000000003, rminor=2.8677741935483869, tf_radial_dim=14.129464674334221, @@ -436,7 +436,7 @@ class BldgsSizesParam(NamedTuple): dr_blkt_inboard=0.75500000000000012, dr_blkt_outboard=0.98199999999999998, r_cp_top=4.20194118510911, - divfix=0.62100000000000011, + dz_divertor=0.62100000000000011, rmajor=8.8901000000000003, rminor=2.8677741935483869, tf_radial_dim=14.129464674334221, @@ -729,7 +729,7 @@ def test_bldgs_sizes(buildings, bldgssizesparam, monkeypatch): build_variables, "dr_blkt_outboard", bldgssizesparam.dr_blkt_outboard ) monkeypatch.setattr(build_variables, "r_cp_top", bldgssizesparam.r_cp_top) - monkeypatch.setattr(divertor_variables, "divfix", bldgssizesparam.divfix) + monkeypatch.setattr(divertor_variables, "dz_divertor", bldgssizesparam.dz_divertor) monkeypatch.setattr(physics_variables, "rmajor", bldgssizesparam.rmajor) monkeypatch.setattr(physics_variables, "rminor", bldgssizesparam.rminor) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 10c0a1c7ab..1ce8322a2e 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -14111,7 +14111,7 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): monkeypatch.setattr(build_variables, "dz_xpoint_divertor", 0.05) # Baseline 2018 monkeypatch.setattr(build_variables, "shldtth", 0.3) # Baseline 2018 monkeypatch.setattr( - divertor_variables, "divfix", 2.05 + divertor_variables, "dz_divertor", 2.05 ) # chosen to achieve H_vv in Table 2 monkeypatch.setattr(build_variables, "dr_tf_shld_gap", 0.05) # Baseline 2018 From 63991e34203dcbbdd029c0f59d233657bdcaa626 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 10:58:46 +0000 Subject: [PATCH 05/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20vgap=5Fvv=5Ftherm?= =?UTF-8?q?alshield=20to=20dz=5Fshld=5Fvv=5Fgap=20for=20consistency=20acro?= =?UTF-8?q?ss=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/machine-build.md | 4 +- process/blanket_library.py | 2 +- process/build.py | 40 +++++++++---------- process/buildings.py | 6 +-- process/io/mfile_comparison.py | 2 +- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 6 +-- source/fortran/build_variables.f90 | 4 +- source/fortran/input.f90 | 6 +-- tests/integration/ref_dicts.json | 10 ++--- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_blanket_library.py | 8 ++-- 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index f59f603bec..0756373174 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -66,7 +66,7 @@ case the machine is not symmetric about the midplane. TF coil 1.576 9.862 (dr_tf_inboard) Gap 0.050 8.286 (dr_tf_shld_gap) Thermal shield 0.050 8.236 (thshield) - Gap 0.050 8.186 (vgap_vv_thermalshield) + Gap 0.050 8.186 (dz_shld_vv_gap) Vacuum vessel (and shielding) 0.600 8.136 (d_vv_top+shldtth) Gap 0.020 7.536 (dr_shld_blkt_gap) Top blanket 0.869 7.516 (blnktth) @@ -78,7 +78,7 @@ case the machine is not symmetric about the midplane. Lower scrape-off 2.002 -8.031 (vgap) Divertor structure 0.621 -8.652 (dz_divertor) Vacuum vessel (and shielding) 1.000 -9.652 (d_vv_bot+shldlth) - Gap 0.050 -9.702 (vgap_vv_thermalshield) + Gap 0.050 -9.702 (dz_shld_vv_gap) Thermal shield 0.050 -9.752 (thshield) Gap 0.050 -9.802 (dr_tf_shld_gap) TF coil 1.576 -11.379 (dr_tf_inboard) diff --git a/process/blanket_library.py b/process/blanket_library.py index 46f2693d97..e521be2ca5 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -112,7 +112,7 @@ def component_half_height(self, icomponent: int): elif icomponent == 2: hbot = ( build_variables.hmax - - build_variables.vgap_vv_thermalshield + - build_variables.dz_shld_vv_gap - build_variables.d_vv_bot ) else: diff --git a/process/build.py b/process/build.py index 2e429045d2..fe4bdae86c 100644 --- a/process/build.py +++ b/process/build.py @@ -143,7 +143,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap + build_variables.dz_shld_thermal - + build_variables.vgap_vv_thermalshield + + build_variables.dz_shld_vv_gap + build_variables.d_vv_top + build_variables.shldtth + divertor_variables.dz_divertor @@ -209,17 +209,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Gap", - build_variables.vgap_vv_thermalshield, + build_variables.dz_shld_vv_gap, vbuild, - "(vgap_vv_thermalshield)", + "(dz_shld_vv_gap)", ) po.ovarre( self.mfile, "Vessel - TF coil vertical gap (m)", - "(vgap_vv_thermalshield)", - build_variables.vgap_vv_thermalshield, + "(dz_shld_vv_gap)", + build_variables.dz_shld_vv_gap, ) - vbuild = vbuild - build_variables.vgap_vv_thermalshield + vbuild = vbuild - build_variables.dz_shld_vv_gap po.obuild( self.outfile, @@ -351,13 +351,13 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.d_vv_bot, ) - vbuild = vbuild - build_variables.vgap_vv_thermalshield + vbuild = vbuild - build_variables.dz_shld_vv_gap po.obuild( self.outfile, "Gap", - build_variables.vgap_vv_thermalshield, + build_variables.dz_shld_vv_gap, vbuild, - "(vgap_vv_thermalshield)", + "(dz_shld_vv_gap)", ) vbuild = vbuild - build_variables.dz_shld_thermal @@ -416,7 +416,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap + build_variables.dz_shld_thermal - + build_variables.vgap_vv_thermalshield + + build_variables.dz_shld_vv_gap + 0.5e0 * (build_variables.d_vv_top + build_variables.d_vv_bot) + build_variables.dr_shld_blkt_gap + build_variables.shldtth @@ -484,17 +484,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Gap", - build_variables.vgap_vv_thermalshield, + build_variables.dz_shld_vv_gap, vbuild, - "(vgap_vv_thermalshield)", + "(dz_shld_vv_gap)", ) po.ovarre( self.mfile, "Vessel - TF coil vertical gap (m)", - "(vgap_vv_thermalshield)", - build_variables.vgap_vv_thermalshield, + "(dz_shld_vv_gap)", + build_variables.dz_shld_vv_gap, ) - vbuild = vbuild - build_variables.vgap_vv_thermalshield + vbuild = vbuild - build_variables.dz_shld_vv_gap po.obuild( self.outfile, @@ -647,13 +647,13 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.d_vv_bot, ) - vbuild = vbuild - build_variables.vgap_vv_thermalshield + vbuild = vbuild - build_variables.dz_shld_vv_gap po.obuild( self.outfile, "Gap", - build_variables.vgap_vv_thermalshield, + build_variables.dz_shld_vv_gap, vbuild, - "(vgap_vv_thermalshield)", + "(dz_shld_vv_gap)", ) vbuild = vbuild - build_variables.dz_shld_thermal @@ -737,7 +737,7 @@ def calculate_vertical_build(self, output: bool) -> None: + divertor_variables.dz_divertor + build_variables.shldlth + build_variables.d_vv_bot - + build_variables.vgap_vv_thermalshield + + build_variables.dz_shld_vv_gap + build_variables.dz_shld_thermal + build_variables.dr_tf_shld_gap ) @@ -751,7 +751,7 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap + build_variables.dz_shld_thermal - + build_variables.vgap_vv_thermalshield + + build_variables.dz_shld_vv_gap + build_variables.d_vv_top + build_variables.shldtth + build_variables.dr_shld_blkt_gap diff --git a/process/buildings.py b/process/buildings.py index 8071225081..072705d2e4 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -83,7 +83,7 @@ def run(self, output: bool = False): tfcoil_variables.n_tf_coils, build_variables.rsldo, build_variables.rsldi, - 2.0e0 * (build_variables.hmax - build_variables.vgap_vv_thermalshield) + 2.0e0 * (build_variables.hmax - build_variables.dz_shld_vv_gap) - build_variables.d_vv_top - build_variables.d_vv_bot, fwbs_variables.whtshld, @@ -543,7 +543,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap + build_variables.dz_shld_thermal - + build_variables.vgap_vv_thermalshield + + build_variables.dz_shld_vv_gap ) ) hcomp_rad_thk = ( @@ -588,7 +588,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap + build_variables.dz_shld_thermal - + build_variables.vgap_vv_thermalshield + + build_variables.dz_shld_vv_gap ) ) hcomp_rad_thk = ( diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 7ba438c4d8..a19fd7e90b 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -264,7 +264,7 @@ "dz_divertor", "d_vv_bot", "shldlth", - "vgap_vv_thermalshield", + "dz_shld_vv_gap", ] diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 8146c1a886..78aa9dd45a 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -123,7 +123,7 @@ "ips": "i_pfirsch_schluter_current", "bootipf": "bootstrap_current_fraction", "bscfmax": "bootstrap_current_fraction_max", - "vgap2": "vgap_vv_thermalshield", + "vgap2": "dz_shld_vv_gap", "vgap": "dz_xpoint_divertor", "ftritbm": "f_tritium_bream", "enbeam": "beam_energy", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index c0d69f2ea2..db72bab0ca 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -157,7 +157,7 @@ def parse_args(args): "dz_divertor", "shldlth", "d_vv_bot", - "vgap_vv_thermalshield", + "dz_shld_vv_gap", "dz_shld_thermal", "dr_tf_shld_gap", "dr_tf_inboard", @@ -3648,7 +3648,7 @@ def main(args=None): "dz_divertor", "shldtth", "d_vv_top", - "vgap_vv_thermalshield", + "dz_shld_vv_gap", "dz_shld_thermal", "dr_tf_shld_gap", "dr_tf_inboard", @@ -3662,7 +3662,7 @@ def main(args=None): "dr_shld_blkt_gap", "shldtth", "d_vv_top", - "vgap_vv_thermalshield", + "dz_shld_vv_gap", "dz_shld_thermal", "dr_tf_shld_gap", "dr_tf_inboard", diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index 2b83dba0f8..ab720f81d9 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -267,7 +267,7 @@ module build_variables real(dp) :: dz_shld_thermal !! TF-VV thermal shield thickness, vertical build (m) - real(dp) :: vgap_vv_thermalshield + real(dp) :: dz_shld_vv_gap !! vertical gap between vacuum vessel and thermal shields (m) real(dp) :: dz_xpoint_divertor @@ -382,7 +382,7 @@ subroutine init_build_variables dr_shld_thermal_inboard = 0.05D0 dr_shld_thermal_outboard = 0.05D0 dz_shld_thermal = 0.05D0 - vgap_vv_thermalshield = 0.163D0 + dz_shld_vv_gap = 0.163D0 dz_xpoint_divertor= 0.0D0 vgaptop = 0.60D0 dr_shld_blkt_gap = 0.05D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index ccfaf4a4d5..5c03c0cde4 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -191,7 +191,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use constants, only: dcopper, dalu use global_variables, only: run_tests, verbose, maxcal, runtitle use build_variables, only: tf_in_cs, blbmoth, blbuith, dr_shld_outboard, & - shldtth, shldlth, vgap_vv_thermalshield, plleni, dr_fw_outboard, dr_shld_blkt_gap, & + shldtth, shldlth, dz_shld_vv_gap, plleni, dr_fw_outboard, dr_shld_blkt_gap, & dr_shld_thermal_inboard, dr_shld_thermal_outboard, dz_shld_thermal, i_cs_precomp, & blbpith, aplasmin, blbuoth, dr_tf_inboard, & iohcl, dr_tf_shld_gap, f_z_cryostat, dr_bore, plleno, dr_fw_plasma_gap_inboard, gapomin, dr_cryostat, & @@ -1428,8 +1428,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dz_xpoint_divertor') call parse_real_variable('dz_xpoint_divertor', dz_xpoint_divertor, 0.0D0, 10.0D0, & 'Vert gap between x-pnt and divertor (m)') - case ('vgap_vv_thermalshield') - call parse_real_variable('vgap_vv_thermalshield', vgap_vv_thermalshield, 0.0D0, 10.0D0, & + case ('dz_shld_vv_gap') + call parse_real_variable('dz_shld_vv_gap', dz_shld_vv_gap, 0.0D0, 10.0D0, & 'Vert gap between TF coil and shield (m)') case ('vgaptop') call parse_real_variable('vgaptop', vgaptop, 0.0D0, 10.0D0, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 3d5021ba9c..16edbf2fbd 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7925,7 +7925,7 @@ "vfshld": 0.25, "vftf": 0.4, "dz_xpoint_divertor": 0.0, - "vgap_vv_thermalshield": 0.163, + "dz_shld_vv_gap": 0.163, "vgaptop": 0.6, "vlabel": "", "vlabel_2": "", @@ -11034,7 +11034,7 @@ "vfshld": "coolant void fraction in shield", "vftf": "coolant fraction of TFC 'cable' (`i_tf_sup=1`), or of TFC leg (`i_tf_ssup=0`)", "dz_xpoint_divertor": "vertical gap between x-point and divertor (m) (if = 0, it is calculated)", - "vgap_vv_thermalshield": "vertical gap between vacuum vessel and thermal shields (m)", + "dz_shld_vv_gap": "vertical gap between vacuum vessel and thermal shields (m)", "vgaptop": "vertical gap between top of plasma and first wall (m) (= dz_xpoint_divertor if double-null)", "vlabel": "scan value name label", "vlabel_2": "scan value name label (2nd dimension)", @@ -14969,7 +14969,7 @@ "lb": 0.0, "ub": 10.0 }, - "vgap_vv_thermalshield": { + "dz_shld_vv_gap": { "lb": 0.0, "ub": 10.0 }, @@ -17066,7 +17066,7 @@ "dr_tf_outboard", "dr_tf_shld_gap", "thshield", - "vgap_vv_thermalshield", + "dz_shld_vv_gap", "dz_xpoint_divertor", "vgaptop", "dr_shld_blkt_gap", @@ -20881,7 +20881,7 @@ "vfshld": "real_variable", "vftf": "real_variable", "dz_xpoint_divertor": "real_variable", - "vgap_vv_thermalshield": "real_variable", + "dz_shld_vv_gap": "real_variable", "vgaptop": "real_variable", "dr_shld_blkt_gap": "real_variable", "vvhealw": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 20b5327a85..16030c9eff 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2176,7 +2176,7 @@ dz_shld_thermal = 0.075 * DESCRIPTION: TF-VV Thermal Shield Thickness (m) * JUSTIFICATION: -vgap_vv_thermalshield = 2.0 +dz_shld_vv_gap = 2.0 * DESCRIPTION: Vertical Gap Between Vacuum Vessel and TF coil (m) * JUSTIFICATION: diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 2c1d23a76e..fbdb06af59 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -359,7 +359,7 @@ def test_pumppower_secondary_pb_li(monkeypatch, blanket_library_fixture): class ComponentHalfHeightParam(NamedTuple): hmax: Any = None dz_xpoint_divertor: Any = None - vgap_vv_thermalshield: Any = None + dz_shld_vv_gap: Any = None blnktth: Any = None shldtth: Any = None dr_fw_plasma_gap_inboard: Any = None @@ -383,7 +383,7 @@ class ComponentHalfHeightParam(NamedTuple): ComponentHalfHeightParam( hmax=8.8182171641274945, dz_xpoint_divertor=2.0018838307941582, - vgap_vv_thermalshield=0.16300000000000001, + dz_shld_vv_gap=0.16300000000000001, blnktth=0.85000000000000009, shldtth=0.59999999999999998, dr_fw_plasma_gap_inboard=0.25, @@ -424,8 +424,8 @@ def test_component_half_height( ) monkeypatch.setattr( build_variables, - "vgap_vv_thermalshield", - componenthalfheightparam.vgap_vv_thermalshield, + "dz_shld_vv_gap", + componenthalfheightparam.dz_shld_vv_gap, ) monkeypatch.setattr(build_variables, "blnktth", componenthalfheightparam.blnktth) monkeypatch.setattr(build_variables, "shldtth", componenthalfheightparam.shldtth) From 371b7f079b2aed894f311dc0144fbe8f0cc13bcc Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 11:06:23 +0000 Subject: [PATCH 06/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20vgaptop=20to=20dz?= =?UTF-8?q?=5Ffw=5Fplasma=5Fgap=20for=20consistency=20across=20multiple=20?= =?UTF-8?q?files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/machine-build.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 +- process/build.py | 36 ++++++++++--------- process/init.py | 4 ++- process/io/plot_proc.py | 4 +-- source/fortran/build_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 | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++++++-------- tests/integration/ref_dicts.json | 10 +++--- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 20 files changed, 62 insertions(+), 58 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index 0756373174..dd25e18159 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -71,7 +71,7 @@ case the machine is not symmetric about the midplane. Gap 0.020 7.536 (dr_shld_blkt_gap) Top blanket 0.869 7.516 (blnktth) Top first wall 0.018 6.647 (fwtth) - Top scrape-off 0.600 6.629 (vgaptop) + Top scrape-off 0.600 6.629 (dz_fw_plasma_gap) Plasma top 6.029 6.029 (z_plasma_xpoint_upper) Midplane 0.000 -0.000 Plasma bottom 6.029 -6.029 (z_plasma_xpoint_upper) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index d7e15d1203..b2e3af30dd 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -598,7 +598,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index ba61c7207f..d06fc1d968 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -595,7 +595,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 1a5051b791..4e8b1b65e1 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -595,7 +595,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index bc14b9e3bc..dda606e55e 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -595,7 +595,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 4c83c2b917..a0c3a7361c 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -595,7 +595,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/process/build.py b/process/build.py index fe4bdae86c..ac2ba37d22 100644 --- a/process/build.py +++ b/process/build.py @@ -147,7 +147,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.d_vv_top + build_variables.shldtth + divertor_variables.dz_divertor - + build_variables.vgaptop + + build_variables.dz_fw_plasma_gap + build_variables.z_plasma_xpoint_upper ) @@ -260,17 +260,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Top scrape-off", - build_variables.vgaptop, + build_variables.dz_fw_plasma_gap, vbuild, - "(vgaptop)", + "(dz_fw_plasma_gap)", ) po.ovarre( self.mfile, "Top scrape-off vertical thickness (m)", - "(vgaptop)", - build_variables.vgaptop, + "(dz_fw_plasma_gap)", + build_variables.dz_fw_plasma_gap, ) - vbuild = vbuild - build_variables.vgaptop + vbuild = vbuild - build_variables.dz_fw_plasma_gap po.obuild( self.outfile, @@ -423,7 +423,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.blnktth + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) - + build_variables.vgaptop + + build_variables.dz_fw_plasma_gap + build_variables.z_plasma_xpoint_upper ) @@ -556,17 +556,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Top scrape-off", - build_variables.vgaptop, + build_variables.dz_fw_plasma_gap, vbuild, - "(vgaptop)", + "(dz_fw_plasma_gap)", ) po.ovarre( self.mfile, "Top scrape-off vertical thickness (m)", - "(vgaptop)", - build_variables.vgaptop, + "(dz_fw_plasma_gap)", + build_variables.dz_fw_plasma_gap, ) - vbuild = vbuild - build_variables.vgaptop + vbuild = vbuild - build_variables.dz_fw_plasma_gap po.obuild( self.outfile, @@ -758,7 +758,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.blnktth + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) - + build_variables.vgaptop + + build_variables.dz_fw_plasma_gap + build_variables.z_plasma_xpoint_upper ) build_variables.hpfdif = ( @@ -1675,14 +1675,14 @@ def calculate_radial_build(self, output: bool) -> None: ) if physics_variables.i_single_null == 1: - # Check if build_variables.vgaptop has been set too small - build_variables.vgaptop = max( + # Check if build_variables.dz_fw_plasma_gap has been set too small + build_variables.dz_fw_plasma_gap = max( 0.5e0 * ( build_variables.dr_fw_plasma_gap_inboard + build_variables.dr_fw_plasma_gap_outboard ), - build_variables.vgaptop, + build_variables.dz_fw_plasma_gap, ) # Calculate pre-compression structure thickness is build_variables.i_cs_precomp=1 @@ -1982,7 +1982,9 @@ def calculate_radial_build(self, output: bool) -> None: if physics_variables.idivrt == 2: # (i.e. physics_variables.i_single_null=0) htop = hbot else: - htop = build_variables.z_plasma_xpoint_upper + build_variables.vgaptop + htop = ( + build_variables.z_plasma_xpoint_upper + build_variables.dz_fw_plasma_gap + ) hfw = 0.5e0 * (htop + hbot) diff --git a/process/init.py b/process/init.py index bd7d32a7d9..f293005bd2 100644 --- a/process/init.py +++ b/process/init.py @@ -658,7 +658,9 @@ def check_process(): if fortran.physics_variables.i_single_null == 0: fortran.physics_variables.idivrt = 2 - fortran.build_variables.vgaptop = fortran.build_variables.dz_xpoint_divertor + fortran.build_variables.dz_fw_plasma_gap = ( + fortran.build_variables.dz_xpoint_divertor + ) fortran.build_variables.shldtth = fortran.build_variables.shldlth fortran.build_variables.d_vv_top = fortran.build_variables.d_vv_bot warn("Double-null: Upper vertical build forced to match lower", stacklevel=2) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index db72bab0ca..251bfcc5fc 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3644,7 +3644,7 @@ def main(args=None): if int(m_file.data["i_single_null"].get_scan(scan)) == 0: vertical_upper = [ "z_plasma_xpoint_upper", - "vgaptop", + "dz_fw_plasma_gap", "dz_divertor", "shldtth", "d_vv_top", @@ -3656,7 +3656,7 @@ def main(args=None): else: vertical_upper = [ "z_plasma_xpoint_upper", - "vgaptop", + "dz_fw_plasma_gap", "fwtth", "blnktth", "dr_shld_blkt_gap", diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index ab720f81d9..0bd5fbd4c1 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -273,7 +273,7 @@ module build_variables real(dp) :: dz_xpoint_divertor !! vertical gap between x-point and divertor (m) (if = 0, it is calculated) - real(dp) :: vgaptop + real(dp) :: dz_fw_plasma_gap !! vertical gap between top of plasma and first wall (m) (= dz_xpoint_divertor if double-null) real(dp) :: dr_shld_blkt_gap @@ -384,7 +384,7 @@ subroutine init_build_variables dz_shld_thermal = 0.05D0 dz_shld_vv_gap = 0.163D0 dz_xpoint_divertor= 0.0D0 - vgaptop = 0.60D0 + dz_fw_plasma_gap = 0.60D0 dr_shld_blkt_gap = 0.05D0 plleni = 1.0D0 plleno = 1.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 5c03c0cde4..b21ac8fa7b 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) blbpith, aplasmin, blbuoth, dr_tf_inboard, & iohcl, dr_tf_shld_gap, f_z_cryostat, dr_bore, plleno, dr_fw_plasma_gap_inboard, gapomin, dr_cryostat, & rinboard, dr_blkt_outboard, fseppc, plsepo, dr_blkt_inboard, & - dr_cs, plsepi, blbmith, dr_cs_tf_gap, fcspc, dr_fw_plasma_gap_outboard, vgaptop, & + dr_cs, plsepi, blbmith, dr_cs_tf_gap, fcspc, dr_fw_plasma_gap_outboard, dz_fw_plasma_gap, & blbpoth, dr_shld_vv_gap_inboard, dr_fw_inboard, dz_xpoint_divertor, dr_shld_inboard, sigallpc, tfootfi, f_avspace,& r_cp_top, dr_vv_inboard, dr_vv_outboard, d_vv_top, d_vv_bot, f_r_cp, i_r_cp_top use buildings_variables, only: hcwt, conv, wgt, trcl, rbwt, & @@ -1431,8 +1431,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dz_shld_vv_gap') call parse_real_variable('dz_shld_vv_gap', dz_shld_vv_gap, 0.0D0, 10.0D0, & 'Vert gap between TF coil and shield (m)') - case ('vgaptop') - call parse_real_variable('vgaptop', vgaptop, 0.0D0, 10.0D0, & + case ('dz_fw_plasma_gap') + call parse_real_variable('dz_fw_plasma_gap', dz_fw_plasma_gap, 0.0D0, 10.0D0, & 'Top vert gap between plasma and first wall (m)') case ('dr_shld_blkt_gap') call parse_real_variable('dr_shld_blkt_gap', dr_shld_blkt_gap, 0.0D0, 5.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index ddecdea4b0..ce84fb3cd5 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -594,7 +594,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 2c519aa0b3..88d9f23b5b 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -595,7 +595,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index a602e2a8bb..8721042ab3 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -595,7 +595,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 134ef8a955..c34442eabf 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -595,7 +595,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 29fe773730..b4a9cffc3b 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -593,7 +593,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index f68015e3e9..647c89465b 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -596,7 +596,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -1759,7 +1759,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -2922,7 +2922,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -4085,7 +4085,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -5248,7 +5248,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -6411,7 +6411,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -7574,7 +7574,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -8737,7 +8737,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -9900,7 +9900,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -11063,7 +11063,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -12226,7 +12226,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -13389,7 +13389,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -14552,7 +14552,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -15715,7 +15715,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 @@ -16878,7 +16878,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 16edbf2fbd..0569aa1c66 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7926,7 +7926,7 @@ "vftf": 0.4, "dz_xpoint_divertor": 0.0, "dz_shld_vv_gap": 0.163, - "vgaptop": 0.6, + "dz_fw_plasma_gap": 0.6, "vlabel": "", "vlabel_2": "", "vlam": 0.0, @@ -11035,7 +11035,7 @@ "vftf": "coolant fraction of TFC 'cable' (`i_tf_sup=1`), or of TFC leg (`i_tf_ssup=0`)", "dz_xpoint_divertor": "vertical gap between x-point and divertor (m) (if = 0, it is calculated)", "dz_shld_vv_gap": "vertical gap between vacuum vessel and thermal shields (m)", - "vgaptop": "vertical gap between top of plasma and first wall (m) (= dz_xpoint_divertor if double-null)", + "dz_fw_plasma_gap": "vertical gap between top of plasma and first wall (m) (= dz_xpoint_divertor if double-null)", "vlabel": "scan value name label", "vlabel_2": "scan value name label (2nd dimension)", "vlam": "", @@ -14973,7 +14973,7 @@ "lb": 0.0, "ub": 10.0 }, - "vgaptop": { + "dz_fw_plasma_gap": { "lb": 0.0, "ub": 10.0 }, @@ -17068,7 +17068,7 @@ "thshield", "dz_shld_vv_gap", "dz_xpoint_divertor", - "vgaptop", + "dz_fw_plasma_gap", "dr_shld_blkt_gap", "plleni", "plleno", @@ -20882,7 +20882,7 @@ "vftf": "real_variable", "dz_xpoint_divertor": "real_variable", "dz_shld_vv_gap": "real_variable", - "vgaptop": "real_variable", + "dz_fw_plasma_gap": "real_variable", "dr_shld_blkt_gap": "real_variable", "vvhealw": "real_variable", "walalw": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 16030c9eff..61d51e8602 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2152,7 +2152,7 @@ dz_xpoint_divertor = 0.75 * DESCRIPTION: Vertical Gap Between x-point and Divertor (m) * JUSTIFICATION: -*vgaptop = +*dz_fw_plasma_gap = * DESCRIPTION: Top vert gap between plasma and first wall (m) * JUSTIFICATION: Not yet set diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index d73a6faaeb..79cad472a9 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -593,7 +593,7 @@ Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 From e8dfc29742c06f77991017972a503b6c2a28be31 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 11:12:23 +0000 Subject: [PATCH 07/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20blnktth=20to=20dz?= =?UTF-8?q?=5Fblkt=5Ftop=20for=20consistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/machine-build.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 | 10 +++--- process/build.py | 18 +++++------ process/geometry/blanket_geometry.py | 28 ++++++++-------- process/geometry/firstwall_geometry.py | 16 +++++----- process/io/obsolete_vars.py | 4 +-- process/io/plot_proc.py | 18 +++++------ process/stellarator.py | 6 ++-- source/fortran/build_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 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 32 +++++++++++-------- tests/unit/test_stellarator.py | 18 ++++++----- 27 files changed, 130 insertions(+), 122 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index dd25e18159..4d87792d4d 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -69,7 +69,7 @@ case the machine is not symmetric about the midplane. Gap 0.050 8.186 (dz_shld_vv_gap) Vacuum vessel (and shielding) 0.600 8.136 (d_vv_top+shldtth) Gap 0.020 7.536 (dr_shld_blkt_gap) - Top blanket 0.869 7.516 (blnktth) + Top blanket 0.869 7.516 (dz_blkt_top) Top first wall 0.018 6.647 (fwtth) Top scrape-off 0.600 6.629 (dz_fw_plasma_gap) Plasma top 6.029 6.029 (z_plasma_xpoint_upper) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index b2e3af30dd..add6b2624a 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -596,7 +596,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index d06fc1d968..e156c7cbb3 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -593,7 +593,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 4e8b1b65e1..b8ff2a31e9 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -593,7 +593,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index dda606e55e..d6858063d6 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -593,7 +593,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a0c3a7361c..a15e817c83 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -593,7 +593,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 0cfc899b22..c69ca14477 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -446,7 +446,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -1441,7 +1441,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -2436,7 +2436,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -3431,7 +3431,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -4426,7 +4426,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -5421,7 +5421,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -6416,7 +6416,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -7411,7 +7411,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -8406,7 +8406,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 diff --git a/process/blanket_library.py b/process/blanket_library.py index e521be2ca5..b62bf919ce 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -99,7 +99,7 @@ def component_half_height(self, icomponent: int): build_variables.z_plasma_xpoint_lower + build_variables.dz_xpoint_divertor + divertor_variables.dz_divertor - - build_variables.blnktth + - build_variables.dz_blkt_top ) # Sheild elif icomponent == 1: @@ -132,10 +132,10 @@ def component_half_height(self, icomponent: int): ) # Shield if icomponent == 1: - htop = htop + build_variables.blnktth + htop = htop + build_variables.dz_blkt_top # Vacuum Vessel if icomponent == 2: - htop = htop + build_variables.blnktth + build_variables.shldtth + htop = htop + build_variables.dz_blkt_top + build_variables.shldtth # Average of top and bottom (m) return 0.5 * (htop + hbot) @@ -199,7 +199,7 @@ def dshaped_component(self, icomponent: int): blanket_library.hblnkt, build_variables.dr_blkt_inboard, build_variables.dr_blkt_outboard, - build_variables.blnktth, + build_variables.dz_blkt_top, ) elif icomponent == 1: ( @@ -290,7 +290,7 @@ def elliptical_component(self, icomponent: int): blanket_library.hblnkt, build_variables.dr_blkt_inboard, build_variables.dr_blkt_outboard, - build_variables.blnktth, + build_variables.dz_blkt_top, ) if icomponent == 1: ( diff --git a/process/build.py b/process/build.py index ac2ba37d22..f579b4a5e9 100644 --- a/process/build.py +++ b/process/build.py @@ -420,7 +420,7 @@ def calculate_vertical_build(self, output: bool) -> None: + 0.5e0 * (build_variables.d_vv_top + build_variables.d_vv_bot) + build_variables.dr_shld_blkt_gap + build_variables.shldtth - + build_variables.blnktth + + build_variables.dz_blkt_top + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) + build_variables.dz_fw_plasma_gap @@ -529,17 +529,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Top blanket", - build_variables.blnktth, + build_variables.dz_blkt_top, vbuild, - "(blnktth)", + "(dz_blkt_top)", ) po.ovarre( self.mfile, "Top blanket vertical thickness (m)", - "(blnktth)", - build_variables.blnktth, + "(dz_blkt_top)", + build_variables.dz_blkt_top, ) - vbuild = vbuild - build_variables.blnktth + vbuild = vbuild - build_variables.dz_blkt_top fwtth = 0.5e0 * ( build_variables.dr_fw_inboard + build_variables.dr_fw_outboard @@ -755,7 +755,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.d_vv_top + build_variables.shldtth + build_variables.dr_shld_blkt_gap - + build_variables.blnktth + + build_variables.dz_blkt_top + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) + build_variables.dz_fw_plasma_gap @@ -1670,7 +1670,7 @@ def calculate_radial_build(self, output: bool) -> None: ) # Top/bottom blanket thickness - build_variables.blnktth = 0.5e0 * ( + build_variables.dz_blkt_top = 0.5e0 * ( build_variables.dr_blkt_inboard + build_variables.dr_blkt_outboard ) @@ -1976,7 +1976,7 @@ def calculate_radial_build(self, output: bool) -> None: build_variables.z_plasma_xpoint_lower + build_variables.dz_xpoint_divertor + divertor_variables.dz_divertor - - build_variables.blnktth + - build_variables.dz_blkt_top - 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) ) if physics_variables.idivrt == 2: # (i.e. physics_variables.i_single_null=0) diff --git a/process/geometry/blanket_geometry.py b/process/geometry/blanket_geometry.py index 0f5693cbee..52cea350dc 100644 --- a/process/geometry/blanket_geometry.py +++ b/process/geometry/blanket_geometry.py @@ -16,7 +16,7 @@ def blanket_geometry_single_null( cumulative_upper: dict, triang: float, cumulative_lower: dict, - blnktth: float, + dz_blkt_top: float, c_shldith: float, c_blnkoth: float, dr_blkt_inboard: float, @@ -38,8 +38,8 @@ def blanket_geometry_single_null( :type triang: float :param cumulative_lower: cumulative vertical thicknesses of components below the midplane :type cumulative_lower: dict - :param blnktth: top blanket vertical thickness - :type blnktth: float + :param dz_blkt_top: top blanket vertical thickness + :type dz_blkt_top: float :param c_shldith: inboard shield thickness :type c_shldith: float :param c_blnkoth: outboard blanket radial thickness @@ -52,7 +52,7 @@ def blanket_geometry_single_null( :rtype: ArbitraryGeometry """ # Upper blanket outer surface - kapx = cumulative_upper["blnktth"] / rminx_outer + kapx = cumulative_upper["dz_blkt_top"] / rminx_outer rs_upper_outboard, zs_upper_outboard = dh_vertices( radx_outer, rminx_outer, triang, kapx ) @@ -73,7 +73,7 @@ def blanket_geometry_single_null( zs_lower_inboard, ) = blanket_geometry_lower( triang=triang, - blnktth=blnktth, + dz_blkt_top=dz_blkt_top, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -99,7 +99,7 @@ def blanket_geometry_single_null( def blanket_geometry_lower( triang: float, - blnktth: float, + dz_blkt_top: float, c_shldith: float, c_blnkoth: float, dr_blkt_inboard: float, @@ -110,8 +110,8 @@ def blanket_geometry_lower( :param triang: plasma triangularity :type triang: float - :param blnktth: top blanket vertical thickness - :type blnktth: float + :param dz_blkt_top: top blanket vertical thickness + :type dz_blkt_top: float :param c_shldith: inboard shield thickness :type c_shldith: float :param c_blnkoth: outboard blanket radial thickness @@ -132,7 +132,7 @@ def blanket_geometry_lower( dr_blkt_inboard, dr_blkt_outboard, divgap, - -blnktth, + -dz_blkt_top, triang, ) # outboard radial and vertical coordinates @@ -148,7 +148,7 @@ def blanket_geometry_lower( def blanket_geometry_double_null( cumulative_lower: dict, triang: float, - blnktth: float, + dz_blkt_top: float, c_shldith: float, c_blnkoth: float, dr_blkt_inboard: float, @@ -161,8 +161,8 @@ def blanket_geometry_double_null( :type cumulative_lower: dict :param triang: plasma triangularity :type triang: float - :param blnktth: top blanket vertical thickness - :type blnktth: float + :param dz_blkt_top: top blanket vertical thickness + :type dz_blkt_top: float :param c_shldith: inboard shield thickness :type c_shldith: float :param c_blnkoth: outboard blanket radial thickness @@ -184,7 +184,7 @@ def blanket_geometry_double_null( zs_lower_inboard, ) = blanket_geometry_lower( triang=triang, - blnktth=blnktth, + dz_blkt_top=dz_blkt_top, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -202,7 +202,7 @@ def blanket_geometry_double_null( zs_upper_inboard, ) = blanket_geometry_lower( triang=triang, - blnktth=blnktth, + dz_blkt_top=dz_blkt_top, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, diff --git a/process/geometry/firstwall_geometry.py b/process/geometry/firstwall_geometry.py index a97f5b5439..fc1e06149e 100644 --- a/process/geometry/firstwall_geometry.py +++ b/process/geometry/firstwall_geometry.py @@ -16,7 +16,7 @@ def first_wall_geometry_single_null( cumulative_upper: dict, triang: float, cumulative_lower: dict, - blnktth: float, + dz_blkt_top: float, c_blnkith: float, c_fwoth: float, dr_fw_inboard: float, @@ -39,8 +39,8 @@ def first_wall_geometry_single_null( :type triang: float :param cumulative_lower: cumulative vertical thicknesses of components below the midplane :type cumulative_lower: dict - :param blnktth: top blanket vertical thickness - :type blnktth: float + :param dz_blkt_top: top blanket vertical thickness + :type dz_blkt_top: float :param c_blnkith: inboard blanket vertical thickness :type c_blnkith: float :param c_fwoth: outboard first wall vertical thickness @@ -67,7 +67,7 @@ def first_wall_geometry_single_null( # Lower first wall divgap = cumulative_lower["dz_divertor"] - top_point = divgap + blnktth + top_point = divgap + dz_blkt_top ( rs_lower_outboard, zs_lower_outboard, @@ -150,7 +150,7 @@ def first_wall_geometry_lower( def first_wall_geometry_double_null( cumulative_lower: dict, triang: float, - blnktth: float, + dz_blkt_top: float, c_blnkith: float, c_fwoth: float, dr_fw_inboard: float, @@ -164,8 +164,8 @@ def first_wall_geometry_double_null( :type cumulative_lower: dict :param triang: plasma triangularity :type triang: float - :param blnktth: top blanket vertical thickness - :type blnktth: float + :param dz_blkt_top: top blanket vertical thickness + :type dz_blkt_top: float :param c_blnkith: inboard blanket vertical thickness :type c_blnkith: float :param c_fwoth: outboard first wall vertical thickness @@ -181,7 +181,7 @@ def first_wall_geometry_double_null( """ # Lower first wall divgap = cumulative_lower["dz_divertor"] - top_point = divgap + blnktth + top_point = divgap + dz_blkt_top ( rs_lower_outboard, zs_lower_outboard, diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 78aa9dd45a..83460b053f 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -113,7 +113,7 @@ "fvolbo": "fhole", "fvolcry": None, "idhe3": "f_helium3", - "blnktth": None, + "dz_blkt_top": None, "theat": "t_fusion_ramp", "ieped": None, "eped_sf": None, @@ -245,7 +245,7 @@ OBS_VARS_HELP = { "iculdl": "(use IDENSL=3 for equivalent model to ICULDL=0). ", - "blnktth": "WARNING. BLNKTTH is now always calculated rather than input - please remove it from the input file. ", + "dz_blkt_top": "WARNING. BLNKTTH is now always calculated rather than input - please remove it from the input file. ", } kallenbach_list = [ diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 251bfcc5fc..3181627648 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -1376,9 +1376,9 @@ def plot_blanket(axis, mfile_data, scan, colour_scheme) -> None: i_single_null = mfile_data.data["i_single_null"].get_scan(scan) triang_95 = mfile_data.data["triang95"].get_scan(scan) if int(i_single_null) == 1: - blnktth = mfile_data.data["blnktth"].get_scan(scan) + dz_blkt_top = mfile_data.data["dz_blkt_top"].get_scan(scan) else: - blnktth = 0.0 + dz_blkt_top = 0.0 c_shldith = cumulative_radial_build("dr_shld_inboard", mfile_data, scan) c_blnkoth = cumulative_radial_build("dr_blkt_outboard", mfile_data, scan) @@ -1411,7 +1411,7 @@ def plot_blanket(axis, mfile_data, scan, colour_scheme) -> None: cumulative_upper=cumulative_upper, triang=triang_95, cumulative_lower=cumulative_lower, - blnktth=blnktth, + dz_blkt_top=dz_blkt_top, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -1437,7 +1437,7 @@ def plot_blanket(axis, mfile_data, scan, colour_scheme) -> None: bg_double_null = blanket_geometry_double_null( cumulative_lower=cumulative_lower, triang=triang_95, - blnktth=blnktth, + dz_blkt_top=dz_blkt_top, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -1478,10 +1478,10 @@ def plot_firstwall(axis, mfile_data, scan, colour_scheme): i_single_null = mfile_data.data["i_single_null"].get_scan(scan) triang_95 = mfile_data.data["triang95"].get_scan(scan) if int(i_single_null) == 1: - blnktth = mfile_data.data["blnktth"].get_scan(scan) + dz_blkt_top = mfile_data.data["dz_blkt_top"].get_scan(scan) tfwvt = mfile_data.data["fwtth"].get_scan(scan) else: - blnktth = tfwvt = 0.0 + dz_blkt_top = tfwvt = 0.0 c_blnkith = cumulative_radial_build("dr_blkt_inboard", mfile_data, scan) c_fwoth = cumulative_radial_build("dr_fw_outboard", mfile_data, scan) @@ -1515,7 +1515,7 @@ def plot_firstwall(axis, mfile_data, scan, colour_scheme): cumulative_upper=cumulative_upper, triang=triang_95, cumulative_lower=cumulative_lower, - blnktth=blnktth, + dz_blkt_top=dz_blkt_top, c_blnkith=c_blnkith, c_fwoth=c_fwoth, dr_fw_inboard=dr_fw_inboard, @@ -1536,7 +1536,7 @@ def plot_firstwall(axis, mfile_data, scan, colour_scheme): fwg_double_null = first_wall_geometry_double_null( cumulative_lower=cumulative_lower, triang=triang_95, - blnktth=blnktth, + dz_blkt_top=dz_blkt_top, c_blnkith=c_blnkith, c_fwoth=c_fwoth, dr_fw_inboard=dr_fw_inboard, @@ -3658,7 +3658,7 @@ def main(args=None): "z_plasma_xpoint_upper", "dz_fw_plasma_gap", "fwtth", - "blnktth", + "dz_blkt_top", "dr_shld_blkt_gap", "shldtth", "d_vv_top", diff --git a/process/stellarator.py b/process/stellarator.py index f31662c669..df81d3dffe 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -339,7 +339,7 @@ def stbild(self, output: bool): # Top/bottom blanket thickness - build_variables.blnktth = 0.5e0 * ( + build_variables.dz_blkt_top = 0.5e0 * ( build_variables.dr_blkt_inboard + build_variables.dr_blkt_outboard ) @@ -1970,8 +1970,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Top blanket thickness (m)", - "(blnktth)", - build_variables.blnktth, + "(dz_blkt_top)", + build_variables.dz_blkt_top, ) if (heat_transport_variables.ipowerflow == 0) and ( diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index 0bd5fbd4c1..b84306f34c 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -54,7 +54,7 @@ module build_variables real(dp) :: dr_blkt_outboard !! outboard blanket thickness (m); calculated if `blktmodel>0` - real(dp) :: blnktth + real(dp) :: dz_blkt_top !! top blanket thickness (m), = mean of inboard and outboard blanket thicknesses real(dp) :: dr_bore @@ -319,7 +319,7 @@ subroutine init_build_variables blbuoth = 0.465D0 dr_blkt_inboard = 0.115D0 dr_blkt_outboard = 0.235D0 - blnktth = 0.0D0 + dz_blkt_top = 0.0D0 dr_bore = 1.42D0 f_z_cryostat = 4.268D0 dr_cryostat = 0.07D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index ce84fb3cd5..5483ebc1b1 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -592,7 +592,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 88d9f23b5b..76ebc1529b 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -593,7 +593,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 8721042ab3..3ff53ffd08 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -593,7 +593,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index c34442eabf..1bf89585ab 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -593,7 +593,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b4a9cffc3b..20311b2b55 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -591,7 +591,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 647c89465b..1e57c032b8 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -594,7 +594,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -1757,7 +1757,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -2920,7 +2920,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -4083,7 +4083,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -5246,7 +5246,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -6409,7 +6409,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -7572,7 +7572,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -8735,7 +8735,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -9898,7 +9898,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -11061,7 +11061,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -12224,7 +12224,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -13387,7 +13387,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -14550,7 +14550,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -15713,7 +15713,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -16876,7 +16876,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 99812a999c..98a2fb7d1d 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -446,7 +446,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -1441,7 +1441,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -2436,7 +2436,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -3431,7 +3431,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -4426,7 +4426,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -5421,7 +5421,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -6416,7 +6416,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -7411,7 +7411,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -8406,7 +8406,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 0569aa1c66..5d20a4f31b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -381,7 +381,7 @@ "blmatv": 0.0, "dr_blkt_inboard": 0.115, "dr_blkt_outboard": 0.235, - "blnktth": 0.0, + "dz_blkt_top": 0.0, "bloact": [ 0.0, 0.0, @@ -8911,7 +8911,7 @@ "blmatv": "IFE blanket material volumes (m3)", "dr_blkt_inboard": "inboard blanket thickness (m); (calculated if `blktmodel>0`) (=0.0 if `i_blkt_inboard=0`)", "dr_blkt_outboard": "outboard blanket thickness (m); calculated if `blktmodel>0`", - "blnktth": "top blanket thickness (m), = mean of inboard and outboard blanket thicknesses", + "dz_blkt_top": "top blanket thickness (m), = mean of inboard and outboard blanket thicknesses", "bloact": "outboard blanket total activity (Bq)", "blogdr": "outboard blanket total gamma dose rate (Sv/hr)", "blohkw": "outboard blanket total heat output (kW)", @@ -17005,7 +17005,7 @@ "blbuoth", "dr_blkt_inboard", "dr_blkt_outboard", - "blnktth", + "dz_blkt_top", "dr_bore", "f_z_cryostat", "dr_cryostat", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 61d51e8602..f28e647947 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2168,7 +2168,7 @@ shldlth = 0.6 * DESCRIPTION: Lower (under divertor) Shield Thickness (m) * JUSTIFICATION: -*blnktth = +*dz_blkt_top = * DESCRIPTION: top blanket thickness (m) * JUSTIFICATION: No longer an input variable diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 79cad472a9..af2e5b2f85 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -591,7 +591,7 @@ 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 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index fbdb06af59..7cd66c7c5f 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -360,7 +360,7 @@ class ComponentHalfHeightParam(NamedTuple): hmax: Any = None dz_xpoint_divertor: Any = None dz_shld_vv_gap: Any = None - blnktth: Any = None + dz_blkt_top: Any = None shldtth: Any = None dr_fw_plasma_gap_inboard: Any = None dr_fw_plasma_gap_outboard: Any = None @@ -384,7 +384,7 @@ class ComponentHalfHeightParam(NamedTuple): hmax=8.8182171641274945, dz_xpoint_divertor=2.0018838307941582, dz_shld_vv_gap=0.16300000000000001, - blnktth=0.85000000000000009, + dz_blkt_top=0.85000000000000009, shldtth=0.59999999999999998, dr_fw_plasma_gap_inboard=0.25, dr_fw_plasma_gap_outboard=0.25, @@ -427,7 +427,9 @@ def test_component_half_height( "dz_shld_vv_gap", componenthalfheightparam.dz_shld_vv_gap, ) - monkeypatch.setattr(build_variables, "blnktth", componenthalfheightparam.blnktth) + monkeypatch.setattr( + build_variables, "dz_blkt_top", componenthalfheightparam.dz_blkt_top + ) monkeypatch.setattr(build_variables, "shldtth", componenthalfheightparam.shldtth) monkeypatch.setattr( build_variables, @@ -481,7 +483,7 @@ class DshapedComponentParam(NamedTuple): blareaob: Any = None blarea: Any = None dr_blkt_outboard: Any = None - blnktth: Any = None + dz_blkt_top: Any = None shareaib: Any = None shareaob: Any = None sharea: Any = None @@ -538,7 +540,7 @@ class DshapedComponentParam(NamedTuple): blareaob=0, blarea=0, dr_blkt_outboard=1, - blnktth=0.5, + dz_blkt_top=0.5, shareaib=0, shareaob=0, sharea=0, @@ -591,7 +593,7 @@ class DshapedComponentParam(NamedTuple): blareaob=852.24160940262459, blarea=1049.2194687827046, dr_blkt_outboard=1, - blnktth=0.5, + dz_blkt_top=0.5, shareaib=0, shareaob=0, sharea=0, @@ -644,7 +646,7 @@ class DshapedComponentParam(NamedTuple): blareaob=852.24160940262459, blarea=1049.2194687827046, dr_blkt_outboard=1, - blnktth=0.5, + dz_blkt_top=0.5, shareaib=208.91591146372122, shareaob=1013.8483589087293, sharea=1222.7642703724505, @@ -728,7 +730,9 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f monkeypatch.setattr( build_variables, "dr_blkt_outboard", dshapedcomponentparam.dr_blkt_outboard ) - monkeypatch.setattr(build_variables, "blnktth", dshapedcomponentparam.blnktth) + monkeypatch.setattr( + build_variables, "dz_blkt_top", dshapedcomponentparam.dz_blkt_top + ) monkeypatch.setattr(build_variables, "shareaib", dshapedcomponentparam.shareaib) monkeypatch.setattr(build_variables, "shareaob", dshapedcomponentparam.shareaob) monkeypatch.setattr(build_variables, "sharea", dshapedcomponentparam.sharea) @@ -788,7 +792,7 @@ class EllipticalComponentParam(NamedTuple): blareaib: Any = None blareaob: Any = None blarea: Any = None - blnktth: Any = None + dz_blkt_top: Any = None shareaib: Any = None shareaob: Any = None sharea: Any = None @@ -844,7 +848,7 @@ class EllipticalComponentParam(NamedTuple): blareaib=0, blareaob=0, blarea=0, - blnktth=0.85000000000000009, + dz_blkt_top=0.85000000000000009, shareaib=0, shareaob=0, sharea=0, @@ -896,7 +900,7 @@ class EllipticalComponentParam(NamedTuple): blareaib=664.9687712975541, blareaob=1101.3666396424403, blarea=1766.3354109399943, - blnktth=0.85000000000000009, + dz_blkt_top=0.85000000000000009, shareaib=0, shareaob=0, sharea=0, @@ -948,7 +952,7 @@ class EllipticalComponentParam(NamedTuple): blareaib=664.9687712975541, blareaob=1101.3666396424403, blarea=1766.3354109399943, - blnktth=0.85000000000000009, + dz_blkt_top=0.85000000000000009, shareaib=700.06731267447844, shareaob=1344.1106481995357, sharea=2044.1779608740142, @@ -1023,7 +1027,9 @@ def test_elliptical_component( monkeypatch.setattr(build_variables, "blareaib", ellipticalcomponentparam.blareaib) monkeypatch.setattr(build_variables, "blareaob", ellipticalcomponentparam.blareaob) monkeypatch.setattr(build_variables, "blarea", ellipticalcomponentparam.blarea) - monkeypatch.setattr(build_variables, "blnktth", ellipticalcomponentparam.blnktth) + monkeypatch.setattr( + build_variables, "dz_blkt_top", ellipticalcomponentparam.dz_blkt_top + ) monkeypatch.setattr(build_variables, "shareaib", ellipticalcomponentparam.shareaib) monkeypatch.setattr(build_variables, "shareaob", ellipticalcomponentparam.shareaob) monkeypatch.setattr(build_variables, "sharea", ellipticalcomponentparam.sharea) diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index 5d8db37fee..5bdaea59df 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -212,7 +212,7 @@ class StbildParam(NamedTuple): dr_blkt_outboard: Any = None - blnktth: Any = None + dz_blkt_top: Any = None dr_bore: Any = None @@ -304,7 +304,7 @@ class StbildParam(NamedTuple): outfile: Any = None - expected_blnktth: Any = None + expected_dz_blkt_top: Any = None expected_bore: Any = None @@ -345,7 +345,7 @@ class StbildParam(NamedTuple): blbuoth=0.46500000000000002, dr_blkt_inboard=0.70000000000000007, dr_blkt_outboard=0.80000000000000004, - blnktth=0, + dz_blkt_top=0, dr_bore=1.4199999999999999, dr_vv_inboard=0.35000000000000003, dr_vv_outboard=0.35000000000000003, @@ -391,7 +391,7 @@ class StbildParam(NamedTuple): f_a=0.99125889880147788, iprint=0, outfile=11, - expected_blnktth=0.75, + expected_dz_blkt_top=0.75, expected_bore=17.79214950143977, expected_a_fw_total=1918.8188778803135, expected_dr_fw_inboard=0.018000000000000002, @@ -415,7 +415,7 @@ class StbildParam(NamedTuple): blbuoth=0.46500000000000002, dr_blkt_inboard=0.70000000000000007, dr_blkt_outboard=0.80000000000000004, - blnktth=0.75, + dz_blkt_top=0.75, dr_bore=17.79214950143977, dr_vv_inboard=0.35000000000000003, dr_vv_outboard=0.35000000000000003, @@ -461,7 +461,7 @@ class StbildParam(NamedTuple): f_a=0.99125889880147788, iprint=0, outfile=11, - expected_blnktth=0.75, + expected_dz_blkt_top=0.75, expected_bore=17.79214950143977, expected_a_fw_total=2120.6210472630282, expected_dr_fw_inboard=0.018000000000000002, @@ -509,7 +509,7 @@ def test_stbild(stbildparam, monkeypatch, stellarator): build_variables, "dr_blkt_outboard", stbildparam.dr_blkt_outboard ) - monkeypatch.setattr(build_variables, "blnktth", stbildparam.blnktth) + monkeypatch.setattr(build_variables, "dz_blkt_top", stbildparam.dz_blkt_top) monkeypatch.setattr(build_variables, "dr_bore", stbildparam.dr_bore) @@ -634,7 +634,9 @@ def test_stbild(stbildparam, monkeypatch, stellarator): monkeypatch.setattr(stellarator_module, "f_a", stbildparam.f_a) stellarator.stbild(False) - assert build_variables.blnktth == pytest.approx(stbildparam.expected_blnktth) + assert build_variables.dz_blkt_top == pytest.approx( + stbildparam.expected_dz_blkt_top + ) assert build_variables.dr_bore == pytest.approx(stbildparam.expected_bore) From 5bdb4b697dbcf3c157bd7435541dcf02faf92138 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 20 Feb 2025 09:13:46 +0000 Subject: [PATCH 08/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20fwtth=20to=20dz?= =?UTF-8?q?=5Ffw=5Fupper=20for=20consistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/proc-pages/eng-models/machine-build.md | 2 +- process/build.py | 12 +++++++----- process/geometry/blanket_geometry.py | 2 +- process/geometry/firstwall_geometry.py | 2 +- process/io/plot_proc.py | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index 4d87792d4d..6d607335a0 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -70,7 +70,7 @@ case the machine is not symmetric about the midplane. Vacuum vessel (and shielding) 0.600 8.136 (d_vv_top+shldtth) Gap 0.020 7.536 (dr_shld_blkt_gap) Top blanket 0.869 7.516 (dz_blkt_top) - Top first wall 0.018 6.647 (fwtth) + Top first wall 0.018 6.647 (dz_fw_upper) Top scrape-off 0.600 6.629 (dz_fw_plasma_gap) Plasma top 6.029 6.029 (z_plasma_xpoint_upper) Midplane 0.000 -0.000 diff --git a/process/build.py b/process/build.py index f579b4a5e9..dc9b3ce4fb 100644 --- a/process/build.py +++ b/process/build.py @@ -541,17 +541,19 @@ def calculate_vertical_build(self, output: bool) -> None: ) vbuild = vbuild - build_variables.dz_blkt_top - fwtth = 0.5e0 * ( + dz_fw_upper = 0.5e0 * ( build_variables.dr_fw_inboard + build_variables.dr_fw_outboard ) - po.obuild(self.outfile, "Top first wall", fwtth, vbuild, "(fwtth)") + po.obuild( + self.outfile, "Top first wall", dz_fw_upper, vbuild, "(dz_fw_upper)" + ) po.ovarre( self.mfile, "Top first wall vertical thickness (m)", - "(fwtth)", - fwtth, + "(dz_fw_upper)", + dz_fw_upper, ) - vbuild = vbuild - fwtth + vbuild = vbuild - dz_fw_upper po.obuild( self.outfile, diff --git a/process/geometry/blanket_geometry.py b/process/geometry/blanket_geometry.py index 52cea350dc..c19ac795dd 100644 --- a/process/geometry/blanket_geometry.py +++ b/process/geometry/blanket_geometry.py @@ -58,7 +58,7 @@ def blanket_geometry_single_null( ) # Upper blanket inner surface - kapx = cumulative_upper["fwtth"] / rminx_inner + kapx = cumulative_upper["dz_fw_upper"] / rminx_inner rs_upper_inboard, zs_upper_inboard = dh_vertices( radx_inner, rminx_inner, triang, kapx ) diff --git a/process/geometry/firstwall_geometry.py b/process/geometry/firstwall_geometry.py index fc1e06149e..45b7e68149 100644 --- a/process/geometry/firstwall_geometry.py +++ b/process/geometry/firstwall_geometry.py @@ -55,7 +55,7 @@ def first_wall_geometry_single_null( :rtype: ArbitraryGeometry """ # Upper first wall: outer surface - kapx = cumulative_upper["fwtth"] / rminx_outer + kapx = cumulative_upper["dz_fw_upper"] / rminx_outer rs_upper_outboard, zs_upper_outboard = dh_vertices( radx_outer, rminx_outer, triang, kapx ) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 3181627648..f0ffb866bc 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -1479,7 +1479,7 @@ def plot_firstwall(axis, mfile_data, scan, colour_scheme): triang_95 = mfile_data.data["triang95"].get_scan(scan) if int(i_single_null) == 1: dz_blkt_top = mfile_data.data["dz_blkt_top"].get_scan(scan) - tfwvt = mfile_data.data["fwtth"].get_scan(scan) + tfwvt = mfile_data.data["dz_fw_upper"].get_scan(scan) else: dz_blkt_top = tfwvt = 0.0 @@ -3657,7 +3657,7 @@ def main(args=None): vertical_upper = [ "z_plasma_xpoint_upper", "dz_fw_plasma_gap", - "fwtth", + "dz_fw_upper", "dz_blkt_top", "dr_shld_blkt_gap", "shldtth", From 3f26ab12459bc7a599d38153635bbe65af74828c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 20 Feb 2025 14:46:17 +0000 Subject: [PATCH 09/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20shldlth=20to=20dz?= =?UTF-8?q?=5Fshld=5Flower=20for=20consistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/machine-build.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/build.py | 22 +++++++------- process/geometry/shield_geometry.py | 2 +- process/init.py | 2 +- process/io/mfile_comparison.py | 2 +- process/io/plot_proc.py | 2 +- source/fortran/build_variables.f90 | 6 ++-- 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 | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 12 ++++---- .../spherical_tokamak_once_through.IN.DAT | 4 +-- .../input_files/st_regression.IN.DAT | 2 +- .../stellarator_helias_once_through.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 26 files changed, 76 insertions(+), 76 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index 6d607335a0..77bec39507 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -77,7 +77,7 @@ case the machine is not symmetric about the midplane. Plasma bottom 6.029 -6.029 (z_plasma_xpoint_upper) Lower scrape-off 2.002 -8.031 (vgap) Divertor structure 0.621 -8.652 (dz_divertor) - Vacuum vessel (and shielding) 1.000 -9.652 (d_vv_bot+shldlth) + Vacuum vessel (and shielding) 1.000 -9.652 (d_vv_bot+dz_shld_lower) Gap 0.050 -9.702 (dz_shld_vv_gap) Thermal shield 0.050 -9.752 (thshield) Gap 0.050 -9.802 (dr_tf_shld_gap) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index add6b2624a..88af43fb7b 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -602,7 +602,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index e156c7cbb3..44ebc9a943 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -599,7 +599,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index b8ff2a31e9..ff44e4d111 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -599,7 +599,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index d6858063d6..7ad08fdc87 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -599,7 +599,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a15e817c83..18929ed58f 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -599,7 +599,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index c69ca14477..befc65cb3c 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -452,7 +452,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -1447,7 +1447,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -2442,7 +2442,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -3437,7 +3437,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -4432,7 +4432,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -5427,7 +5427,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -6422,7 +6422,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -7417,7 +7417,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -8412,7 +8412,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/process/build.py b/process/build.py index dc9b3ce4fb..6ba3fce9e7 100644 --- a/process/build.py +++ b/process/build.py @@ -328,21 +328,21 @@ def calculate_vertical_build(self, output: bool) -> None: divertor_variables.dz_divertor, ) - vbuild = vbuild - build_variables.shldlth + vbuild = vbuild - build_variables.dz_shld_lower vbuild = vbuild - build_variables.d_vv_bot po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_bot + build_variables.shldlth, + build_variables.d_vv_bot + build_variables.dz_shld_lower, vbuild, - "(d_vv_bot+shldlth)", + "(d_vv_bot+dz_shld_lower)", ) po.ovarre( self.mfile, "Bottom radiation shield thickness (m)", - "(shldlth)", - build_variables.shldlth, + "(dz_shld_lower)", + build_variables.dz_shld_lower, ) po.ovarre( self.mfile, @@ -626,21 +626,21 @@ def calculate_vertical_build(self, output: bool) -> None: divertor_variables.dz_divertor, ) - vbuild = vbuild - build_variables.shldlth + vbuild = vbuild - build_variables.dz_shld_lower vbuild = vbuild - build_variables.d_vv_bot po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_bot + build_variables.shldlth, + build_variables.d_vv_bot + build_variables.dz_shld_lower, vbuild, - "(d_vv_bot+shldlth)", + "(d_vv_bot+dz_shld_lower)", ) po.ovarre( self.mfile, "Bottom radiation shield thickness (m)", - "(shldlth)", - build_variables.shldlth, + "(dz_shld_lower)", + build_variables.dz_shld_lower, ) po.ovarre( self.mfile, @@ -737,7 +737,7 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.z_plasma_xpoint_upper + build_variables.dz_xpoint_divertor + divertor_variables.dz_divertor - + build_variables.shldlth + + build_variables.dz_shld_lower + build_variables.d_vv_bot + build_variables.dz_shld_vv_gap + build_variables.dz_shld_thermal diff --git a/process/geometry/shield_geometry.py b/process/geometry/shield_geometry.py index 4b4920d2c0..9b52750596 100644 --- a/process/geometry/shield_geometry.py +++ b/process/geometry/shield_geometry.py @@ -108,7 +108,7 @@ def shield_geometry_lower( :rtype: Tuple[np.ndarray, np.ndarray, np.ndarray, np.ndarray] """ # Side furthest from plasma - kapx = cumulative_lower["shldlth"] / rminx_far + kapx = cumulative_lower["dz_shld_lower"] / rminx_far rs_lower_outboard, zs_lower_outboard = dh_vertices( radx_far, rminx_far, triang, kapx ) diff --git a/process/init.py b/process/init.py index f293005bd2..a90a828d7f 100644 --- a/process/init.py +++ b/process/init.py @@ -661,7 +661,7 @@ def check_process(): fortran.build_variables.dz_fw_plasma_gap = ( fortran.build_variables.dz_xpoint_divertor ) - fortran.build_variables.shldtth = fortran.build_variables.shldlth + fortran.build_variables.shldtth = fortran.build_variables.dz_shld_lower fortran.build_variables.d_vv_top = fortran.build_variables.d_vv_bot warn("Double-null: Upper vertical build forced to match lower", stacklevel=2) else: # i_single_null == 1 diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index a19fd7e90b..ac6ef279ea 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -263,7 +263,7 @@ "dz_xpoint_divertor", "dz_divertor", "d_vv_bot", - "shldlth", + "dz_shld_lower", "dz_shld_vv_gap", ] diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index f0ffb866bc..ddd1780d86 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -155,7 +155,7 @@ def parse_args(args): "z_plasma_xpoint_lower", "dz_xpoint_divertor", "dz_divertor", - "shldlth", + "dz_shld_lower", "d_vv_bot", "dz_shld_vv_gap", "dz_shld_thermal", diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index b84306f34c..617ec12d5a 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -228,14 +228,14 @@ module build_variables real(dp) :: dr_shld_inboard !! inboard shield thickness (m) (`iteration variable 93`) - real(dp) :: shldlth + real(dp) :: dz_shld_lower !! lower (under divertor) shield thickness (m) real(dp) :: dr_shld_outboard !! outboard shield thickness (m) (`iteration variable 94`) real(dp) :: shldtth - !! upper/lower shield thickness (m); calculated if `blktmodel > 0` (= shldlth if double-null) + !! upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) real(dp) :: sigallpc !! allowable stress in CSpre-compression structure (Pa) @@ -370,7 +370,7 @@ subroutine init_build_variables shareaib = 0.0D0 shareaob = 0.0D0 dr_shld_inboard = 0.69D0 - shldlth = 0.7D0 + dz_shld_lower = 0.7D0 dr_shld_outboard = 1.05D0 shldtth = 0.6D0 sigallpc = 3.0D8 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index b21ac8fa7b..11a558c146 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -191,7 +191,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use constants, only: dcopper, dalu use global_variables, only: run_tests, verbose, maxcal, runtitle use build_variables, only: tf_in_cs, blbmoth, blbuith, dr_shld_outboard, & - shldtth, shldlth, dz_shld_vv_gap, plleni, dr_fw_outboard, dr_shld_blkt_gap, & + shldtth, dz_shld_lower, dz_shld_vv_gap, plleni, dr_fw_outboard, dr_shld_blkt_gap, & dr_shld_thermal_inboard, dr_shld_thermal_outboard, dz_shld_thermal, i_cs_precomp, & blbpith, aplasmin, blbuoth, dr_tf_inboard, & iohcl, dr_tf_shld_gap, f_z_cryostat, dr_bore, plleno, dr_fw_plasma_gap_inboard, gapomin, dr_cryostat, & @@ -1389,8 +1389,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dr_shld_inboard') call parse_real_variable('dr_shld_inboard', dr_shld_inboard, 0.0D0, 10.0D0, & 'Inboard shield thickness (m)') - case ('shldlth') - call parse_real_variable('shldlth', shldlth, 0.0D0, 10.0D0, & + case ('dz_shld_lower') + call parse_real_variable('dz_shld_lower', dz_shld_lower, 0.0D0, 10.0D0, & 'Lower (divertor) shield thickness (m)') case ('dr_shld_outboard') call parse_real_variable('dr_shld_outboard', dr_shld_outboard, 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 5483ebc1b1..6bc70aff05 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -598,7 +598,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 76ebc1529b..364363cb74 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -599,7 +599,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 3ff53ffd08..e707f28aaf 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -599,7 +599,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 1bf89585ab..75e8b9833e 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -599,7 +599,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 20311b2b55..dee01c5e7c 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -597,7 +597,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(excludes_structure)_(m)____________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 1e57c032b8..b005ccfb18 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -600,7 +600,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -1763,7 +1763,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -2926,7 +2926,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -4089,7 +4089,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -5252,7 +5252,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -6415,7 +6415,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -7578,7 +7578,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -8741,7 +8741,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -9904,7 +9904,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -11067,7 +11067,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -12230,7 +12230,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -13393,7 +13393,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -14556,7 +14556,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -15719,7 +15719,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -16882,7 +16882,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 98a2fb7d1d..43b6b3822c 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -452,7 +452,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -1447,7 +1447,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -2442,7 +2442,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -3437,7 +3437,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -4432,7 +4432,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -5427,7 +5427,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -6422,7 +6422,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -7417,7 +7417,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 @@ -8412,7 +8412,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 5d20a4f31b..3c53e5b591 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -5276,7 +5276,7 @@ "shield_density": 0.0, "shld_u_nuc_heating": 0.0, "dr_shld_inboard": 0.69, - "shldlth": 0.7, + "dz_shld_lower": 0.7, "dr_shld_outboard": 1.05, "shldtth": 0.6, "shmatf": [ @@ -10614,9 +10614,9 @@ "shield_density": "Shield density [kg/m3]", "shld_u_nuc_heating": "Unit nuclear heating in shield (W per W of fusion power)", "dr_shld_inboard": "inboard shield thickness (m) (`iteration variable 93`)", - "shldlth": "lower (under divertor) shield thickness (m)", + "dz_shld_lower": "lower (under divertor) shield thickness (m)", "dr_shld_outboard": "outboard shield thickness (m) (`iteration variable 94`)", - "shldtth": "upper/lower shield thickness (m); calculated if `blktmodel > 0` (= shldlth if double-null)", + "shldtth": "upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null)", "shmatf": "IFE shield material fractions", "shmatm": "IFE shield material masses (kg)", "shmatv": "IFE shield material volumes (kg)", @@ -14257,7 +14257,7 @@ "lb": 0.0, "ub": 10.0 }, - "shldlth": { + "dz_shld_lower": { "lb": 0.0, "ub": 10.0 }, @@ -17056,7 +17056,7 @@ "shareaib", "shareaob", "dr_shld_inboard", - "shldlth", + "dz_shld_lower", "dr_shld_outboard", "shldtth", "sigallpc", @@ -20692,7 +20692,7 @@ "shdzu": "real_variable", "shear": "real_variable", "dr_shld_inboard": "real_variable", - "shldlth": "real_variable", + "dz_shld_lower": "real_variable", "dr_shld_outboard": "real_variable", "shldtth": "real_variable", "shmatf": "real_array", diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index ac1aa36bb7..d5cba4d632 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -132,9 +132,9 @@ i_r_cp_top = 2 * Switch selecting the he parametrization of the outer radius of dr_fw_plasma_gap_inboard = 0.1 * Gap between plasma and first wall; inboard side (m) (if `i_plasma_wall_gap=1`) dr_fw_plasma_gap_outboard = 0.1 * Gap between plasma and first wall; outboard side (m) (if `i_plasma_wall_gap=1`) dr_shld_inboard = 0.39314459807893426 * inboard shield thickness (m) (`iteration variable 93`) -shldlth = 0.6 * lower (under divertor) shield thickness (m) +dz_shld_lower = 0.6 * lower (under divertor) shield thickness (m) dr_shld_outboard = 0.3 * outboard shield thickness (m) (`iteration variable 94`) -shldtth = 0.3 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= shldlth if double-null) +shldtth = 0.3 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) tfootfi = 1.0 * TF coil outboard leg / inboard leg radial thickness dr_tf_shld_gap = 0.01 * Minimum metal-to-metal gap between TF coil and thermal shield (m) dr_shld_thermal_inboard = 0.05 * TF-VV thermal shield thickness; inboard (m) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index f28e647947..967cc9aabd 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2164,7 +2164,7 @@ shldtth = 0.3 * DESCRIPTION: Top shield thickness (m) * JUSTIFICATION: Set to match outboard build -shldlth = 0.6 +dz_shld_lower = 0.6 * DESCRIPTION: Lower (under divertor) Shield Thickness (m) * JUSTIFICATION: diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index 38f00ae875..00b842f34e 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -90,7 +90,7 @@ dr_fw_plasma_gap_inboard = 0.15 * Gap between plasma and first wall; inboard si dr_fw_plasma_gap_outboard = 0.2 * Gap between plasma and first wall; outboard side (m) (if `i_plasma_wall_gap=1`) dr_shld_inboard = 0.2 * inboard shield thickness (m) (`iteration variable 93`) dr_shld_outboard = 0.2 * outboard shield thickness (m) (`iteration variable 94`) -shldtth = 0.2 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= shldlth if double-null) +shldtth = 0.2 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) vgap_xpoint_divertor = 0. * vertical gap between x-point and divertor (m) (if = 0; it is calculated) *---------------Buildings Variables----------------* diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index af2e5b2f85..cb1ae471eb 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -597,7 +597,7 @@ Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(excludes_structure)_(m)____________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 From a5af817c407877c54b14cea49cedbbc9a112ce06 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 20 Feb 2025 14:47:46 +0000 Subject: [PATCH 10/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20shldtth=20to=20dz?= =?UTF-8?q?=5Fshld=5Fupper=20for=20consistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/machine-build.md | 2 +- .../proc-pages/fusion-devices/stellarator.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 | 20 ++++++------ process/blanket_library.py | 8 +++-- process/build.py | 32 +++++++++++-------- process/geometry/shield_geometry.py | 2 +- process/init.py | 2 +- process/io/plot_proc.py | 4 +-- process/sctfcoil.py | 2 +- process/stellarator.py | 6 ++-- source/fortran/build_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 | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++++++--------- tests/integration/data/scan_MFILE.DAT | 20 ++++++------ tests/integration/ref_dicts.json | 10 +++--- tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- .../stellarator_helias_once_through.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 32 +++++++++++-------- tests/unit/test_sctfcoil.py | 2 +- tests/unit/test_stellarator.py | 8 ++--- 34 files changed, 118 insertions(+), 106 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index 77bec39507..d3bfb68376 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -67,7 +67,7 @@ case the machine is not symmetric about the midplane. Gap 0.050 8.286 (dr_tf_shld_gap) Thermal shield 0.050 8.236 (thshield) Gap 0.050 8.186 (dz_shld_vv_gap) - Vacuum vessel (and shielding) 0.600 8.136 (d_vv_top+shldtth) + Vacuum vessel (and shielding) 0.600 8.136 (d_vv_top+dz_shld_upper) Gap 0.020 7.536 (dr_shld_blkt_gap) Top blanket 0.869 7.516 (dz_blkt_top) Top first wall 0.018 6.647 (dz_fw_upper) diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index b2bc51e616..83db25bd7d 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -285,7 +285,7 @@ dr_fw_plasma_gap_inboard = 0.15 *Gap between plasma and first wall; inboard side dr_fw_plasma_gap_outboard = 0.2 *Gap between plasma and first wall; outboard side (m) dr_shld_inboard = 0.2 *Inboard shield thickness (m) dr_shld_outboard = 0.2 *Outboard shield thickness (m) -shldtth = 0.2 *Upper/lower shield thickness (m) +dz_shld_upper = 0.2 *Upper/lower shield thickness (m) vgap = 0. *Vertical gap between x-point and divertor (m) ``` diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 88af43fb7b..3d25bdbf3e 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -595,7 +595,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 44ebc9a943..864b60ef95 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -592,7 +592,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index ff44e4d111..5470f43def 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -592,7 +592,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 7ad08fdc87..6d345531d9 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -592,7 +592,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 18929ed58f..27e2eab020 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -592,7 +592,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index befc65cb3c..90648c0263 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -445,7 +445,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -1440,7 +1440,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -2435,7 +2435,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -3430,7 +3430,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -4425,7 +4425,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -5420,7 +5420,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -6415,7 +6415,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -7410,7 +7410,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -8405,7 +8405,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -9095,7 +9095,7 @@ dr_fw_plasma_gap_inboard = 0.225 * Gap between plasma and first wall; inboard s dr_fw_plasma_gap_outboard = 0.225 * Gap between plasma and first wall; outboard side (m) dr_shld_inboard = 0.30 * Inboard shield thickness (m) dr_shld_outboard = 0.80 * Outboard shield thickness (m) -shldtth = 0.30 * Upper/lower shield thickness (m); +dz_shld_upper = 0.30 * Upper/lower shield thickness (m); dr_tf_inboard = 1.05 * Inboard tf coil thickness; (centrepost for st) (m) dr_tf_shld_gap = 0.05 * manufacturing/thermal expansion gap between TF and thermal shield (m) vgap2 = 0.05 * Vertical gap between vacuum vessel and tf coil (m) diff --git a/process/blanket_library.py b/process/blanket_library.py index b62bf919ce..d4e286d3f3 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -135,7 +135,9 @@ def component_half_height(self, icomponent: int): htop = htop + build_variables.dz_blkt_top # Vacuum Vessel if icomponent == 2: - htop = htop + build_variables.dz_blkt_top + build_variables.shldtth + htop = ( + htop + build_variables.dz_blkt_top + build_variables.dz_shld_upper + ) # Average of top and bottom (m) return 0.5 * (htop + hbot) @@ -212,7 +214,7 @@ def dshaped_component(self, icomponent: int): blanket_library.hshld, build_variables.dr_shld_inboard, build_variables.dr_shld_outboard, - build_variables.shldtth, + build_variables.dz_shld_upper, ) elif icomponent == 2: ( @@ -304,7 +306,7 @@ def elliptical_component(self, icomponent: int): blanket_library.hshld, build_variables.dr_shld_inboard, build_variables.dr_shld_outboard, - build_variables.shldtth, + build_variables.dz_shld_upper, ) if icomponent == 2: ( diff --git a/process/build.py b/process/build.py index 6ba3fce9e7..14c590042a 100644 --- a/process/build.py +++ b/process/build.py @@ -145,7 +145,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dz_shld_thermal + build_variables.dz_shld_vv_gap + build_variables.d_vv_top - + build_variables.shldtth + + build_variables.dz_shld_upper + divertor_variables.dz_divertor + build_variables.dz_fw_plasma_gap + build_variables.z_plasma_xpoint_upper @@ -224,11 +224,13 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_top + build_variables.shldtth, + build_variables.d_vv_top + build_variables.dz_shld_upper, vbuild, - "(d_vv_top+shldtth)", + "(d_vv_top+dz_shld_upper)", + ) + vbuild = ( + vbuild - build_variables.d_vv_top - build_variables.dz_shld_upper ) - vbuild = vbuild - build_variables.d_vv_top - build_variables.shldtth po.ovarre( self.mfile, "Topside vacuum vessel radial thickness (m)", @@ -238,8 +240,8 @@ def calculate_vertical_build(self, output: bool) -> None: po.ovarre( self.mfile, "Top radiation shield thickness (m)", - "(shldtth)", - build_variables.shldtth, + "(dz_shld_upper)", + build_variables.dz_shld_upper, ) po.obuild( @@ -419,7 +421,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dz_shld_vv_gap + 0.5e0 * (build_variables.d_vv_top + build_variables.d_vv_bot) + build_variables.dr_shld_blkt_gap - + build_variables.shldtth + + build_variables.dz_shld_upper + build_variables.dz_blkt_top + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) @@ -499,11 +501,13 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_top + build_variables.shldtth, + build_variables.d_vv_top + build_variables.dz_shld_upper, vbuild, - "(d_vv_top+shldtth)", + "(d_vv_top+dz_shld_upper)", + ) + vbuild = ( + vbuild - build_variables.d_vv_top - build_variables.dz_shld_upper ) - vbuild = vbuild - build_variables.d_vv_top - build_variables.shldtth po.ovarre( self.mfile, "Topside vacuum vessel radial thickness (m)", @@ -513,8 +517,8 @@ def calculate_vertical_build(self, output: bool) -> None: po.ovarre( self.mfile, "Top radiation shield thickness (m)", - "(shldtth)", - build_variables.shldtth, + "(dz_shld_upper)", + build_variables.dz_shld_upper, ) po.obuild( @@ -755,7 +759,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dz_shld_thermal + build_variables.dz_shld_vv_gap + build_variables.d_vv_top - + build_variables.shldtth + + build_variables.dz_shld_upper + build_variables.dr_shld_blkt_gap + build_variables.dz_blkt_top + 0.5e0 @@ -1667,7 +1671,7 @@ def calculate_radial_build(self, output: bool) -> None: + build_variables.blbmoth + build_variables.blbpoth ) - build_variables.shldtth = 0.5e0 * ( + build_variables.dz_shld_upper = 0.5e0 * ( build_variables.dr_shld_inboard + build_variables.dr_shld_outboard ) diff --git a/process/geometry/shield_geometry.py b/process/geometry/shield_geometry.py index 9b52750596..40d4e5d4e8 100644 --- a/process/geometry/shield_geometry.py +++ b/process/geometry/shield_geometry.py @@ -38,7 +38,7 @@ def shield_geometry_single_null( """ # Upper shield # Side furthest from plasma - kapx = cumulative_upper["shldtth"] / rminx_far + kapx = cumulative_upper["dz_shld_upper"] / rminx_far rs_upper_outboard, zs_upper_outboard = dh_vertices( radx_far, rminx_far, triang, kapx ) diff --git a/process/init.py b/process/init.py index a90a828d7f..eed0833aff 100644 --- a/process/init.py +++ b/process/init.py @@ -661,7 +661,7 @@ def check_process(): fortran.build_variables.dz_fw_plasma_gap = ( fortran.build_variables.dz_xpoint_divertor ) - fortran.build_variables.shldtth = fortran.build_variables.dz_shld_lower + fortran.build_variables.dz_shld_upper = fortran.build_variables.dz_shld_lower fortran.build_variables.d_vv_top = fortran.build_variables.d_vv_bot warn("Double-null: Upper vertical build forced to match lower", stacklevel=2) else: # i_single_null == 1 diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index ddd1780d86..ccc8094d4e 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3646,7 +3646,7 @@ def main(args=None): "z_plasma_xpoint_upper", "dz_fw_plasma_gap", "dz_divertor", - "shldtth", + "dz_shld_upper", "d_vv_top", "dz_shld_vv_gap", "dz_shld_thermal", @@ -3660,7 +3660,7 @@ def main(args=None): "dz_fw_upper", "dz_blkt_top", "dr_shld_blkt_gap", - "shldtth", + "dz_shld_upper", "d_vv_top", "dz_shld_vv_gap", "dz_shld_thermal", diff --git a/process/sctfcoil.py b/process/sctfcoil.py index d675b3d9cc..736968b455 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -2324,7 +2324,7 @@ def vv_stress_on_quench(self): build_variables.z_plasma_xpoint_upper + build_variables.dz_xpoint_divertor + divertor_variables.dz_divertor - + build_variables.shldtth + + build_variables.dz_shld_upper + (build_variables.d_vv_top / 2) ) # ri and ro for VV dont consider the shield widths diff --git a/process/stellarator.py b/process/stellarator.py index df81d3dffe..16e4da275c 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -333,7 +333,7 @@ def stbild(self, output: bool): + build_variables.blbmoth + build_variables.blbpoth ) - build_variables.shldtth = 0.5e0 * ( + build_variables.dz_shld_upper = 0.5e0 * ( build_variables.dr_shld_inboard + build_variables.dr_shld_outboard ) @@ -1911,8 +1911,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Top shield thickness (m)", - "(shldtth)", - build_variables.shldtth, + "(dz_shld_upper)", + build_variables.dz_shld_upper, ) if fwbs_variables.blktmodel > 0: diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index 617ec12d5a..9f8b2b1917 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -234,7 +234,7 @@ module build_variables real(dp) :: dr_shld_outboard !! outboard shield thickness (m) (`iteration variable 94`) - real(dp) :: shldtth + real(dp) :: dz_shld_upper !! upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) real(dp) :: sigallpc @@ -372,7 +372,7 @@ subroutine init_build_variables dr_shld_inboard = 0.69D0 dz_shld_lower = 0.7D0 dr_shld_outboard = 1.05D0 - shldtth = 0.6D0 + dz_shld_upper = 0.6D0 sigallpc = 3.0D8 dr_tf_inboard = 0.0D0 tfoffset = 0.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 11a558c146..cde6e9cc01 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -191,7 +191,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use constants, only: dcopper, dalu use global_variables, only: run_tests, verbose, maxcal, runtitle use build_variables, only: tf_in_cs, blbmoth, blbuith, dr_shld_outboard, & - shldtth, dz_shld_lower, dz_shld_vv_gap, plleni, dr_fw_outboard, dr_shld_blkt_gap, & + dz_shld_upper, dz_shld_lower, dz_shld_vv_gap, plleni, dr_fw_outboard, dr_shld_blkt_gap, & dr_shld_thermal_inboard, dr_shld_thermal_outboard, dz_shld_thermal, i_cs_precomp, & blbpith, aplasmin, blbuoth, dr_tf_inboard, & iohcl, dr_tf_shld_gap, f_z_cryostat, dr_bore, plleno, dr_fw_plasma_gap_inboard, gapomin, dr_cryostat, & @@ -1395,8 +1395,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dr_shld_outboard') call parse_real_variable('dr_shld_outboard', dr_shld_outboard, 0.0D0, 10.0D0, & 'Outboard shield thickness (m)') - case ('shldtth') - call parse_real_variable('shldtth', shldtth, 0.0D0, 10.0D0, & + case ('dz_shld_upper') + call parse_real_variable('dz_shld_upper', dz_shld_upper, 0.0D0, 10.0D0, & 'Top shield thickness (m)') case ('sigallpc') call parse_real_variable('sigallpc', sigallpc, 0.0D1, 1.0D9, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 6bc70aff05..b4c766485a 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -591,7 +591,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 364363cb74..1ceeefab2f 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -592,7 +592,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index e707f28aaf..e570f7cd0e 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -592,7 +592,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 75e8b9833e..c22409ed51 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -592,7 +592,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index dee01c5e7c..08c5a7e645 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -590,7 +590,7 @@ 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 6e78863a92..e3ab7e3225 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -116,7 +116,7 @@ dr_fw_plasma_gap_inboard = 0.225 * Gap between plasma and first wall; inboard s dr_fw_plasma_gap_outboard = 0.225 * Gap between plasma and first wall; outboard side (m) dr_shld_inboard = 0.30 * Inboard shield thickness (m) dr_shld_outboard = 0.80 * Outboard shield thickness (m) -shldtth = 0.30 * Upper/lower shield thickness (m); +dz_shld_upper = 0.30 * Upper/lower shield thickness (m); dr_tf_inboard = 1.05 * Inboard tf coil thickness; (centrepost for st) (m) dr_tf_shld_gap = 0.05 * manufacturing/thermal expansion gap between TF and thermal shield (m) vgap2 = 0.05 * Vertical gap between vacuum vessel and tf coil (m) diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index b005ccfb18..96cf4201d7 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -593,7 +593,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -1756,7 +1756,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -2919,7 +2919,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -4082,7 +4082,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -5245,7 +5245,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -6408,7 +6408,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -7571,7 +7571,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -8734,7 +8734,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -9897,7 +9897,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -11060,7 +11060,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -12223,7 +12223,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -13386,7 +13386,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -14549,7 +14549,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -15712,7 +15712,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 @@ -16875,7 +16875,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 43b6b3822c..f69e66b024 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -445,7 +445,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -1440,7 +1440,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -2435,7 +2435,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -3430,7 +3430,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -4425,7 +4425,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -5420,7 +5420,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -6415,7 +6415,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -7410,7 +7410,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -8405,7 +8405,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 @@ -9095,7 +9095,7 @@ dr_fw_plasma_gap_inboard = 0.225 * Gap between plasma and first wall; inboard s dr_fw_plasma_gap_outboard = 0.225 * Gap between plasma and first wall; outboard side (m) dr_shld_inboard = 0.30 * Inboard shield thickness (m) dr_shld_outboard = 0.80 * Outboard shield thickness (m) -shldtth = 0.30 * Upper/lower shield thickness (m); +dz_shld_upper = 0.30 * Upper/lower shield thickness (m); dr_tf_inboard = 1.05 * Inboard tf coil thickness; (centrepost for st) (m) dr_tf_shld_gap = 0.05 * manufacturing/thermal expansion gap between TF and thermal shield (m) vgap2 = 0.05 * Vertical gap between vacuum vessel and tf coil (m) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 3c53e5b591..77c13e6e6d 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -5278,7 +5278,7 @@ "dr_shld_inboard": 0.69, "dz_shld_lower": 0.7, "dr_shld_outboard": 1.05, - "shldtth": 0.6, + "dz_shld_upper": 0.6, "shmatf": [ 0.05, 0.05, @@ -10616,7 +10616,7 @@ "dr_shld_inboard": "inboard shield thickness (m) (`iteration variable 93`)", "dz_shld_lower": "lower (under divertor) shield thickness (m)", "dr_shld_outboard": "outboard shield thickness (m) (`iteration variable 94`)", - "shldtth": "upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null)", + "dz_shld_upper": "upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null)", "shmatf": "IFE shield material fractions", "shmatm": "IFE shield material masses (kg)", "shmatv": "IFE shield material volumes (kg)", @@ -14265,7 +14265,7 @@ "lb": 0.0, "ub": 10.0 }, - "shldtth": { + "dz_shld_upper": { "lb": 0.0, "ub": 10.0 }, @@ -17058,7 +17058,7 @@ "dr_shld_inboard", "dz_shld_lower", "dr_shld_outboard", - "shldtth", + "dz_shld_upper", "sigallpc", "dr_tf_inboard", "tfoffset", @@ -20694,7 +20694,7 @@ "dr_shld_inboard": "real_variable", "dz_shld_lower": "real_variable", "dr_shld_outboard": "real_variable", - "shldtth": "real_variable", + "dz_shld_upper": "real_variable", "shmatf": "real_array", "shmf": "real_variable", "shov": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index f5c2cc828d..cb4fe34deb 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -93,7 +93,7 @@ dr_fw_plasma_gap_inboard = 0.15 *Gap between plasma and first wall; inb dr_fw_plasma_gap_outboard = 0.3 *Gap between plasma and first wall; outboard side (m) dr_shld_inboard = 0.4 *Inboard shield thickness (m) dr_shld_outboard = 0.7 *Outboard shield thickness (m) -shldtth = 0.7 *Upper/lower shield thickness (m) +dz_shld_upper = 0.7 *Upper/lower shield thickness (m) vgap_xpoint_divertor = 0.0 *Vertical gap between x-point and divertor (m) *---------------Constraint Variables---------------* diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index d5cba4d632..58c0f89335 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -134,7 +134,7 @@ dr_fw_plasma_gap_outboard = 0.1 * Gap between plasma and first wall; outboard s dr_shld_inboard = 0.39314459807893426 * inboard shield thickness (m) (`iteration variable 93`) dz_shld_lower = 0.6 * lower (under divertor) shield thickness (m) dr_shld_outboard = 0.3 * outboard shield thickness (m) (`iteration variable 94`) -shldtth = 0.3 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) +dz_shld_upper = 0.3 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) tfootfi = 1.0 * TF coil outboard leg / inboard leg radial thickness dr_tf_shld_gap = 0.01 * Minimum metal-to-metal gap between TF coil and thermal shield (m) dr_shld_thermal_inboard = 0.05 * TF-VV thermal shield thickness; inboard (m) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 967cc9aabd..6caeded02f 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2160,7 +2160,7 @@ dz_divertor = 1.0 * DESCRIPTION: Divertor Structure Vertical Thickness (m) * JUSTIFICATION: -shldtth = 0.3 +dz_shld_upper = 0.3 * DESCRIPTION: Top shield thickness (m) * JUSTIFICATION: Set to match outboard build diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index 00b842f34e..a0f3f03758 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -90,7 +90,7 @@ dr_fw_plasma_gap_inboard = 0.15 * Gap between plasma and first wall; inboard si dr_fw_plasma_gap_outboard = 0.2 * Gap between plasma and first wall; outboard side (m) (if `i_plasma_wall_gap=1`) dr_shld_inboard = 0.2 * inboard shield thickness (m) (`iteration variable 93`) dr_shld_outboard = 0.2 * outboard shield thickness (m) (`iteration variable 94`) -shldtth = 0.2 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) +dz_shld_upper = 0.2 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) vgap_xpoint_divertor = 0. * vertical gap between x-point and divertor (m) (if = 0; it is calculated) *---------------Buildings Variables----------------* diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index cb1ae471eb..b104aacf66 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -590,7 +590,7 @@ 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 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 7cd66c7c5f..399a613a8a 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -361,7 +361,7 @@ class ComponentHalfHeightParam(NamedTuple): dz_xpoint_divertor: Any = None dz_shld_vv_gap: Any = None dz_blkt_top: Any = None - shldtth: Any = None + dz_shld_upper: Any = None dr_fw_plasma_gap_inboard: Any = None dr_fw_plasma_gap_outboard: Any = None dr_fw_inboard: Any = None @@ -385,7 +385,7 @@ class ComponentHalfHeightParam(NamedTuple): dz_xpoint_divertor=2.0018838307941582, dz_shld_vv_gap=0.16300000000000001, dz_blkt_top=0.85000000000000009, - shldtth=0.59999999999999998, + dz_shld_upper=0.59999999999999998, dr_fw_plasma_gap_inboard=0.25, dr_fw_plasma_gap_outboard=0.25, dr_fw_inboard=0.018000000000000002, @@ -430,7 +430,9 @@ def test_component_half_height( monkeypatch.setattr( build_variables, "dz_blkt_top", componenthalfheightparam.dz_blkt_top ) - monkeypatch.setattr(build_variables, "shldtth", componenthalfheightparam.shldtth) + monkeypatch.setattr( + build_variables, "dz_shld_upper", componenthalfheightparam.dz_shld_upper + ) monkeypatch.setattr( build_variables, "dr_fw_plasma_gap_inboard", @@ -488,7 +490,7 @@ class DshapedComponentParam(NamedTuple): shareaob: Any = None sharea: Any = None dr_shld_outboard: Any = None - shldtth: Any = None + dz_shld_upper: Any = None rsldo: Any = None dr_vv_inboard: Any = None dr_vv_outboard: Any = None @@ -545,7 +547,7 @@ class DshapedComponentParam(NamedTuple): shareaob=0, sharea=0, dr_shld_outboard=0.30000000000000004, - shldtth=0.60000000000000009, + dz_shld_upper=0.60000000000000009, rsldo=8.4000000000000004, dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, @@ -598,7 +600,7 @@ class DshapedComponentParam(NamedTuple): shareaob=0, sharea=0, dr_shld_outboard=0.30000000000000004, - shldtth=0.60000000000000009, + dz_shld_upper=0.60000000000000009, rsldo=8.4000000000000004, dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, @@ -651,7 +653,7 @@ class DshapedComponentParam(NamedTuple): shareaob=1013.8483589087293, sharea=1222.7642703724505, dr_shld_outboard=0.30000000000000004, - shldtth=0.60000000000000009, + dz_shld_upper=0.60000000000000009, rsldo=8.4000000000000004, dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, @@ -739,7 +741,9 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f monkeypatch.setattr( build_variables, "dr_shld_outboard", dshapedcomponentparam.dr_shld_outboard ) - monkeypatch.setattr(build_variables, "shldtth", dshapedcomponentparam.shldtth) + monkeypatch.setattr( + build_variables, "dz_shld_upper", dshapedcomponentparam.dz_shld_upper + ) monkeypatch.setattr(build_variables, "rsldo", dshapedcomponentparam.rsldo) monkeypatch.setattr( build_variables, "dr_vv_inboard", dshapedcomponentparam.dr_vv_inboard @@ -796,7 +800,7 @@ class EllipticalComponentParam(NamedTuple): shareaib: Any = None shareaob: Any = None sharea: Any = None - shldtth: Any = None + dz_shld_upper: Any = None dr_vv_inboard: Any = None dr_vv_outboard: Any = None d_vv_top: Any = None @@ -852,7 +856,7 @@ class EllipticalComponentParam(NamedTuple): shareaib=0, shareaob=0, sharea=0, - shldtth=0.59999999999999998, + dz_shld_upper=0.59999999999999998, dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, d_vv_top=0.30000000000000004, @@ -904,7 +908,7 @@ class EllipticalComponentParam(NamedTuple): shareaib=0, shareaob=0, sharea=0, - shldtth=0.59999999999999998, + dz_shld_upper=0.59999999999999998, dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, d_vv_top=0.30000000000000004, @@ -956,7 +960,7 @@ class EllipticalComponentParam(NamedTuple): shareaib=700.06731267447844, shareaob=1344.1106481995357, sharea=2044.1779608740142, - shldtth=0.59999999999999998, + dz_shld_upper=0.59999999999999998, dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, d_vv_top=0.30000000000000004, @@ -1033,7 +1037,9 @@ def test_elliptical_component( monkeypatch.setattr(build_variables, "shareaib", ellipticalcomponentparam.shareaib) monkeypatch.setattr(build_variables, "shareaob", ellipticalcomponentparam.shareaob) monkeypatch.setattr(build_variables, "sharea", ellipticalcomponentparam.sharea) - monkeypatch.setattr(build_variables, "shldtth", ellipticalcomponentparam.shldtth) + monkeypatch.setattr( + build_variables, "dz_shld_upper", ellipticalcomponentparam.dz_shld_upper + ) monkeypatch.setattr( build_variables, "dr_vv_inboard", ellipticalcomponentparam.dr_vv_inboard ) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 1ce8322a2e..4b5b288ec5 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -14109,7 +14109,7 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): monkeypatch.setattr(sctfcoil_module, "a_case_nose", 0.47) monkeypatch.setattr(build_variables, "dz_xpoint_divertor", 0.05) # Baseline 2018 - monkeypatch.setattr(build_variables, "shldtth", 0.3) # Baseline 2018 + monkeypatch.setattr(build_variables, "dz_shld_upper", 0.3) # Baseline 2018 monkeypatch.setattr( divertor_variables, "dz_divertor", 2.05 ) # chosen to achieve H_vv in Table 2 diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index 5bdaea59df..a1c87a183e 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -256,7 +256,7 @@ class StbildParam(NamedTuple): dr_shld_outboard: Any = None - shldtth: Any = None + dz_shld_upper: Any = None dr_tf_inboard: Any = None @@ -367,7 +367,7 @@ class StbildParam(NamedTuple): dr_fw_plasma_gap_outboard=0.30000000000000004, dr_shld_inboard=0.40000000000000002, dr_shld_outboard=0.70000000000000007, - shldtth=0.70000000000000007, + dz_shld_upper=0.70000000000000007, dr_tf_inboard=0.78058448071757114, dr_tf_outboard=0.78058448071757114, available_radial_space=0, @@ -437,7 +437,7 @@ class StbildParam(NamedTuple): dr_fw_plasma_gap_outboard=0.30000000000000004, dr_shld_inboard=0.40000000000000002, dr_shld_outboard=0.70000000000000007, - shldtth=0.70000000000000007, + dz_shld_upper=0.70000000000000007, dr_tf_inboard=0.78058448071757114, dr_tf_outboard=0.78058448071757114, available_radial_space=1.8828828828828827, @@ -569,7 +569,7 @@ def test_stbild(stbildparam, monkeypatch, stellarator): build_variables, "dr_shld_outboard", stbildparam.dr_shld_outboard ) - monkeypatch.setattr(build_variables, "shldtth", stbildparam.shldtth) + monkeypatch.setattr(build_variables, "dz_shld_upper", stbildparam.dz_shld_upper) monkeypatch.setattr(build_variables, "dr_tf_inboard", stbildparam.dr_tf_inboard) From 3d6a6c5b60abd99179872f25bd7a3bc47bddecd0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 20 Feb 2025 14:49:47 +0000 Subject: [PATCH 11/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20d=5Fvv=5Ftop=20to?= =?UTF-8?q?=20dz=5Fvv=5Fupper=20for=20consistency=20across=20multiple=20fi?= =?UTF-8?q?les?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/machine-build.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/scan_MFILE.DAT | 20 ++++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/blanket_library.py | 4 +-- process/build.py | 26 +++++++-------- process/buildings.py | 2 +- process/geometry/vacuum_vessel_geometry.py | 4 +-- process/init.py | 2 +- process/io/mfile_comparison.py | 2 +- process/io/plot_proc.py | 4 +-- process/sctfcoil.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 +++--- tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.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 | 32 +++++++++++-------- tests/unit/test_sctfcoil.py | 2 +- 42 files changed, 126 insertions(+), 120 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index d3bfb68376..d0a5191fa4 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -67,7 +67,7 @@ case the machine is not symmetric about the midplane. Gap 0.050 8.286 (dr_tf_shld_gap) Thermal shield 0.050 8.236 (thshield) Gap 0.050 8.186 (dz_shld_vv_gap) - Vacuum vessel (and shielding) 0.600 8.136 (d_vv_top+dz_shld_upper) + Vacuum vessel (and shielding) 0.600 8.136 (dz_vv_upper+dz_shld_upper) Gap 0.020 7.536 (dr_shld_blkt_gap) Top blanket 0.869 7.516 (dz_blkt_top) Top first wall 0.018 6.647 (dz_fw_upper) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 3d25bdbf3e..8b25801958 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -594,7 +594,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1499,7 +1499,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 864b60ef95..6ce1f0e02e 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -591,7 +591,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1493,7 +1493,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 5470f43def..6bb7978cc6 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -591,7 +591,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1493,7 +1493,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 6d345531d9..b38e1300f5 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -591,7 +591,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1493,7 +1493,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 27e2eab020..0f1ae2e0f1 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -591,7 +591,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1493,7 +1493,7 @@ dr_vv_inboardnboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 63738b6f92..8bd7ece5e6 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -303,7 +303,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 90648c0263..62d246f1ca 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -444,7 +444,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -1439,7 +1439,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -2434,7 +2434,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -3429,7 +3429,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -4424,7 +4424,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -5419,7 +5419,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -6414,7 +6414,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -7409,7 +7409,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -8404,7 +8404,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -9084,7 +9084,7 @@ dr_bore = 2.483 * Central solenoid inboard radius (m) dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 4520d996ab..9b47570dbf 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -303,7 +303,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/process/blanket_library.py b/process/blanket_library.py index d4e286d3f3..963d8ee373 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -227,7 +227,7 @@ def dshaped_component(self, icomponent: int): blanket_library.hvv, build_variables.dr_vv_inboard, build_variables.dr_vv_outboard, - (build_variables.d_vv_top + build_variables.d_vv_bot) / 2, + (build_variables.dz_vv_upper + build_variables.d_vv_bot) / 2, ) def elliptical_component(self, icomponent: int): @@ -320,7 +320,7 @@ def elliptical_component(self, icomponent: int): blanket_library.hvv, build_variables.dr_vv_inboard, build_variables.dr_vv_outboard, - (build_variables.d_vv_top + build_variables.d_vv_bot) / 2, + (build_variables.dz_vv_upper + build_variables.d_vv_bot) / 2, ) def apply_coverage_factors(self): diff --git a/process/build.py b/process/build.py index 14c590042a..bb1fe7f73d 100644 --- a/process/build.py +++ b/process/build.py @@ -144,7 +144,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dr_tf_shld_gap + build_variables.dz_shld_thermal + build_variables.dz_shld_vv_gap - + build_variables.d_vv_top + + build_variables.dz_vv_upper + build_variables.dz_shld_upper + divertor_variables.dz_divertor + build_variables.dz_fw_plasma_gap @@ -224,18 +224,18 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_top + build_variables.dz_shld_upper, + build_variables.dz_vv_upper + build_variables.dz_shld_upper, vbuild, - "(d_vv_top+dz_shld_upper)", + "(dz_vv_upper+dz_shld_upper)", ) vbuild = ( - vbuild - build_variables.d_vv_top - build_variables.dz_shld_upper + vbuild - build_variables.dz_vv_upper - build_variables.dz_shld_upper ) po.ovarre( self.mfile, "Topside vacuum vessel radial thickness (m)", - "(d_vv_top)", - build_variables.d_vv_top, + "(dz_vv_upper)", + build_variables.dz_vv_upper, ) po.ovarre( self.mfile, @@ -419,7 +419,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dr_tf_shld_gap + build_variables.dz_shld_thermal + build_variables.dz_shld_vv_gap - + 0.5e0 * (build_variables.d_vv_top + build_variables.d_vv_bot) + + 0.5e0 * (build_variables.dz_vv_upper + build_variables.d_vv_bot) + build_variables.dr_shld_blkt_gap + build_variables.dz_shld_upper + build_variables.dz_blkt_top @@ -501,18 +501,18 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_top + build_variables.dz_shld_upper, + build_variables.dz_vv_upper + build_variables.dz_shld_upper, vbuild, - "(d_vv_top+dz_shld_upper)", + "(dz_vv_upper+dz_shld_upper)", ) vbuild = ( - vbuild - build_variables.d_vv_top - build_variables.dz_shld_upper + vbuild - build_variables.dz_vv_upper - build_variables.dz_shld_upper ) po.ovarre( self.mfile, "Topside vacuum vessel radial thickness (m)", - "(d_vv_top)", - build_variables.d_vv_top, + "(dz_vv_upper)", + build_variables.dz_vv_upper, ) po.ovarre( self.mfile, @@ -758,7 +758,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dr_tf_shld_gap + build_variables.dz_shld_thermal + build_variables.dz_shld_vv_gap - + build_variables.d_vv_top + + build_variables.dz_vv_upper + build_variables.dz_shld_upper + build_variables.dr_shld_blkt_gap + build_variables.dz_blkt_top diff --git a/process/buildings.py b/process/buildings.py index 072705d2e4..8061cbb78f 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -84,7 +84,7 @@ def run(self, output: bool = False): build_variables.rsldo, build_variables.rsldi, 2.0e0 * (build_variables.hmax - build_variables.dz_shld_vv_gap) - - build_variables.d_vv_top + - build_variables.dz_vv_upper - build_variables.d_vv_bot, fwbs_variables.whtshld, fwbs_variables.r_cryostat_inboard, diff --git a/process/geometry/vacuum_vessel_geometry.py b/process/geometry/vacuum_vessel_geometry.py index e9f89c959a..d3cd8f6a77 100644 --- a/process/geometry/vacuum_vessel_geometry.py +++ b/process/geometry/vacuum_vessel_geometry.py @@ -43,13 +43,13 @@ def vacuum_vessel_geometry_single_null( :rtype: ArbitraryGeometry """ # Upper vacuum vessel - kapx = cumulative_upper["d_vv_top"] / rminx_outer + kapx = cumulative_upper["dz_vv_upper"] / rminx_outer rs_upper_outboard, zs_upper_outboard = dh_vertices( radx_outer, rminx_outer, triang, kapx ) kapx = ( - float(cumulative_upper["d_vv_top"]) - float(upper["d_vv_top"]) + float(cumulative_upper["dz_vv_upper"]) - float(upper["dz_vv_upper"]) ) / rminx_inner rs_upper_inboard, zs_upper_inboard = dh_vertices( radx_inner, rminx_inner, triang, kapx diff --git a/process/init.py b/process/init.py index eed0833aff..e6dff47d3f 100644 --- a/process/init.py +++ b/process/init.py @@ -662,7 +662,7 @@ def check_process(): fortran.build_variables.dz_xpoint_divertor ) fortran.build_variables.dz_shld_upper = fortran.build_variables.dz_shld_lower - fortran.build_variables.d_vv_top = fortran.build_variables.d_vv_bot + fortran.build_variables.dz_vv_upper = fortran.build_variables.d_vv_bot warn("Double-null: Upper vertical build forced to match lower", stacklevel=2) else: # i_single_null == 1 fortran.physics_variables.idivrt = 1 diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index ac6ef279ea..771341cf9b 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -155,7 +155,7 @@ "dr_shld_vv_gap_inboard", "dr_vv_inboard", "dr_vv_outboard", - "d_vv_top", + "dz_vv_upper", "d_vv_bot", "dr_shld_inboard", "dr_shld_blkt_gap", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index ccc8094d4e..ce7ba9cc52 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3647,7 +3647,7 @@ def main(args=None): "dz_fw_plasma_gap", "dz_divertor", "dz_shld_upper", - "d_vv_top", + "dz_vv_upper", "dz_shld_vv_gap", "dz_shld_thermal", "dr_tf_shld_gap", @@ -3661,7 +3661,7 @@ def main(args=None): "dz_blkt_top", "dr_shld_blkt_gap", "dz_shld_upper", - "d_vv_top", + "dz_vv_upper", "dz_shld_vv_gap", "dz_shld_thermal", "dr_tf_shld_gap", diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 736968b455..a60fbee2d3 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -2325,7 +2325,7 @@ def vv_stress_on_quench(self): + build_variables.dz_xpoint_divertor + divertor_variables.dz_divertor + build_variables.dz_shld_upper - + (build_variables.d_vv_top / 2) + + (build_variables.dz_vv_upper / 2) ) # ri and ro for VV dont consider the shield widths # because it is assumed the shield is on the plasma side diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index 9f8b2b1917..4fcd56e367 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -72,7 +72,7 @@ module build_variables real(dp) :: dr_vv_outboard !! vacuum vessel outboard thickness (TF coil / shield) (m) - real(dp) :: d_vv_top + real(dp) :: dz_vv_upper !! vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) real(dp) :: d_vv_bot @@ -325,7 +325,7 @@ subroutine init_build_variables dr_cryostat = 0.07D0 dr_vv_inboard = 0.07D0 dr_vv_outboard = 0.07D0 - d_vv_top = 0.07D0 + dz_vv_upper = 0.07D0 d_vv_bot = 0.07D0 f_avspace = 1.0D0 fcspc = 0.6D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index cde6e9cc01..e4ac4d885b 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -198,7 +198,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) rinboard, dr_blkt_outboard, fseppc, plsepo, dr_blkt_inboard, & dr_cs, plsepi, blbmith, dr_cs_tf_gap, fcspc, dr_fw_plasma_gap_outboard, dz_fw_plasma_gap, & blbpoth, dr_shld_vv_gap_inboard, dr_fw_inboard, dz_xpoint_divertor, dr_shld_inboard, sigallpc, tfootfi, f_avspace,& - r_cp_top, dr_vv_inboard, dr_vv_outboard, d_vv_top, d_vv_bot, f_r_cp, i_r_cp_top + r_cp_top, dr_vv_inboard, dr_vv_outboard, dz_vv_upper, d_vv_bot, f_r_cp, i_r_cp_top use buildings_variables, only: hcwt, conv, wgt, trcl, rbwt, & esbldgm3, fndt, row, wgt2, pibv, dz_tf_cryostat, stcl, clh2, & tfcbv, hccl, rbrt, triv, shov, admv, i_bldgs_v, i_bldgs_size, & @@ -1320,8 +1320,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dr_vv_outboard') call parse_real_variable('dr_vv_outboard', dr_vv_outboard, 0.0D0, 10.0D0, & 'Outboard vacuum vessel thickness (m)') - case ('d_vv_top') - call parse_real_variable('d_vv_top', d_vv_top, 0.0D0, 10.0D0, & + case ('dz_vv_upper') + call parse_real_variable('dz_vv_upper', dz_vv_upper, 0.0D0, 10.0D0, & 'Topside vacuum vessel thickness (m)') case ('d_vv_bot') call parse_real_variable('d_vv_bot', d_vv_bot, 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 b4c766485a..7e47c744f9 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -590,7 +590,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1492,7 +1492,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 1ceeefab2f..f64e235445 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -591,7 +591,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1493,7 +1493,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index e570f7cd0e..609925a781 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -591,7 +591,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1493,7 +1493,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index c22409ed51..0c1024a7bb 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -591,7 +591,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1493,7 +1493,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 731bfdf282..86412ceac9 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -303,7 +303,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 08c5a7e645..b1b4f9855b 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -589,7 +589,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1494,7 +1494,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 441b3c573b..907a4bc7f9 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -99,7 +99,7 @@ dr_bore = 2.003843190236783 * central solenoid inboard radius (m) (`iteratio dr_cryostat = 0.15 * cryostat thickness (m) dr_vv_inboard = 0.3 * vacuum vessel inboard thickness (TF coil / shield) (m) dr_vv_outboard = 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) +dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) d_vv_bot = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) dr_shld_vv_gap_inboard = 0.02 * gap between inboard vacuum vessel and thermal shield (m) (`iteration variable 61`) dr_cs = 0.546816593988753 * Central solenoid thickness (m) (`iteration variable 16`) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index e3ab7e3225..6a44067469 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -105,7 +105,7 @@ dr_bore = 2.483 * Central solenoid inboard radius (m) dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 96cf4201d7..25df465ac9 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -592,7 +592,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1755,7 +1755,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -2918,7 +2918,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -4081,7 +4081,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -5244,7 +5244,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -6407,7 +6407,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -7570,7 +7570,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -8733,7 +8733,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -9896,7 +9896,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -11059,7 +11059,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -12222,7 +12222,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -13385,7 +13385,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -14548,7 +14548,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -15711,7 +15711,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -16874,7 +16874,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -17779,7 +17779,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index f69e66b024..09c7a82fca 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -444,7 +444,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -1439,7 +1439,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -2434,7 +2434,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -3429,7 +3429,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -4424,7 +4424,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -5419,7 +5419,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -6414,7 +6414,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -7409,7 +7409,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -8404,7 +8404,7 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 @@ -9084,7 +9084,7 @@ dr_bore = 2.483 * Central solenoid inboard radius (m) dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 100a73215d..bc5098b605 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -105,7 +105,7 @@ dr_bore = 2.483 * Central solenoid inboard radius (m) dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 96619a287f..a8845a2a48 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -105,7 +105,7 @@ dr_bore = 2.483 * Central solenoid inboard radius (m) dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 77c13e6e6d..0b3fa1acab 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1586,7 +1586,7 @@ "d_vv_bot": 0.07, "dr_vv_inboard": 0.07, "dr_vv_outboard": 0.07, - "d_vv_top": 0.07, + "dz_vv_upper": 0.07, "dalu": 2700.0, "data_lz": 0.0, "data_qz": 0.0, @@ -9248,7 +9248,7 @@ "d_vv_bot": "vacuum vessel underside thickness (TF coil / shield) (m)", "dr_vv_inboard": "vacuum vessel inboard thickness (TF coil / shield) (m)", "dr_vv_outboard": "vacuum vessel outboard thickness (TF coil / shield) (m)", - "d_vv_top": "vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null)", + "dz_vv_upper": "vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null)", "dalu": "density of aluminium (kg/m3)", "data_lz": "", "data_qz": "", @@ -12129,7 +12129,7 @@ "lb": 0.0, "ub": 10.0 }, - "d_vv_top": { + "dz_vv_upper": { "lb": 0.0, "ub": 10.0 }, @@ -17011,7 +17011,7 @@ "dr_cryostat", "dr_vv_inboard", "dr_vv_outboard", - "d_vv_top", + "dz_vv_upper", "d_vv_bot", "f_avspace", "fcspc", @@ -20138,7 +20138,7 @@ "d_vv_bot": "real_variable", "dr_vv_inboard": "real_variable", "dr_vv_outboard": "real_variable", - "d_vv_top": "real_variable", + "dz_vv_upper": "real_variable", "dalu": "real_variable", "dcase": "real_variable", "dcdrv0": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index cb4fe34deb..73a22844db 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -85,7 +85,7 @@ dr_blkt_outboard = 0.8 *Outboard blanket thickness (m) dr_cryostat = 0.15 *Cryostat thickness (m) dr_vv_inboard = 0.35 *Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.35 *Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.35 *Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.35 *Topside vacuum vessel thickness (tf coil / shield) (m) d_vv_bot = 0.35 *Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 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/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index e6cbf3db8d..0ac6070c98 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -303,7 +303,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index c4c4308927..fad0425754 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -285,7 +285,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 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 c22a430055..7247874a8a 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -99,7 +99,7 @@ dr_bore = 2.003843190236783 * central solenoid inboard radius (m) (`iteratio dr_cryostat = 0.15 * cryostat thickness (m) dr_vv_inboard = 0.3 * vacuum vessel inboard thickness (TF coil / shield) (m) dr_vv_outboard = 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) +dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) d_vv_bot = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) dr_shld_vv_gap_inboard = 0.02 * gap between inboard vacuum vessel and thermal shield (m) (`iteration variable 61`) dr_cs = 0.546816593988753 * Central solenoid thickness (m) (`iteration variable 16`) diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 58c0f89335..264276e274 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -119,7 +119,7 @@ dr_blkt_outboard = 1.0 * outboard blanket thickness (m); calculated if `blktmod dr_bore = 0.23375250334739459 * central solenoid inboard radius (m) (`iteration variable 29`) dr_vv_inboard = 0.2 * vacuum vessel inboard thickness (TF coil / shield) (m) dr_vv_outboard = 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) +dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) d_vv_bot = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) dr_shld_vv_gap_inboard = 0.01 * gap between inboard vacuum vessel and thermal shield (m) (`iteration variable 61`) dr_cs_tf_gap = 0.0 * gap between central solenoid and TF coil (m) (`iteration variable 42`) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 6caeded02f..e2f48aff23 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2180,7 +2180,7 @@ dz_shld_vv_gap = 2.0 * DESCRIPTION: Vertical Gap Between Vacuum Vessel and TF coil (m) * JUSTIFICATION: -d_vv_top = 0.3 +dz_vv_upper = 0.3 * DESCRIPTION: top vaccum vessel thickness(m) * JUSTIFICATION: Set to match outboard build diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index c292d0e616..519ff1cd94 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -303,7 +303,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index b104aacf66..e3fc0803fb 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -589,7 +589,7 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 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 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 @@ -1494,7 +1494,7 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] d_vv_bot = 0.3 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 399a613a8a..2f7c743258 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -367,7 +367,7 @@ class ComponentHalfHeightParam(NamedTuple): dr_fw_inboard: Any = None dr_fw_outboard: Any = None d_vv_bot: Any = None - d_vv_top: Any = None + dz_vv_upper: Any = None z_plasma_xpoint_lower: Any = None z_plasma_xpoint_upper: Any = None idivrt: Any = None @@ -391,7 +391,7 @@ class ComponentHalfHeightParam(NamedTuple): dr_fw_inboard=0.018000000000000002, dr_fw_outboard=0.018000000000000002, d_vv_bot=0.30000000000000004, - d_vv_top=0.30000000000000004, + dz_vv_upper=0.30000000000000004, z_plasma_xpoint_lower=4.93333333333333333, z_plasma_xpoint_upper=4.93333333333333333, idivrt=1, @@ -450,7 +450,9 @@ def test_component_half_height( build_variables, "dr_fw_outboard", componenthalfheightparam.dr_fw_outboard ) monkeypatch.setattr(build_variables, "d_vv_bot", componenthalfheightparam.d_vv_bot) - monkeypatch.setattr(build_variables, "d_vv_top", componenthalfheightparam.d_vv_top) + monkeypatch.setattr( + build_variables, "dz_vv_upper", componenthalfheightparam.dz_vv_upper + ) monkeypatch.setattr( build_variables, "z_plasma_xpoint_lower", @@ -494,7 +496,7 @@ class DshapedComponentParam(NamedTuple): rsldo: Any = None dr_vv_inboard: Any = None dr_vv_outboard: Any = None - d_vv_top: Any = None + dz_vv_upper: Any = None d_vv_bot: Any = None volblkti: Any = None volblkto: Any = None @@ -551,7 +553,7 @@ class DshapedComponentParam(NamedTuple): rsldo=8.4000000000000004, dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, + dz_vv_upper=0.30000000000000004, d_vv_bot=0.30000000000000004, volblkti=0, volblkto=0, @@ -604,7 +606,7 @@ class DshapedComponentParam(NamedTuple): rsldo=8.4000000000000004, dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, + dz_vv_upper=0.30000000000000004, d_vv_bot=0.30000000000000004, volblkti=0, volblkto=691.06561956756764, @@ -657,7 +659,7 @@ class DshapedComponentParam(NamedTuple): rsldo=8.4000000000000004, dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, + dz_vv_upper=0.30000000000000004, d_vv_bot=0.30000000000000004, volblkti=0, volblkto=691.06561956756764, @@ -751,7 +753,9 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f monkeypatch.setattr( build_variables, "dr_vv_outboard", dshapedcomponentparam.dr_vv_outboard ) - monkeypatch.setattr(build_variables, "d_vv_top", dshapedcomponentparam.d_vv_top) + monkeypatch.setattr( + build_variables, "dz_vv_upper", dshapedcomponentparam.dz_vv_upper + ) monkeypatch.setattr(build_variables, "d_vv_bot", dshapedcomponentparam.d_vv_bot) monkeypatch.setattr(fwbs_variables, "volblkti", dshapedcomponentparam.volblkti) monkeypatch.setattr(fwbs_variables, "volblkto", dshapedcomponentparam.volblkto) @@ -803,7 +807,7 @@ class EllipticalComponentParam(NamedTuple): dz_shld_upper: Any = None dr_vv_inboard: Any = None dr_vv_outboard: Any = None - d_vv_top: Any = None + dz_vv_upper: Any = None d_vv_bot: Any = None volblkti: Any = None volblkto: Any = None @@ -859,7 +863,7 @@ class EllipticalComponentParam(NamedTuple): dz_shld_upper=0.59999999999999998, dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, + dz_vv_upper=0.30000000000000004, d_vv_bot=0.30000000000000004, volblkti=0, volblkto=0, @@ -911,7 +915,7 @@ class EllipticalComponentParam(NamedTuple): dz_shld_upper=0.59999999999999998, dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, + dz_vv_upper=0.30000000000000004, d_vv_bot=0.30000000000000004, volblkti=315.83946385183026, volblkto=1020.3677420460117, @@ -963,7 +967,7 @@ class EllipticalComponentParam(NamedTuple): dz_shld_upper=0.59999999999999998, dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, + dz_vv_upper=0.30000000000000004, d_vv_bot=0.30000000000000004, volblkti=315.83946385183026, volblkto=1020.3677420460117, @@ -1046,7 +1050,9 @@ def test_elliptical_component( monkeypatch.setattr( build_variables, "dr_vv_outboard", ellipticalcomponentparam.dr_vv_outboard ) - monkeypatch.setattr(build_variables, "d_vv_top", ellipticalcomponentparam.d_vv_top) + monkeypatch.setattr( + build_variables, "dz_vv_upper", ellipticalcomponentparam.dz_vv_upper + ) monkeypatch.setattr(build_variables, "d_vv_bot", ellipticalcomponentparam.d_vv_bot) monkeypatch.setattr(fwbs_variables, "volblkti", ellipticalcomponentparam.volblkti) monkeypatch.setattr(fwbs_variables, "volblkto", ellipticalcomponentparam.volblkto) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 4b5b288ec5..e5d211e158 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -14125,7 +14125,7 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): monkeypatch.setattr(build_variables, "dr_vv_outboard", 0.06) # Section 3 monkeypatch.setattr(build_variables, "dr_vv_inboard", 0.06) # Section 3 - monkeypatch.setattr(build_variables, "d_vv_top", 0.06) # Section 3 + monkeypatch.setattr(build_variables, "dz_vv_upper", 0.06) # Section 3 monkeypatch.setattr(tfcoil_variables, "len_tf_coil", 51.1) # Table 2 monkeypatch.setattr( From fa69f278eba35c1b3cc6f70174ffef410e232940 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 20 Feb 2025 14:51:36 +0000 Subject: [PATCH 12/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20d=5Fvv=5Fbot=20to?= =?UTF-8?q?=20dz=5Fvv=5Flower=20for=20consistency=20across=20multiple=20fi?= =?UTF-8?q?les?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/machine-build.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/scan_MFILE.DAT | 20 ++++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/blanket_library.py | 6 ++-- process/build.py | 25 ++++++++------- process/buildings.py | 2 +- process/geometry/vacuum_vessel_geometry.py | 4 +-- process/init.py | 2 +- process/io/mfile_comparison.py | 4 +-- process/io/plot_proc.py | 2 +- source/fortran/build_variables.f90 | 6 ++-- 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 | 4 +-- 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 | 12 +++---- tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 4 +-- .../spherical_tokamak_once_through.IN.DAT | 4 +-- .../input_files/st_regression.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 | 32 +++++++++++-------- 40 files changed, 130 insertions(+), 123 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index d0a5191fa4..0b596caceb 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -77,7 +77,7 @@ case the machine is not symmetric about the midplane. Plasma bottom 6.029 -6.029 (z_plasma_xpoint_upper) Lower scrape-off 2.002 -8.031 (vgap) Divertor structure 0.621 -8.652 (dz_divertor) - Vacuum vessel (and shielding) 1.000 -9.652 (d_vv_bot+dz_shld_lower) + Vacuum vessel (and shielding) 1.000 -9.652 (dz_vv_lower+dz_shld_lower) Gap 0.050 -9.702 (dz_shld_vv_gap) Thermal shield 0.050 -9.752 (thshield) Gap 0.050 -9.802 (dr_tf_shld_gap) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 8b25801958..8b5514ef9c 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -603,7 +603,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1502,7 +1502,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 6ce1f0e02e..e484c264ab 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -600,7 +600,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1496,7 +1496,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 6bb7978cc6..b9fa7b3034 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -600,7 +600,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1496,7 +1496,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index b38e1300f5..418585e224 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -600,7 +600,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1496,7 +1496,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 0f1ae2e0f1..1268f0f04b 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -600,7 +600,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1496,7 +1496,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 8bd7ece5e6..4fb4347585 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -306,7 +306,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard radiation shield radial thickness [m] dr_shld_inboard = 0.3 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 62d246f1ca..2d204abd4a 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -453,7 +453,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1448,7 +1448,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -2443,7 +2443,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -3438,7 +3438,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -4433,7 +4433,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -5428,7 +5428,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -6423,7 +6423,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -7418,7 +7418,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -8413,7 +8413,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -9085,7 +9085,7 @@ dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) gapomin = 0.20 * Minimum gap between outboard vacuum vessel and tf coil (m) diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 9b47570dbf..87fe4c212c 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -306,7 +306,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/process/blanket_library.py b/process/blanket_library.py index 963d8ee373..707898fea8 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -113,7 +113,7 @@ def component_half_height(self, icomponent: int): hbot = ( build_variables.hmax - build_variables.dz_shld_vv_gap - - build_variables.d_vv_bot + - build_variables.dz_vv_lower ) else: raise ValueError(f"{icomponent=} is invalid, it must be either 0,1,2") @@ -227,7 +227,7 @@ def dshaped_component(self, icomponent: int): blanket_library.hvv, build_variables.dr_vv_inboard, build_variables.dr_vv_outboard, - (build_variables.dz_vv_upper + build_variables.d_vv_bot) / 2, + (build_variables.dz_vv_upper + build_variables.dz_vv_lower) / 2, ) def elliptical_component(self, icomponent: int): @@ -320,7 +320,7 @@ def elliptical_component(self, icomponent: int): blanket_library.hvv, build_variables.dr_vv_inboard, build_variables.dr_vv_outboard, - (build_variables.dz_vv_upper + build_variables.d_vv_bot) / 2, + (build_variables.dz_vv_upper + build_variables.dz_vv_lower) / 2, ) def apply_coverage_factors(self): diff --git a/process/build.py b/process/build.py index bb1fe7f73d..1dfc4e8702 100644 --- a/process/build.py +++ b/process/build.py @@ -332,13 +332,13 @@ def calculate_vertical_build(self, output: bool) -> None: vbuild = vbuild - build_variables.dz_shld_lower - vbuild = vbuild - build_variables.d_vv_bot + vbuild = vbuild - build_variables.dz_vv_lower po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_bot + build_variables.dz_shld_lower, + build_variables.dz_vv_lower + build_variables.dz_shld_lower, vbuild, - "(d_vv_bot+dz_shld_lower)", + "(dz_vv_lower+dz_shld_lower)", ) po.ovarre( self.mfile, @@ -349,8 +349,8 @@ def calculate_vertical_build(self, output: bool) -> None: po.ovarre( self.mfile, "Underside vacuum vessel radial thickness (m)", - "(d_vv_bot)", - build_variables.d_vv_bot, + "(dz_vv_lower)", + build_variables.dz_vv_lower, ) vbuild = vbuild - build_variables.dz_shld_vv_gap @@ -419,7 +419,8 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dr_tf_shld_gap + build_variables.dz_shld_thermal + build_variables.dz_shld_vv_gap - + 0.5e0 * (build_variables.dz_vv_upper + build_variables.d_vv_bot) + + 0.5e0 + * (build_variables.dz_vv_upper + build_variables.dz_vv_lower) + build_variables.dr_shld_blkt_gap + build_variables.dz_shld_upper + build_variables.dz_blkt_top @@ -632,13 +633,13 @@ def calculate_vertical_build(self, output: bool) -> None: vbuild = vbuild - build_variables.dz_shld_lower - vbuild = vbuild - build_variables.d_vv_bot + vbuild = vbuild - build_variables.dz_vv_lower po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_bot + build_variables.dz_shld_lower, + build_variables.dz_vv_lower + build_variables.dz_shld_lower, vbuild, - "(d_vv_bot+dz_shld_lower)", + "(dz_vv_lower+dz_shld_lower)", ) po.ovarre( self.mfile, @@ -649,8 +650,8 @@ def calculate_vertical_build(self, output: bool) -> None: po.ovarre( self.mfile, "Underside vacuum vessel radial thickness (m)", - "(d_vv_bot)", - build_variables.d_vv_bot, + "(dz_vv_lower)", + build_variables.dz_vv_lower, ) vbuild = vbuild - build_variables.dz_shld_vv_gap @@ -742,7 +743,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dz_xpoint_divertor + divertor_variables.dz_divertor + build_variables.dz_shld_lower - + build_variables.d_vv_bot + + build_variables.dz_vv_lower + build_variables.dz_shld_vv_gap + build_variables.dz_shld_thermal + build_variables.dr_tf_shld_gap diff --git a/process/buildings.py b/process/buildings.py index 8061cbb78f..3dafebe309 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -85,7 +85,7 @@ def run(self, output: bool = False): build_variables.rsldi, 2.0e0 * (build_variables.hmax - build_variables.dz_shld_vv_gap) - build_variables.dz_vv_upper - - build_variables.d_vv_bot, + - build_variables.dz_vv_lower, fwbs_variables.whtshld, fwbs_variables.r_cryostat_inboard, heat_transport_variables.helpow, diff --git a/process/geometry/vacuum_vessel_geometry.py b/process/geometry/vacuum_vessel_geometry.py index d3cd8f6a77..a80b1eec66 100644 --- a/process/geometry/vacuum_vessel_geometry.py +++ b/process/geometry/vacuum_vessel_geometry.py @@ -117,13 +117,13 @@ def vacuum_vessel_geometry_lower( :return: tuple containing the R coordinates for the outboard, Z coordinates for the outboard, R coordinates for the inboard, Z coordinates for the inboard of the vacuum vessel geometry below the midplane :rtype: Tuple[np.ndarray, np.ndarray, np.ndarray, np.ndarray] """ - kapx = cumulative_lower["d_vv_bot"] / rminx_outer + kapx = cumulative_lower["dz_vv_lower"] / rminx_outer rs_lower_outboard, zs_lower_outboard = dh_vertices( radx_outer, rminx_outer, triang, kapx ) kapx = ( - float(cumulative_lower["d_vv_bot"]) + float(lower["d_vv_bot"]) + float(cumulative_lower["dz_vv_lower"]) + float(lower["dz_vv_lower"]) ) / rminx_inner rs_lower_inboard, zs_lower_inboard = dh_vertices( radx_inner, rminx_inner, triang, kapx diff --git a/process/init.py b/process/init.py index e6dff47d3f..7c37f73b9b 100644 --- a/process/init.py +++ b/process/init.py @@ -662,7 +662,7 @@ def check_process(): fortran.build_variables.dz_xpoint_divertor ) fortran.build_variables.dz_shld_upper = fortran.build_variables.dz_shld_lower - fortran.build_variables.dz_vv_upper = fortran.build_variables.d_vv_bot + fortran.build_variables.dz_vv_upper = fortran.build_variables.dz_vv_lower warn("Double-null: Upper vertical build forced to match lower", stacklevel=2) else: # i_single_null == 1 fortran.physics_variables.idivrt = 1 diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 771341cf9b..83fb1aedff 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -156,7 +156,7 @@ "dr_vv_inboard", "dr_vv_outboard", "dz_vv_upper", - "d_vv_bot", + "dz_vv_lower", "dr_shld_inboard", "dr_shld_blkt_gap", "dr_blkt_inboard", @@ -262,7 +262,7 @@ "dr_tf_outboard", "dz_xpoint_divertor", "dz_divertor", - "d_vv_bot", + "dz_vv_lower", "dz_shld_lower", "dz_shld_vv_gap", ] diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index ce7ba9cc52..80e3ecc431 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -156,7 +156,7 @@ def parse_args(args): "dz_xpoint_divertor", "dz_divertor", "dz_shld_lower", - "d_vv_bot", + "dz_vv_lower", "dz_shld_vv_gap", "dz_shld_thermal", "dr_tf_shld_gap", diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index 4fcd56e367..d39a79b9c8 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -73,9 +73,9 @@ module build_variables !! vacuum vessel outboard thickness (TF coil / shield) (m) real(dp) :: dz_vv_upper - !! vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) + !! vacuum vessel topside thickness (TF coil / shield) (m) (= dz_vv_lower if double-null) - real(dp) :: d_vv_bot + real(dp) :: dz_vv_lower !! vacuum vessel underside thickness (TF coil / shield) (m) real(dp) :: f_avspace @@ -326,7 +326,7 @@ subroutine init_build_variables dr_vv_inboard = 0.07D0 dr_vv_outboard = 0.07D0 dz_vv_upper = 0.07D0 - d_vv_bot = 0.07D0 + dz_vv_lower = 0.07D0 f_avspace = 1.0D0 fcspc = 0.6D0 fseppc = 3.5D8 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index e4ac4d885b..c56c6e9ddd 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -198,7 +198,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) rinboard, dr_blkt_outboard, fseppc, plsepo, dr_blkt_inboard, & dr_cs, plsepi, blbmith, dr_cs_tf_gap, fcspc, dr_fw_plasma_gap_outboard, dz_fw_plasma_gap, & blbpoth, dr_shld_vv_gap_inboard, dr_fw_inboard, dz_xpoint_divertor, dr_shld_inboard, sigallpc, tfootfi, f_avspace,& - r_cp_top, dr_vv_inboard, dr_vv_outboard, dz_vv_upper, d_vv_bot, f_r_cp, i_r_cp_top + r_cp_top, dr_vv_inboard, dr_vv_outboard, dz_vv_upper, dz_vv_lower, f_r_cp, i_r_cp_top use buildings_variables, only: hcwt, conv, wgt, trcl, rbwt, & esbldgm3, fndt, row, wgt2, pibv, dz_tf_cryostat, stcl, clh2, & tfcbv, hccl, rbrt, triv, shov, admv, i_bldgs_v, i_bldgs_size, & @@ -1323,8 +1323,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dz_vv_upper') call parse_real_variable('dz_vv_upper', dz_vv_upper, 0.0D0, 10.0D0, & 'Topside vacuum vessel thickness (m)') - case ('d_vv_bot') - call parse_real_variable('d_vv_bot', d_vv_bot, 0.0D0, 10.0D0, & + case ('dz_vv_lower') + call parse_real_variable('dz_vv_lower', dz_vv_lower, 0.0D0, 10.0D0, & 'Underside vacuum vessel thickness (m)') case ('fcspc') call parse_real_variable('fcspc', fcspc, 0.0D0, 1.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 7e47c744f9..974295d508 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -599,7 +599,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1495,7 +1495,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index f64e235445..3ad9b77d8d 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -600,7 +600,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1496,7 +1496,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 609925a781..72e39c6452 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -600,7 +600,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1496,7 +1496,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 0c1024a7bb..f62b5b6921 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -600,7 +600,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1496,7 +1496,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 86412ceac9..2ca5ff9023 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -306,7 +306,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard radiation shield radial thickness [m] dr_shld_inboard = 0.3 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b1b4f9855b..d90ca19649 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -598,7 +598,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(excludes_structure)_(m)____________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1497,7 +1497,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 907a4bc7f9..288e9ca5f1 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -99,8 +99,8 @@ dr_bore = 2.003843190236783 * central solenoid inboard radius (m) (`iteratio dr_cryostat = 0.15 * cryostat thickness (m) dr_vv_inboard = 0.3 * vacuum vessel inboard thickness (TF coil / shield) (m) dr_vv_outboard = 0.3 * vacuum vessel outboard thickness (TF coil / shield) (m) -dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) -d_vv_bot = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) +dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= dz_vv_lower if double-null) +dz_vv_lower = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) dr_shld_vv_gap_inboard = 0.02 * gap between inboard vacuum vessel and thermal shield (m) (`iteration variable 61`) dr_cs = 0.546816593988753 * Central solenoid thickness (m) (`iteration variable 16`) dr_fw_plasma_gap_inboard = 0.25 * Gap between plasma and first wall; inboard side (m) (if `iscrp=1`) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 6a44067469..b50005cec9 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -106,7 +106,7 @@ dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) gapomin = 0.20 * Minimum gap between outboard vacuum vessel and tf coil (m) diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 25df465ac9..a2fb1f29ae 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -601,7 +601,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1764,7 +1764,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -2927,7 +2927,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -4090,7 +4090,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -5253,7 +5253,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -6416,7 +6416,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -7579,7 +7579,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -8742,7 +8742,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -9905,7 +9905,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -11068,7 +11068,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -12231,7 +12231,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -13394,7 +13394,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -14557,7 +14557,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -15720,7 +15720,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -16883,7 +16883,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -17782,7 +17782,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 09c7a82fca..890e18117c 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -453,7 +453,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1448,7 +1448,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -2443,7 +2443,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -3438,7 +3438,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -4433,7 +4433,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -5428,7 +5428,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -6423,7 +6423,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -7418,7 +7418,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -8413,7 +8413,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -9085,7 +9085,7 @@ dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) gapomin = 0.20 * Minimum gap between outboard vacuum vessel and tf coil (m) diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index bc5098b605..6722279d0a 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -106,7 +106,7 @@ dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) gapomin = 0.20 * Minimum gap between outboard vacuum vessel and tf coil (m) diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index a8845a2a48..3a3826cb92 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -106,7 +106,7 @@ dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) gapomin = 0.20 * Minimum gap between outboard vacuum vessel and tf coil (m) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 0b3fa1acab..c6dbbdb669 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1583,7 +1583,7 @@ "f_vol_plasma": 1.0, "f_r_conducting_wall": 1.35, "czero": "(0.0_wp_, 0.0_wp_)", - "d_vv_bot": 0.07, + "dz_vv_lower": 0.07, "dr_vv_inboard": 0.07, "dr_vv_outboard": 0.07, "dz_vv_upper": 0.07, @@ -9245,10 +9245,10 @@ "f_vol_plasma": "multiplying factor times plasma volume (normally=1)", "f_r_conducting_wall": "maximum ratio of conducting wall distance to plasma minor radius for\n vertical stability (`constraint equation 23`)", "czero": "", - "d_vv_bot": "vacuum vessel underside thickness (TF coil / shield) (m)", + "dz_vv_lower": "vacuum vessel underside thickness (TF coil / shield) (m)", "dr_vv_inboard": "vacuum vessel inboard thickness (TF coil / shield) (m)", "dr_vv_outboard": "vacuum vessel outboard thickness (TF coil / shield) (m)", - "dz_vv_upper": "vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null)", + "dz_vv_upper": "vacuum vessel topside thickness (TF coil / shield) (m) (= dz_vv_lower if double-null)", "dalu": "density of aluminium (kg/m3)", "data_lz": "", "data_qz": "", @@ -12117,7 +12117,7 @@ "lb": 1.0, "ub": 3.0 }, - "d_vv_bot": { + "dz_vv_lower": { "lb": 0.0, "ub": 10.0 }, @@ -17012,7 +17012,7 @@ "dr_vv_inboard", "dr_vv_outboard", "dz_vv_upper", - "d_vv_bot", + "dz_vv_lower", "f_avspace", "fcspc", "fseppc", @@ -20135,7 +20135,7 @@ "cturbb": "real_variable", "f_vol_plasma": "real_variable", "f_r_conducting_wall": "real_variable", - "d_vv_bot": "real_variable", + "dz_vv_lower": "real_variable", "dr_vv_inboard": "real_variable", "dr_vv_outboard": "real_variable", "dz_vv_upper": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index 73a22844db..0970a7fb53 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -86,7 +86,7 @@ dr_cryostat = 0.15 *Cryostat thickness (m) dr_vv_inboard = 0.35 *Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.35 *Outboard vacuum vessel thickness (tf coil / shield) (m) dz_vv_upper = 0.35 *Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.35 *Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.35 *Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.025 *Gap between inboard vacuum vessel and tf coil (m) gapomin = 0.025 *Minimum gap between outboard vacuum vessel and TF coil (m) dr_fw_plasma_gap_inboard = 0.15 *Gap between plasma and first wall; inboard side (m) diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 0ac6070c98..f8dbe7054d 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -306,7 +306,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index fad0425754..287c6b6603 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -288,7 +288,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 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 7247874a8a..35087e33fb 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -99,8 +99,8 @@ dr_bore = 2.003843190236783 * central solenoid inboard radius (m) (`iteratio dr_cryostat = 0.15 * cryostat thickness (m) dr_vv_inboard = 0.3 * vacuum vessel inboard thickness (TF coil / shield) (m) dr_vv_outboard = 0.3 * vacuum vessel outboard thickness (TF coil / shield) (m) -dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) -d_vv_bot = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) +dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= dz_vv_lower if double-null) +dz_vv_lower = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) dr_shld_vv_gap_inboard = 0.02 * gap between inboard vacuum vessel and thermal shield (m) (`iteration variable 61`) dr_cs = 0.546816593988753 * Central solenoid thickness (m) (`iteration variable 16`) dr_fw_plasma_gap_inboard = 0.25 * Gap between plasma and first wall; inboard side (m) (if `i_plasma_wall_gap=1`) diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 264276e274..30d6ca6893 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -119,8 +119,8 @@ dr_blkt_outboard = 1.0 * outboard blanket thickness (m); calculated if `blktmod dr_bore = 0.23375250334739459 * central solenoid inboard radius (m) (`iteration variable 29`) dr_vv_inboard = 0.2 * vacuum vessel inboard thickness (TF coil / shield) (m) dr_vv_outboard = 0.3 * vacuum vessel outboard thickness (TF coil / shield) (m) -dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) -d_vv_bot = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) +dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= dz_vv_lower if double-null) +dz_vv_lower = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) dr_shld_vv_gap_inboard = 0.01 * gap between inboard vacuum vessel and thermal shield (m) (`iteration variable 61`) dr_cs_tf_gap = 0.0 * gap between central solenoid and TF coil (m) (`iteration variable 42`) gapomin = 0.0 * minimum gap between outboard vacuum vessel and TF coil (m) (`iteration variable 31`) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index e2f48aff23..81dd855a1d 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2184,7 +2184,7 @@ dz_vv_upper = 0.3 * DESCRIPTION: top vaccum vessel thickness(m) * JUSTIFICATION: Set to match outboard build -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * DESCRIPTION: Bottom (and top for double null) vaccum vessel thickness * JUSTIFICATION: diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 519ff1cd94..4fcbf3aaa6 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -306,7 +306,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index e3fc0803fb..32185d732b 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -598,7 +598,7 @@ Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(excludes_structure)_(m)____________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1497,7 +1497,7 @@ dr_vv_outboard = 0.3 dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 2f7c743258..b3d18d7f8f 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -366,7 +366,7 @@ class ComponentHalfHeightParam(NamedTuple): dr_fw_plasma_gap_outboard: Any = None dr_fw_inboard: Any = None dr_fw_outboard: Any = None - d_vv_bot: Any = None + dz_vv_lower: Any = None dz_vv_upper: Any = None z_plasma_xpoint_lower: Any = None z_plasma_xpoint_upper: Any = None @@ -390,7 +390,7 @@ class ComponentHalfHeightParam(NamedTuple): dr_fw_plasma_gap_outboard=0.25, dr_fw_inboard=0.018000000000000002, dr_fw_outboard=0.018000000000000002, - d_vv_bot=0.30000000000000004, + dz_vv_lower=0.30000000000000004, dz_vv_upper=0.30000000000000004, z_plasma_xpoint_lower=4.93333333333333333, z_plasma_xpoint_upper=4.93333333333333333, @@ -449,7 +449,9 @@ def test_component_half_height( monkeypatch.setattr( build_variables, "dr_fw_outboard", componenthalfheightparam.dr_fw_outboard ) - monkeypatch.setattr(build_variables, "d_vv_bot", componenthalfheightparam.d_vv_bot) + monkeypatch.setattr( + build_variables, "dz_vv_lower", componenthalfheightparam.dz_vv_lower + ) monkeypatch.setattr( build_variables, "dz_vv_upper", componenthalfheightparam.dz_vv_upper ) @@ -497,7 +499,7 @@ class DshapedComponentParam(NamedTuple): dr_vv_inboard: Any = None dr_vv_outboard: Any = None dz_vv_upper: Any = None - d_vv_bot: Any = None + dz_vv_lower: Any = None volblkti: Any = None volblkto: Any = None volblkt: Any = None @@ -554,7 +556,7 @@ class DshapedComponentParam(NamedTuple): dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=0, volblkt=0, @@ -607,7 +609,7 @@ class DshapedComponentParam(NamedTuple): dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=691.06561956756764, volblkt=691.06561956756764, @@ -660,7 +662,7 @@ class DshapedComponentParam(NamedTuple): dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=691.06561956756764, volblkt=691.06561956756764, @@ -756,7 +758,9 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f monkeypatch.setattr( build_variables, "dz_vv_upper", dshapedcomponentparam.dz_vv_upper ) - monkeypatch.setattr(build_variables, "d_vv_bot", dshapedcomponentparam.d_vv_bot) + monkeypatch.setattr( + build_variables, "dz_vv_lower", dshapedcomponentparam.dz_vv_lower + ) monkeypatch.setattr(fwbs_variables, "volblkti", dshapedcomponentparam.volblkti) monkeypatch.setattr(fwbs_variables, "volblkto", dshapedcomponentparam.volblkto) monkeypatch.setattr(fwbs_variables, "volblkt", dshapedcomponentparam.volblkt) @@ -808,7 +812,7 @@ class EllipticalComponentParam(NamedTuple): dr_vv_inboard: Any = None dr_vv_outboard: Any = None dz_vv_upper: Any = None - d_vv_bot: Any = None + dz_vv_lower: Any = None volblkti: Any = None volblkto: Any = None volblkt: Any = None @@ -864,7 +868,7 @@ class EllipticalComponentParam(NamedTuple): dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=0, volblkt=0, @@ -916,7 +920,7 @@ class EllipticalComponentParam(NamedTuple): dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=315.83946385183026, volblkto=1020.3677420460117, volblkt=1336.207205897842, @@ -968,7 +972,7 @@ class EllipticalComponentParam(NamedTuple): dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=315.83946385183026, volblkto=1020.3677420460117, volblkt=1336.207205897842, @@ -1053,7 +1057,9 @@ def test_elliptical_component( monkeypatch.setattr( build_variables, "dz_vv_upper", ellipticalcomponentparam.dz_vv_upper ) - monkeypatch.setattr(build_variables, "d_vv_bot", ellipticalcomponentparam.d_vv_bot) + monkeypatch.setattr( + build_variables, "dz_vv_lower", ellipticalcomponentparam.dz_vv_lower + ) monkeypatch.setattr(fwbs_variables, "volblkti", ellipticalcomponentparam.volblkti) monkeypatch.setattr(fwbs_variables, "volblkto", ellipticalcomponentparam.volblkto) monkeypatch.setattr(fwbs_variables, "volblkt", ellipticalcomponentparam.volblkt) From 4dcffab5f3f617025799e590be36673ffbe6c12d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 20 Feb 2025 14:54:37 +0000 Subject: [PATCH 13/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20dz=5Fblkt=5Ftop?= =?UTF-8?q?=20to=20dz=5Fblkt=5Fupper=20for=20consistency=20across=20multip?= =?UTF-8?q?le=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/machine-build.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 | 10 +++---- process/build.py | 18 +++++------ process/geometry/blanket_geometry.py | 28 ++++++++--------- process/geometry/firstwall_geometry.py | 16 +++++----- process/io/obsolete_vars.py | 4 +-- process/io/plot_proc.py | 18 +++++------ process/stellarator.py | 6 ++-- source/fortran/build_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 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 26 ++++++++-------- tests/unit/test_stellarator.py | 18 +++++------ 27 files changed, 123 insertions(+), 123 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index 0b596caceb..62ec7d3b4b 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -69,7 +69,7 @@ case the machine is not symmetric about the midplane. Gap 0.050 8.186 (dz_shld_vv_gap) Vacuum vessel (and shielding) 0.600 8.136 (dz_vv_upper+dz_shld_upper) Gap 0.020 7.536 (dr_shld_blkt_gap) - Top blanket 0.869 7.516 (dz_blkt_top) + Top blanket 0.869 7.516 (dz_blkt_upper) Top first wall 0.018 6.647 (dz_fw_upper) Top scrape-off 0.600 6.629 (dz_fw_plasma_gap) Plasma top 6.029 6.029 (z_plasma_xpoint_upper) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 8b5514ef9c..fea234816f 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -596,7 +596,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index e484c264ab..d058716aa1 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -593,7 +593,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index b9fa7b3034..9e31ee06e2 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -593,7 +593,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 418585e224..fce1cdd2cb 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -593,7 +593,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 1268f0f04b..6afa5129a0 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -593,7 +593,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 2d204abd4a..7dad954a41 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -446,7 +446,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -1441,7 +1441,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -2436,7 +2436,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -3431,7 +3431,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -4426,7 +4426,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -5421,7 +5421,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -6416,7 +6416,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -7411,7 +7411,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -8406,7 +8406,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 diff --git a/process/blanket_library.py b/process/blanket_library.py index 707898fea8..68f7f1de3c 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -99,7 +99,7 @@ def component_half_height(self, icomponent: int): build_variables.z_plasma_xpoint_lower + build_variables.dz_xpoint_divertor + divertor_variables.dz_divertor - - build_variables.dz_blkt_top + - build_variables.dz_blkt_upper ) # Sheild elif icomponent == 1: @@ -132,11 +132,11 @@ def component_half_height(self, icomponent: int): ) # Shield if icomponent == 1: - htop = htop + build_variables.dz_blkt_top + htop = htop + build_variables.dz_blkt_upper # Vacuum Vessel if icomponent == 2: htop = ( - htop + build_variables.dz_blkt_top + build_variables.dz_shld_upper + htop + build_variables.dz_blkt_upper + build_variables.dz_shld_upper ) # Average of top and bottom (m) @@ -201,7 +201,7 @@ def dshaped_component(self, icomponent: int): blanket_library.hblnkt, build_variables.dr_blkt_inboard, build_variables.dr_blkt_outboard, - build_variables.dz_blkt_top, + build_variables.dz_blkt_upper, ) elif icomponent == 1: ( @@ -292,7 +292,7 @@ def elliptical_component(self, icomponent: int): blanket_library.hblnkt, build_variables.dr_blkt_inboard, build_variables.dr_blkt_outboard, - build_variables.dz_blkt_top, + build_variables.dz_blkt_upper, ) if icomponent == 1: ( diff --git a/process/build.py b/process/build.py index 1dfc4e8702..3c7c077977 100644 --- a/process/build.py +++ b/process/build.py @@ -423,7 +423,7 @@ def calculate_vertical_build(self, output: bool) -> None: * (build_variables.dz_vv_upper + build_variables.dz_vv_lower) + build_variables.dr_shld_blkt_gap + build_variables.dz_shld_upper - + build_variables.dz_blkt_top + + build_variables.dz_blkt_upper + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) + build_variables.dz_fw_plasma_gap @@ -534,17 +534,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Top blanket", - build_variables.dz_blkt_top, + build_variables.dz_blkt_upper, vbuild, - "(dz_blkt_top)", + "(dz_blkt_upper)", ) po.ovarre( self.mfile, "Top blanket vertical thickness (m)", - "(dz_blkt_top)", - build_variables.dz_blkt_top, + "(dz_blkt_upper)", + build_variables.dz_blkt_upper, ) - vbuild = vbuild - build_variables.dz_blkt_top + vbuild = vbuild - build_variables.dz_blkt_upper dz_fw_upper = 0.5e0 * ( build_variables.dr_fw_inboard + build_variables.dr_fw_outboard @@ -762,7 +762,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.dz_vv_upper + build_variables.dz_shld_upper + build_variables.dr_shld_blkt_gap - + build_variables.dz_blkt_top + + build_variables.dz_blkt_upper + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) + build_variables.dz_fw_plasma_gap @@ -1677,7 +1677,7 @@ def calculate_radial_build(self, output: bool) -> None: ) # Top/bottom blanket thickness - build_variables.dz_blkt_top = 0.5e0 * ( + build_variables.dz_blkt_upper = 0.5e0 * ( build_variables.dr_blkt_inboard + build_variables.dr_blkt_outboard ) @@ -1983,7 +1983,7 @@ def calculate_radial_build(self, output: bool) -> None: build_variables.z_plasma_xpoint_lower + build_variables.dz_xpoint_divertor + divertor_variables.dz_divertor - - build_variables.dz_blkt_top + - build_variables.dz_blkt_upper - 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) ) if physics_variables.idivrt == 2: # (i.e. physics_variables.i_single_null=0) diff --git a/process/geometry/blanket_geometry.py b/process/geometry/blanket_geometry.py index c19ac795dd..f87d146163 100644 --- a/process/geometry/blanket_geometry.py +++ b/process/geometry/blanket_geometry.py @@ -16,7 +16,7 @@ def blanket_geometry_single_null( cumulative_upper: dict, triang: float, cumulative_lower: dict, - dz_blkt_top: float, + dz_blkt_upper: float, c_shldith: float, c_blnkoth: float, dr_blkt_inboard: float, @@ -38,8 +38,8 @@ def blanket_geometry_single_null( :type triang: float :param cumulative_lower: cumulative vertical thicknesses of components below the midplane :type cumulative_lower: dict - :param dz_blkt_top: top blanket vertical thickness - :type dz_blkt_top: float + :param dz_blkt_upper: top blanket vertical thickness + :type dz_blkt_upper: float :param c_shldith: inboard shield thickness :type c_shldith: float :param c_blnkoth: outboard blanket radial thickness @@ -52,7 +52,7 @@ def blanket_geometry_single_null( :rtype: ArbitraryGeometry """ # Upper blanket outer surface - kapx = cumulative_upper["dz_blkt_top"] / rminx_outer + kapx = cumulative_upper["dz_blkt_upper"] / rminx_outer rs_upper_outboard, zs_upper_outboard = dh_vertices( radx_outer, rminx_outer, triang, kapx ) @@ -73,7 +73,7 @@ def blanket_geometry_single_null( zs_lower_inboard, ) = blanket_geometry_lower( triang=triang, - dz_blkt_top=dz_blkt_top, + dz_blkt_upper=dz_blkt_upper, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -99,7 +99,7 @@ def blanket_geometry_single_null( def blanket_geometry_lower( triang: float, - dz_blkt_top: float, + dz_blkt_upper: float, c_shldith: float, c_blnkoth: float, dr_blkt_inboard: float, @@ -110,8 +110,8 @@ def blanket_geometry_lower( :param triang: plasma triangularity :type triang: float - :param dz_blkt_top: top blanket vertical thickness - :type dz_blkt_top: float + :param dz_blkt_upper: top blanket vertical thickness + :type dz_blkt_upper: float :param c_shldith: inboard shield thickness :type c_shldith: float :param c_blnkoth: outboard blanket radial thickness @@ -132,7 +132,7 @@ def blanket_geometry_lower( dr_blkt_inboard, dr_blkt_outboard, divgap, - -dz_blkt_top, + -dz_blkt_upper, triang, ) # outboard radial and vertical coordinates @@ -148,7 +148,7 @@ def blanket_geometry_lower( def blanket_geometry_double_null( cumulative_lower: dict, triang: float, - dz_blkt_top: float, + dz_blkt_upper: float, c_shldith: float, c_blnkoth: float, dr_blkt_inboard: float, @@ -161,8 +161,8 @@ def blanket_geometry_double_null( :type cumulative_lower: dict :param triang: plasma triangularity :type triang: float - :param dz_blkt_top: top blanket vertical thickness - :type dz_blkt_top: float + :param dz_blkt_upper: top blanket vertical thickness + :type dz_blkt_upper: float :param c_shldith: inboard shield thickness :type c_shldith: float :param c_blnkoth: outboard blanket radial thickness @@ -184,7 +184,7 @@ def blanket_geometry_double_null( zs_lower_inboard, ) = blanket_geometry_lower( triang=triang, - dz_blkt_top=dz_blkt_top, + dz_blkt_upper=dz_blkt_upper, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -202,7 +202,7 @@ def blanket_geometry_double_null( zs_upper_inboard, ) = blanket_geometry_lower( triang=triang, - dz_blkt_top=dz_blkt_top, + dz_blkt_upper=dz_blkt_upper, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, diff --git a/process/geometry/firstwall_geometry.py b/process/geometry/firstwall_geometry.py index 45b7e68149..f9f7df6710 100644 --- a/process/geometry/firstwall_geometry.py +++ b/process/geometry/firstwall_geometry.py @@ -16,7 +16,7 @@ def first_wall_geometry_single_null( cumulative_upper: dict, triang: float, cumulative_lower: dict, - dz_blkt_top: float, + dz_blkt_upper: float, c_blnkith: float, c_fwoth: float, dr_fw_inboard: float, @@ -39,8 +39,8 @@ def first_wall_geometry_single_null( :type triang: float :param cumulative_lower: cumulative vertical thicknesses of components below the midplane :type cumulative_lower: dict - :param dz_blkt_top: top blanket vertical thickness - :type dz_blkt_top: float + :param dz_blkt_upper: top blanket vertical thickness + :type dz_blkt_upper: float :param c_blnkith: inboard blanket vertical thickness :type c_blnkith: float :param c_fwoth: outboard first wall vertical thickness @@ -67,7 +67,7 @@ def first_wall_geometry_single_null( # Lower first wall divgap = cumulative_lower["dz_divertor"] - top_point = divgap + dz_blkt_top + top_point = divgap + dz_blkt_upper ( rs_lower_outboard, zs_lower_outboard, @@ -150,7 +150,7 @@ def first_wall_geometry_lower( def first_wall_geometry_double_null( cumulative_lower: dict, triang: float, - dz_blkt_top: float, + dz_blkt_upper: float, c_blnkith: float, c_fwoth: float, dr_fw_inboard: float, @@ -164,8 +164,8 @@ def first_wall_geometry_double_null( :type cumulative_lower: dict :param triang: plasma triangularity :type triang: float - :param dz_blkt_top: top blanket vertical thickness - :type dz_blkt_top: float + :param dz_blkt_upper: top blanket vertical thickness + :type dz_blkt_upper: float :param c_blnkith: inboard blanket vertical thickness :type c_blnkith: float :param c_fwoth: outboard first wall vertical thickness @@ -181,7 +181,7 @@ def first_wall_geometry_double_null( """ # Lower first wall divgap = cumulative_lower["dz_divertor"] - top_point = divgap + dz_blkt_top + top_point = divgap + dz_blkt_upper ( rs_lower_outboard, zs_lower_outboard, diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 83460b053f..d6a2af904e 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -113,7 +113,7 @@ "fvolbo": "fhole", "fvolcry": None, "idhe3": "f_helium3", - "dz_blkt_top": None, + "dz_blkt_upper": None, "theat": "t_fusion_ramp", "ieped": None, "eped_sf": None, @@ -245,7 +245,7 @@ OBS_VARS_HELP = { "iculdl": "(use IDENSL=3 for equivalent model to ICULDL=0). ", - "dz_blkt_top": "WARNING. BLNKTTH is now always calculated rather than input - please remove it from the input file. ", + "dz_blkt_upper": "WARNING. BLNKTTH is now always calculated rather than input - please remove it from the input file. ", } kallenbach_list = [ diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 80e3ecc431..1f27920226 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -1376,9 +1376,9 @@ def plot_blanket(axis, mfile_data, scan, colour_scheme) -> None: i_single_null = mfile_data.data["i_single_null"].get_scan(scan) triang_95 = mfile_data.data["triang95"].get_scan(scan) if int(i_single_null) == 1: - dz_blkt_top = mfile_data.data["dz_blkt_top"].get_scan(scan) + dz_blkt_upper = mfile_data.data["dz_blkt_upper"].get_scan(scan) else: - dz_blkt_top = 0.0 + dz_blkt_upper = 0.0 c_shldith = cumulative_radial_build("dr_shld_inboard", mfile_data, scan) c_blnkoth = cumulative_radial_build("dr_blkt_outboard", mfile_data, scan) @@ -1411,7 +1411,7 @@ def plot_blanket(axis, mfile_data, scan, colour_scheme) -> None: cumulative_upper=cumulative_upper, triang=triang_95, cumulative_lower=cumulative_lower, - dz_blkt_top=dz_blkt_top, + dz_blkt_upper=dz_blkt_upper, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -1437,7 +1437,7 @@ def plot_blanket(axis, mfile_data, scan, colour_scheme) -> None: bg_double_null = blanket_geometry_double_null( cumulative_lower=cumulative_lower, triang=triang_95, - dz_blkt_top=dz_blkt_top, + dz_blkt_upper=dz_blkt_upper, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -1478,10 +1478,10 @@ def plot_firstwall(axis, mfile_data, scan, colour_scheme): i_single_null = mfile_data.data["i_single_null"].get_scan(scan) triang_95 = mfile_data.data["triang95"].get_scan(scan) if int(i_single_null) == 1: - dz_blkt_top = mfile_data.data["dz_blkt_top"].get_scan(scan) + dz_blkt_upper = mfile_data.data["dz_blkt_upper"].get_scan(scan) tfwvt = mfile_data.data["dz_fw_upper"].get_scan(scan) else: - dz_blkt_top = tfwvt = 0.0 + dz_blkt_upper = tfwvt = 0.0 c_blnkith = cumulative_radial_build("dr_blkt_inboard", mfile_data, scan) c_fwoth = cumulative_radial_build("dr_fw_outboard", mfile_data, scan) @@ -1515,7 +1515,7 @@ def plot_firstwall(axis, mfile_data, scan, colour_scheme): cumulative_upper=cumulative_upper, triang=triang_95, cumulative_lower=cumulative_lower, - dz_blkt_top=dz_blkt_top, + dz_blkt_upper=dz_blkt_upper, c_blnkith=c_blnkith, c_fwoth=c_fwoth, dr_fw_inboard=dr_fw_inboard, @@ -1536,7 +1536,7 @@ def plot_firstwall(axis, mfile_data, scan, colour_scheme): fwg_double_null = first_wall_geometry_double_null( cumulative_lower=cumulative_lower, triang=triang_95, - dz_blkt_top=dz_blkt_top, + dz_blkt_upper=dz_blkt_upper, c_blnkith=c_blnkith, c_fwoth=c_fwoth, dr_fw_inboard=dr_fw_inboard, @@ -3658,7 +3658,7 @@ def main(args=None): "z_plasma_xpoint_upper", "dz_fw_plasma_gap", "dz_fw_upper", - "dz_blkt_top", + "dz_blkt_upper", "dr_shld_blkt_gap", "dz_shld_upper", "dz_vv_upper", diff --git a/process/stellarator.py b/process/stellarator.py index 16e4da275c..3eceb1b9d5 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -339,7 +339,7 @@ def stbild(self, output: bool): # Top/bottom blanket thickness - build_variables.dz_blkt_top = 0.5e0 * ( + build_variables.dz_blkt_upper = 0.5e0 * ( build_variables.dr_blkt_inboard + build_variables.dr_blkt_outboard ) @@ -1970,8 +1970,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Top blanket thickness (m)", - "(dz_blkt_top)", - build_variables.dz_blkt_top, + "(dz_blkt_upper)", + build_variables.dz_blkt_upper, ) if (heat_transport_variables.ipowerflow == 0) and ( diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index d39a79b9c8..380866be44 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -54,7 +54,7 @@ module build_variables real(dp) :: dr_blkt_outboard !! outboard blanket thickness (m); calculated if `blktmodel>0` - real(dp) :: dz_blkt_top + real(dp) :: dz_blkt_upper !! top blanket thickness (m), = mean of inboard and outboard blanket thicknesses real(dp) :: dr_bore @@ -319,7 +319,7 @@ subroutine init_build_variables blbuoth = 0.465D0 dr_blkt_inboard = 0.115D0 dr_blkt_outboard = 0.235D0 - dz_blkt_top = 0.0D0 + dz_blkt_upper = 0.0D0 dr_bore = 1.42D0 f_z_cryostat = 4.268D0 dr_cryostat = 0.07D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 974295d508..104c644969 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -592,7 +592,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 3ad9b77d8d..320e92e906 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -593,7 +593,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 72e39c6452..c42a123494 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -593,7 +593,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index f62b5b6921..6fe1502cc2 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -593,7 +593,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index d90ca19649..1d71f40eb3 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -591,7 +591,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index a2fb1f29ae..6a94e1840a 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -594,7 +594,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -1757,7 +1757,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -2920,7 +2920,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -4083,7 +4083,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -5246,7 +5246,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -6409,7 +6409,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -7572,7 +7572,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -8735,7 +8735,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -9898,7 +9898,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -11061,7 +11061,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -12224,7 +12224,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -13387,7 +13387,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -14550,7 +14550,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -15713,7 +15713,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 @@ -16876,7 +16876,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 890e18117c..9596ae4c34 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -446,7 +446,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -1441,7 +1441,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -2436,7 +2436,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -3431,7 +3431,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -4426,7 +4426,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -5421,7 +5421,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -6416,7 +6416,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -7411,7 +7411,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 @@ -8406,7 +8406,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.6850E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index c6dbbdb669..219ded77e0 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -381,7 +381,7 @@ "blmatv": 0.0, "dr_blkt_inboard": 0.115, "dr_blkt_outboard": 0.235, - "dz_blkt_top": 0.0, + "dz_blkt_upper": 0.0, "bloact": [ 0.0, 0.0, @@ -8911,7 +8911,7 @@ "blmatv": "IFE blanket material volumes (m3)", "dr_blkt_inboard": "inboard blanket thickness (m); (calculated if `blktmodel>0`) (=0.0 if `i_blkt_inboard=0`)", "dr_blkt_outboard": "outboard blanket thickness (m); calculated if `blktmodel>0`", - "dz_blkt_top": "top blanket thickness (m), = mean of inboard and outboard blanket thicknesses", + "dz_blkt_upper": "top blanket thickness (m), = mean of inboard and outboard blanket thicknesses", "bloact": "outboard blanket total activity (Bq)", "blogdr": "outboard blanket total gamma dose rate (Sv/hr)", "blohkw": "outboard blanket total heat output (kW)", @@ -17005,7 +17005,7 @@ "blbuoth", "dr_blkt_inboard", "dr_blkt_outboard", - "dz_blkt_top", + "dz_blkt_upper", "dr_bore", "f_z_cryostat", "dr_cryostat", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 81dd855a1d..1d3a750bf3 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2168,7 +2168,7 @@ dz_shld_lower = 0.6 * DESCRIPTION: Lower (under divertor) Shield Thickness (m) * JUSTIFICATION: -*dz_blkt_top = +*dz_blkt_upper = * DESCRIPTION: top blanket thickness (m) * JUSTIFICATION: No longer an input variable diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 32185d732b..9f6d362ae3 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -591,7 +591,7 @@ Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_top)_____________________ 8.5000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index b3d18d7f8f..cf9a307abf 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -360,7 +360,7 @@ class ComponentHalfHeightParam(NamedTuple): hmax: Any = None dz_xpoint_divertor: Any = None dz_shld_vv_gap: Any = None - dz_blkt_top: Any = None + dz_blkt_upper: Any = None dz_shld_upper: Any = None dr_fw_plasma_gap_inboard: Any = None dr_fw_plasma_gap_outboard: Any = None @@ -384,7 +384,7 @@ class ComponentHalfHeightParam(NamedTuple): hmax=8.8182171641274945, dz_xpoint_divertor=2.0018838307941582, dz_shld_vv_gap=0.16300000000000001, - dz_blkt_top=0.85000000000000009, + dz_blkt_upper=0.85000000000000009, dz_shld_upper=0.59999999999999998, dr_fw_plasma_gap_inboard=0.25, dr_fw_plasma_gap_outboard=0.25, @@ -428,7 +428,7 @@ def test_component_half_height( componenthalfheightparam.dz_shld_vv_gap, ) monkeypatch.setattr( - build_variables, "dz_blkt_top", componenthalfheightparam.dz_blkt_top + build_variables, "dz_blkt_upper", componenthalfheightparam.dz_blkt_upper ) monkeypatch.setattr( build_variables, "dz_shld_upper", componenthalfheightparam.dz_shld_upper @@ -489,7 +489,7 @@ class DshapedComponentParam(NamedTuple): blareaob: Any = None blarea: Any = None dr_blkt_outboard: Any = None - dz_blkt_top: Any = None + dz_blkt_upper: Any = None shareaib: Any = None shareaob: Any = None sharea: Any = None @@ -546,7 +546,7 @@ class DshapedComponentParam(NamedTuple): blareaob=0, blarea=0, dr_blkt_outboard=1, - dz_blkt_top=0.5, + dz_blkt_upper=0.5, shareaib=0, shareaob=0, sharea=0, @@ -599,7 +599,7 @@ class DshapedComponentParam(NamedTuple): blareaob=852.24160940262459, blarea=1049.2194687827046, dr_blkt_outboard=1, - dz_blkt_top=0.5, + dz_blkt_upper=0.5, shareaib=0, shareaob=0, sharea=0, @@ -652,7 +652,7 @@ class DshapedComponentParam(NamedTuple): blareaob=852.24160940262459, blarea=1049.2194687827046, dr_blkt_outboard=1, - dz_blkt_top=0.5, + dz_blkt_upper=0.5, shareaib=208.91591146372122, shareaob=1013.8483589087293, sharea=1222.7642703724505, @@ -737,7 +737,7 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f build_variables, "dr_blkt_outboard", dshapedcomponentparam.dr_blkt_outboard ) monkeypatch.setattr( - build_variables, "dz_blkt_top", dshapedcomponentparam.dz_blkt_top + build_variables, "dz_blkt_upper", dshapedcomponentparam.dz_blkt_upper ) monkeypatch.setattr(build_variables, "shareaib", dshapedcomponentparam.shareaib) monkeypatch.setattr(build_variables, "shareaob", dshapedcomponentparam.shareaob) @@ -804,7 +804,7 @@ class EllipticalComponentParam(NamedTuple): blareaib: Any = None blareaob: Any = None blarea: Any = None - dz_blkt_top: Any = None + dz_blkt_upper: Any = None shareaib: Any = None shareaob: Any = None sharea: Any = None @@ -860,7 +860,7 @@ class EllipticalComponentParam(NamedTuple): blareaib=0, blareaob=0, blarea=0, - dz_blkt_top=0.85000000000000009, + dz_blkt_upper=0.85000000000000009, shareaib=0, shareaob=0, sharea=0, @@ -912,7 +912,7 @@ class EllipticalComponentParam(NamedTuple): blareaib=664.9687712975541, blareaob=1101.3666396424403, blarea=1766.3354109399943, - dz_blkt_top=0.85000000000000009, + dz_blkt_upper=0.85000000000000009, shareaib=0, shareaob=0, sharea=0, @@ -964,7 +964,7 @@ class EllipticalComponentParam(NamedTuple): blareaib=664.9687712975541, blareaob=1101.3666396424403, blarea=1766.3354109399943, - dz_blkt_top=0.85000000000000009, + dz_blkt_upper=0.85000000000000009, shareaib=700.06731267447844, shareaob=1344.1106481995357, sharea=2044.1779608740142, @@ -1040,7 +1040,7 @@ def test_elliptical_component( monkeypatch.setattr(build_variables, "blareaob", ellipticalcomponentparam.blareaob) monkeypatch.setattr(build_variables, "blarea", ellipticalcomponentparam.blarea) monkeypatch.setattr( - build_variables, "dz_blkt_top", ellipticalcomponentparam.dz_blkt_top + build_variables, "dz_blkt_upper", ellipticalcomponentparam.dz_blkt_upper ) monkeypatch.setattr(build_variables, "shareaib", ellipticalcomponentparam.shareaib) monkeypatch.setattr(build_variables, "shareaob", ellipticalcomponentparam.shareaob) diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index a1c87a183e..e7909469d7 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -212,7 +212,7 @@ class StbildParam(NamedTuple): dr_blkt_outboard: Any = None - dz_blkt_top: Any = None + dz_blkt_upper: Any = None dr_bore: Any = None @@ -304,7 +304,7 @@ class StbildParam(NamedTuple): outfile: Any = None - expected_dz_blkt_top: Any = None + expected_dz_blkt_upper: Any = None expected_bore: Any = None @@ -345,7 +345,7 @@ class StbildParam(NamedTuple): blbuoth=0.46500000000000002, dr_blkt_inboard=0.70000000000000007, dr_blkt_outboard=0.80000000000000004, - dz_blkt_top=0, + dz_blkt_upper=0, dr_bore=1.4199999999999999, dr_vv_inboard=0.35000000000000003, dr_vv_outboard=0.35000000000000003, @@ -391,7 +391,7 @@ class StbildParam(NamedTuple): f_a=0.99125889880147788, iprint=0, outfile=11, - expected_dz_blkt_top=0.75, + expected_dz_blkt_upper=0.75, expected_bore=17.79214950143977, expected_a_fw_total=1918.8188778803135, expected_dr_fw_inboard=0.018000000000000002, @@ -415,7 +415,7 @@ class StbildParam(NamedTuple): blbuoth=0.46500000000000002, dr_blkt_inboard=0.70000000000000007, dr_blkt_outboard=0.80000000000000004, - dz_blkt_top=0.75, + dz_blkt_upper=0.75, dr_bore=17.79214950143977, dr_vv_inboard=0.35000000000000003, dr_vv_outboard=0.35000000000000003, @@ -461,7 +461,7 @@ class StbildParam(NamedTuple): f_a=0.99125889880147788, iprint=0, outfile=11, - expected_dz_blkt_top=0.75, + expected_dz_blkt_upper=0.75, expected_bore=17.79214950143977, expected_a_fw_total=2120.6210472630282, expected_dr_fw_inboard=0.018000000000000002, @@ -509,7 +509,7 @@ def test_stbild(stbildparam, monkeypatch, stellarator): build_variables, "dr_blkt_outboard", stbildparam.dr_blkt_outboard ) - monkeypatch.setattr(build_variables, "dz_blkt_top", stbildparam.dz_blkt_top) + monkeypatch.setattr(build_variables, "dz_blkt_upper", stbildparam.dz_blkt_upper) monkeypatch.setattr(build_variables, "dr_bore", stbildparam.dr_bore) @@ -634,8 +634,8 @@ def test_stbild(stbildparam, monkeypatch, stellarator): monkeypatch.setattr(stellarator_module, "f_a", stbildparam.f_a) stellarator.stbild(False) - assert build_variables.dz_blkt_top == pytest.approx( - stbildparam.expected_dz_blkt_top + assert build_variables.dz_blkt_upper == pytest.approx( + stbildparam.expected_dz_blkt_upper ) assert build_variables.dr_bore == pytest.approx(stbildparam.expected_bore) From 877266f7594ca0711bbaa46a1125d3e106d9075c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 20 Feb 2025 15:02:25 +0000 Subject: [PATCH 14/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20tf=5Fin=5Fcs=20to?= =?UTF-8?q?=20i=5Ftf=5Finside=5Fcs=20for=20consistency=20across=20multiple?= =?UTF-8?q?=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/machine-build.md | 2 +- .../proc-pages/eng-models/tf-coil.md | 6 +- .../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 +- process/build.py | 29 +++++---- process/caller.py | 2 +- process/init.py | 6 +- process/io/plot_radial_build.py | 6 +- process/sctfcoil.py | 22 ++++--- process/utilities/errorlist.json | 2 +- source/fortran/build_variables.f90 | 4 +- source/fortran/constraint_equations.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 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 60 +++++++++---------- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 4 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- tests/unit/test_sctfcoil.py | 8 +-- 26 files changed, 112 insertions(+), 95 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index 62ec7d3b4b..0be1534cdc 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -99,4 +99,4 @@ these two possibilities is set using input parameter `fwbsshape`, which should b !!! Info "TF coil placement" The radial build can vary from the figures above dependant on the placement of the inboard TF - coil leg when using the `tf_in_cs` switch. See [TF coil page](tf-coil.md)** + coil leg when using the `i_tf_inside_cs` switch. See [TF coil page](tf-coil.md)** diff --git a/documentation/proc-pages/eng-models/tf-coil.md b/documentation/proc-pages/eng-models/tf-coil.md index 6cc9b659e3..59b29d22e5 100644 --- a/documentation/proc-pages/eng-models/tf-coil.md +++ b/documentation/proc-pages/eng-models/tf-coil.md @@ -6,8 +6,8 @@ The engineering models are based on a topology like that used in ITER: the centr However, an option does exist wich permits the alternative topology, in which the inboard legs of the TF coils pass through the middle of the central solenoid. This layout is used in MAST, where the copper TF coils can be dismantled to allow the central solenoid to be inserted or removed. The topology is set as follows: -- `tf_in_cs = 0` (default) ITER-like topology: the central solenoid and the TF coils are not linked. -- `tf_in_cs = 1` The inboard legs of the TF coils pass through the middle of the central solenoid. Note that this model does not provide a physically self-consistent result for superconducting coils. +- `i_tf_inside_cs = 0` (default) ITER-like topology: the central solenoid and the TF coils are not linked. +- `i_tf_inside_cs = 1` The inboard legs of the TF coils pass through the middle of the central solenoid. Note that this model does not provide a physically self-consistent result for superconducting coils. ## Coil type Two major types of toroidal field (TF) coils can be considered in PROCESS: Resistive magnets or Superconducting magnets. The choice of conductor type is made using the following integer switch: @@ -1255,7 +1255,7 @@ Another subroutine, `tfspcall` is called outside `stfcoil` to estimate to check | Parameter | description | Iteration variable | Default | Unit | | - | - | - | - | - | -| `tf_in_cs` | TF coil inboard leg radial placement switch.
- 0 : Outside of central solenoid
- 1 : Inside of central solenoid | - | 0 | - | +| `i_tf_inside_cs` | TF coil inboard leg radial placement switch.
- 0 : Outside of central solenoid
- 1 : Inside of central solenoid | - | 0 | - | | `dr_tf_inboard` | TF coil maximum radial size
calculated if `dr_tf_wp` is used as iteration variable | ixc = 13 | No default | m | | `tfootfi` | Outboard/inboard TF coil thickness ratio | - | 1 | - | | `dr_tf_wp` | Winding pack radial thickness
calculated if `dr_tf_inboard` is used as iteration variable. Include the ground insulation and the insertion gap. | ixc = 140 | No default | m | diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index fea234816f..f66ca04139 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -566,8 +566,8 @@ Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8441E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0588E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5551E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6224E-02 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index d058716aa1..d9d5b0d50c 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 9e31ee06e2..8981febd92 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index fce1cdd2cb..38d21b4817 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 6afa5129a0..c5c662c1ff 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 diff --git a/process/build.py b/process/build.py index 3c7c077977..a82e7e58ff 100644 --- a/process/build.py +++ b/process/build.py @@ -1708,7 +1708,7 @@ def calculate_radial_build(self, output: bool) -> None: else: build_variables.dr_cs_precomp = 0.0e0 - if build_variables.tf_in_cs == 1: + if build_variables.i_tf_inside_cs == 1: build_variables.r_tf_inboard_in = ( build_variables.dr_bore - build_variables.dr_tf_inboard @@ -1851,7 +1851,7 @@ def calculate_radial_build(self, output: bool) -> None: ): error_handling.fdiags[0] = build_variables.r_cp_top error_handling.report_error(256) - if build_variables.tf_in_cs == 1: + if build_variables.i_tf_inside_cs == 1: # Radial position of vacuum vessel [m] build_variables.r_vv_inboard_out = ( build_variables.r_tf_inboard_out @@ -2118,8 +2118,8 @@ def calculate_radial_build(self, output: bool) -> None: po.ovarin( self.outfile, "TF coil radial placement switch", - "(tf_in_cs)", - build_variables.tf_in_cs, + "(i_tf_inside_cs)", + build_variables.i_tf_inside_cs, ) po.ovarrf( self.outfile, @@ -2129,7 +2129,7 @@ def calculate_radial_build(self, output: bool) -> None: "OP ", ) - if build_variables.tf_in_cs == 1: + if build_variables.i_tf_inside_cs == 1: po.ocmmnt( self.outfile, ( @@ -2142,7 +2142,10 @@ def calculate_radial_build(self, output: bool) -> None: "the true dr_bore size used for calculations is dr_bore + dr_tf_inboard + dr_cs_tf_gap)\n" ), ) - if build_variables.tf_in_cs == 1 and tfcoil_variables.i_tf_bucking >= 2: + if ( + build_variables.i_tf_inside_cs == 1 + and tfcoil_variables.i_tf_bucking >= 2 + ): po.ocmmnt( self.outfile, "(Bore hollow space has been filled with a solid metal cyclinder to act as wedge support)\n", @@ -2154,7 +2157,10 @@ def calculate_radial_build(self, output: bool) -> None: radius = 0.0e0 radial_build_data.append(["Device centreline", None, 0.0, radius]) - if build_variables.tf_in_cs == 1 and tfcoil_variables.i_tf_bucking >= 2: + if ( + build_variables.i_tf_inside_cs == 1 + and tfcoil_variables.i_tf_bucking >= 2 + ): radius = ( radius + build_variables.dr_bore @@ -2170,7 +2176,10 @@ def calculate_radial_build(self, output: bool) -> None: - build_variables.dr_cs_tf_gap, radius, ]) - elif build_variables.tf_in_cs == 1 and tfcoil_variables.i_tf_bucking < 2: + elif ( + build_variables.i_tf_inside_cs == 1 + and tfcoil_variables.i_tf_bucking < 2 + ): radius = ( radius + build_variables.dr_bore @@ -2193,7 +2202,7 @@ def calculate_radial_build(self, output: bool) -> None: build_variables.dr_bore, radius, ]) - if build_variables.tf_in_cs == 1: + if build_variables.i_tf_inside_cs == 1: radius += build_variables.dr_tf_inboard radial_build_data.append([ "TF coil inboard leg (in dr_bore)", @@ -2225,7 +2234,7 @@ def calculate_radial_build(self, output: bool) -> None: build_variables.dr_cs_precomp, radius, ]) - if build_variables.tf_in_cs == 0: + if build_variables.i_tf_inside_cs == 0: radius = radius + build_variables.dr_cs_tf_gap radial_build_data.append([ "CS precompresion to TF coil radial gap", diff --git a/process/caller.py b/process/caller.py index b0fac5fac1..d7d56e6cb7 100644 --- a/process/caller.py +++ b/process/caller.py @@ -249,7 +249,7 @@ def _call_models_once(self, xc: np.ndarray) -> None: # Machine Build Model # Radial build - if ft.build_variables.tf_in_cs == 1: + if ft.build_variables.i_tf_inside_cs == 1: self.models.build.tf_in_cs_bore_calc() self.models.build.calculate_radial_build(output=False) diff --git a/process/init.py b/process/init.py index 7c37f73b9b..0730304e2a 100644 --- a/process/init.py +++ b/process/init.py @@ -932,9 +932,11 @@ def check_process(): # CS which is now outside it if ( fortran.tfcoil_variables.i_tf_bucking >= 2 - and fortran.build_variables.tf_in_cs == 1 + and fortran.build_variables.i_tf_inside_cs == 1 ): - raise ProcessValidationError("Cannot have i_tf_bucking >= 2 when tf_in_cs = 1") + raise ProcessValidationError( + "Cannot have i_tf_bucking >= 2 when i_tf_inside_cs = 1" + ) # Ensure that no pre-compression structure # is used for bucked and wedged design diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index dc118e75d4..2245bd5dd8 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -109,7 +109,7 @@ def get_radial_build(m_file): "dr_tf_shld_gap", "dr_tf_outboard", ] - if int(m_file.data["tf_in_cs"].get_scan(-1)) == 1: + if int(m_file.data["i_tf_inside_cs"].get_scan(-1)) == 1: radial_labels[1] = "dr_tf_inboard" radial_labels[2] = "dr_cs_tf_gap" radial_labels[3] = "dr_cs" @@ -264,7 +264,7 @@ def main(args=None): "Gap", "TF Coil Outboard Leg", ] - if int(m_file.data["tf_in_cs"].get_scan(-1)) == 1: + if int(m_file.data["i_tf_inside_cs"].get_scan(-1)) == 1: radial_labels[1] = "TF Coil Inboard Leg" radial_labels[2] = "CS Coil gap" radial_labels[3] = "Central Solenoid" @@ -297,7 +297,7 @@ def main(args=None): "white", "blue", ] - if int(m_file.data["tf_in_cs"].get_scan(-1)) == 1: + if int(m_file.data["i_tf_inside_cs"].get_scan(-1)) == 1: radial_color[1] = "blue" radial_color[2] = "white" radial_color[3] = "green" diff --git a/process/sctfcoil.py b/process/sctfcoil.py index a60fbee2d3..4624d1474e 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1268,7 +1268,7 @@ def sctfcoil(self, output: bool): build_variables.hmax, pfcoil_variables.f_z_cs_tf_internal, build_variables.dr_cs, - build_variables.tf_in_cs, + build_variables.i_tf_inside_cs, build_variables.dr_tf_inboard, build_variables.dr_cs_tf_gap, pfcoil_variables.i_pf_conductor, @@ -3582,7 +3582,7 @@ def stresscl( hmax, f_z_cs_tf_internal, dr_cs, - tf_in_cs, + i_tf_inside_cs, dr_tf_inboard, dr_cs_tf_gap, i_pf_conductor, @@ -3764,8 +3764,8 @@ def stresscl( jeff[0] = 0.0e0 # Inner radius of the CS - if tf_in_cs == 1: - # CS not used as wedge support tf_in_cs = 1 + if i_tf_inside_cs == 1: + # CS not used as wedge support i_tf_inside_cs = 1 radtf[0] = 0.001 else: radtf[0] = dr_bore @@ -3777,7 +3777,7 @@ def stresscl( # -# # CS vertical cross-section area [m2] - if tf_in_cs == 1: + if i_tf_inside_cs == 1: a_oh = 2.0e0 * hmax * f_z_cs_tf_internal * (dr_bore - dr_tf_inboard) else: a_oh = 2.0e0 * hmax * f_z_cs_tf_internal * dr_cs @@ -3887,7 +3887,7 @@ def stresscl( jeff[1] = 0.0e0 # Outer radius of the CS - if tf_in_cs == 1: + if i_tf_inside_cs == 1: radtf[1] = dr_bore - dr_tf_inboard - dr_cs_tf_gap else: radtf[1] = dr_bore + dr_cs @@ -4559,13 +4559,19 @@ def outtf(self, peaktfflag): else: po.ocmmnt(self.outfile, " -> Bucking cylinder") - elif tfcoil_variables.i_tf_bucking in (2, 3) and build_variables.tf_in_cs == 1: + elif ( + tfcoil_variables.i_tf_bucking in (2, 3) + and build_variables.i_tf_inside_cs == 1 + ): po.ocmmnt( self.outfile, " -> TF in contact with dr_bore filler support (bucked and weged design)", ) - elif tfcoil_variables.i_tf_bucking in (2, 3) and build_variables.tf_in_cs == 0: + elif ( + tfcoil_variables.i_tf_bucking in (2, 3) + and build_variables.i_tf_inside_cs == 0 + ): po.ocmmnt( self.outfile, " -> TF in contact with CS (bucked and weged design)" ) diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 30c0177dc6..7efcc5c46d 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -1413,7 +1413,7 @@ { "no": 281, "level": 3, - "message": "CHECK: Cannot have i_tf_bucking >= 2 when tf_in_cs = 1" + "message": "CHECK: Cannot have i_tf_bucking >= 2 when i_tf_inside_cs = 1" }, { "no": 282, diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index 380866be44..a71f1f2048 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -139,7 +139,7 @@ module build_variables !! - =0 no pre-compression structure !! - =1 calculated pre-compression structure - integer :: tf_in_cs + integer :: i_tf_inside_cs !! Switch for placing the TF coil inside the CS !! !! - = 0 TF coil is outside the CS (default) @@ -345,7 +345,7 @@ subroutine init_build_variables hr1 = 0.0D0 iohcl = 1 i_cs_precomp = 1 - tf_in_cs = 0 + i_tf_inside_cs = 0 dr_cs = 0.811D0 dr_cs_precomp = 0.0D0 rbld = 0.0D0 diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index e4759fa7f1..d55242194b 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2762,7 +2762,7 @@ subroutine constraint_eqn_072(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) use constraint_variables, only: foh_stress use pfcoil_variables, only: alstroh, s_shear_cs_peak use tfcoil_variables, only: sig_tf_cs_bucked, i_tf_bucking - use build_variables, only: tf_in_cs + use build_variables, only: i_tf_inside_cs implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -2771,7 +2771,7 @@ subroutine constraint_eqn_072(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) character(len=10), intent(out) :: tmp_units ! bucked and wedged desing (see subroutine comment) - if ( i_tf_bucking >= 2 .and. tf_in_cs == 0 ) then + if ( i_tf_bucking >= 2 .and. i_tf_inside_cs == 0 ) then tmp_cc = 1.0d0 - foh_stress * alstroh / max(s_shear_cs_peak, sig_tf_cs_bucked) tmp_err = alstroh - max(s_shear_cs_peak, sig_tf_cs_bucked) ! Free standing CS diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index c56c6e9ddd..cff8ea301b 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -190,7 +190,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use constants, only: dcopper, dalu use global_variables, only: run_tests, verbose, maxcal, runtitle - use build_variables, only: tf_in_cs, blbmoth, blbuith, dr_shld_outboard, & + use build_variables, only: i_tf_inside_cs, blbmoth, blbuith, dr_shld_outboard, & dz_shld_upper, dz_shld_lower, dz_shld_vv_gap, plleni, dr_fw_outboard, dr_shld_blkt_gap, & dr_shld_thermal_inboard, dr_shld_thermal_outboard, dz_shld_thermal, i_cs_precomp, & blbpith, aplasmin, blbuoth, dr_tf_inboard, & @@ -1359,8 +1359,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('i_cs_precomp') call parse_int_variable('i_cs_precomp', i_cs_precomp, 0, 1, & 'Switch for existence of Central Solenoid pre-compression structure') - case ('tf_in_cs') - call parse_int_variable('tf_in_cs', tf_in_cs, 0, 1, & + case ('i_tf_inside_cs') + call parse_int_variable('i_tf_inside_cs', i_tf_inside_cs, 0, 1, & 'Switch for placing TF coils inside of the CS') case ('dr_cs') call parse_real_variable('dr_cs', dr_cs, 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 104c644969..36b22e5499 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -562,8 +562,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 320e92e906..a71044ae8b 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index c42a123494..77bc68da72 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 6fe1502cc2..c77c972c53 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 1d71f40eb3..3d8871cd90 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -560,8 +560,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8377E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9704E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7696E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8501E-02 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 6a94e1840a..e3015461d4 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -564,8 +564,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8415E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0486E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5540E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6514E-02 @@ -1727,8 +1727,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0137E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0684E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5277E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5991E-02 @@ -2890,8 +2890,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0323E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0815E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5352E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5613E-02 @@ -4053,8 +4053,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0386E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0802E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5349E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5651E-02 @@ -5216,8 +5216,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0240E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0685E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5266E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5989E-02 @@ -6379,8 +6379,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0122E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0572E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4639E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6399E-02 @@ -7542,8 +7542,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0178E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0569E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4494E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6427E-02 @@ -8705,8 +8705,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0292E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0708E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4622E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6015E-02 @@ -9868,8 +9868,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0398E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0841E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4724E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5627E-02 @@ -11031,8 +11031,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0437E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0834E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4720E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5650E-02 @@ -12194,8 +12194,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0315E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0691E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4697E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6052E-02 @@ -13357,8 +13357,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0190E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0559E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4537E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6450E-02 @@ -14520,8 +14520,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0232E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0549E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4535E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6479E-02 @@ -15683,8 +15683,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0304E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0688E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4673E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6065E-02 @@ -16846,8 +16846,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0374E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0828E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4798E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5654E-02 diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 30d6ca6893..881694287f 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -126,7 +126,7 @@ dr_cs_tf_gap = 0.0 * gap between central solenoid and TF coil (m) (`iteration gapomin = 0.0 * minimum gap between outboard vacuum vessel and TF coil (m) (`iteration variable 31`) iohcl = 0 * Switch for existence of central solenoid; i_cs_precomp = 0 * Switch for existence of central solenoid pre-compression structure; -tf_in_cs = 0 * Switch for placing the TF coil inside the CS +i_tf_inside_cs = 0 * Switch for placing the TF coil inside the CS dr_cs = 0.20016400484967947 * Central solenoid thickness (m) (`iteration variable 16`) i_r_cp_top = 2 * Switch selecting the he parametrization of the outer radius of the top of the CP part of the TF coil dr_fw_plasma_gap_inboard = 0.1 * Gap between plasma and first wall; inboard side (m) (if `i_plasma_wall_gap=1`) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 1d3a750bf3..6b7aab7876 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -918,7 +918,7 @@ ripmax = 1.0 * DESCRIPTION: Maximum Allowable Toroidal Field Ripple Amplitude at Plasma Edge (%) * JUSTIFICATION: Default -*tf_in_cs switch is found in the radial build section* +*i_tf_inside_cs switch is found in the radial build section* *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Conductor Type ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -1970,7 +1970,7 @@ icc = 11 * JUSTIFICATION: Consistency equations should always be on * VARIABLES: rmajor, Rest calculated in-situ -tf_in_cs = 0 +i_tf_inside_cs = 0 * DESCRIPTION: Switch for placing TF coils inside of the CS * JUSTIFICATION: TF placed in CS as design choice diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 9f6d362ae3..a7fb917cd1 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -560,8 +560,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8377E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9704E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7696E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8501E-02 diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index e5d211e158..a92d0476da 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -3461,7 +3461,7 @@ class StressclParam(NamedTuple): dr_cs: Any = None - tf_in_cs: Any = None + i_tf_inside_cs: Any = None dr_cs_tf_gap: Any = None @@ -3639,7 +3639,7 @@ class StressclParam(NamedTuple): ( StressclParam( dr_tf_inboard=1.208, - tf_in_cs=0, + i_tf_inside_cs=0, dr_cs_tf_gap=0.01, r_tf_inboard_mid=3.5979411851091103, dr_bore=2.3322000000000003, @@ -3762,7 +3762,7 @@ class StressclParam(NamedTuple): ), StressclParam( dr_tf_inboard=1.208, - tf_in_cs=0, + i_tf_inside_cs=0, dr_cs_tf_gap=0.01, r_tf_inboard_mid=3.5979411851091103, dr_bore=2.3322000000000003, @@ -3943,7 +3943,7 @@ def test_stresscl(stressclparam, monkeypatch, sctfcoil): stressclparam.hmax, stressclparam.f_z_cs_tf_internal, stressclparam.dr_cs, - stressclparam.tf_in_cs, + stressclparam.i_tf_inside_cs, stressclparam.dr_tf_inboard, stressclparam.dr_cs_tf_gap, stressclparam.i_pf_conductor, From 8e9ac8b0c0ee770ef0c575ba6a61fe85aa74a2d9 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 20 Feb 2025 15:07:59 +0000 Subject: [PATCH 15/17] =?UTF-8?q?=F0=9F=94=84=20Update=20obsolete=5Fvars.p?= =?UTF-8?q?y=20to=20rename=20variables=20for=20consistency=20across=20mult?= =?UTF-8?q?iple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/io/obsolete_vars.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index d6a2af904e..fa5ebfc291 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -241,6 +241,16 @@ "ncls": "n_pf_coils_in_group", "cptdin": "c_pf_coil_turn_peak_input", "ipfloc": "i_pf_location", + "tf_in_cs": "i_tf_inside_cs", + "shldtth": "dz_shld_upper", + "shldlth": "dz_shld_lower", + "vgap_vv_thermalshield": "dz_shld_vv_gap", + "thshield_vb": "dz_shld_thermal", + "vgaptop": "dz_fw_plasma_gap", + "vgap_xpoint_divertor": "dz_xpoint_divertor", + "d_vv_top": "dz_vv_upper", + "d_vv_bot": "dz_vv_lower", + "divfix": "dz_divertor", } OBS_VARS_HELP = { From a3a6134371411825565701fce2b2ad4d56e89eca Mon Sep 17 00:00:00 2001 From: Christopher Ashe <91618944+chris-ashe@users.noreply.github.com> Date: Thu, 6 Mar 2025 11:05:17 +0000 Subject: [PATCH 16/17] Update process/io/obsolete_vars.py Co-authored-by: Timothy <75321887+timothy-nunn@users.noreply.github.com> --- process/io/obsolete_vars.py | 1 + 1 file changed, 1 insertion(+) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index fa5ebfc291..cdd849b9d4 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -113,6 +113,7 @@ "fvolbo": "fhole", "fvolcry": None, "idhe3": "f_helium3", + "blnktth": None, "dz_blkt_upper": None, "theat": "t_fusion_ramp", "ieped": None, From 3c3ee34faa5cf5f456f671c495122caeb275c401 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 7 Mar 2025 09:13:59 +0000 Subject: [PATCH 17/17] =?UTF-8?q?=F0=9F=94=84=20Rename=20variables=20for?= =?UTF-8?q?=20consistency=20in=20input=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../input_files/spherical_tokamak_once_through.IN.DAT | 8 ++++---- .../input_files/stellarator_helias_once_through.IN.DAT | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index 0970a7fb53..7612f6c197 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -94,7 +94,7 @@ dr_fw_plasma_gap_outboard = 0.3 *Gap between plasma and first wall; ou dr_shld_inboard = 0.4 *Inboard shield thickness (m) dr_shld_outboard = 0.7 *Outboard shield thickness (m) dz_shld_upper = 0.7 *Upper/lower shield thickness (m) -vgap_xpoint_divertor = 0.0 *Vertical gap between x-point and divertor (m) +dz_xpoint_divertor = 0.0 *Vertical gap between x-point and divertor (m) *---------------Constraint Variables---------------* diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 881694287f..66e61a384f 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -139,9 +139,9 @@ tfootfi = 1.0 * TF coil outboard leg / inboard leg radial thickness dr_tf_shld_gap = 0.01 * Minimum metal-to-metal gap between TF coil and thermal shield (m) dr_shld_thermal_inboard = 0.05 * TF-VV thermal shield thickness; inboard (m) dr_shld_thermal_outboard = 0.07 * TF-VV thermal shield thickness; outboard (m) -thshield_vb = 0.075 * TF-VV thermal shield thickness; vertical build (m) -vgap_vv_thermalshield = 2.0 * vertical gap between vacuum vessel and thermal shields (m) -vgap_xpoint_divertor = 0.75 * vertical gap between x-point and divertor (m) (if = 0; it is calculated) +dz_shld_thermal = 0.075 * TF-VV thermal shield thickness; vertical build (m) +dz_shld_vv_gap = 2.0 * vertical gap between vacuum vessel and thermal shields (m) +dz_xpoint_divertor = 0.75 * vertical gap between x-point and divertor (m) (if = 0; it is calculated) dr_shld_blkt_gap = 0.01 * gap between vacuum vessel and blanket (m) *---------------Buildings Variables----------------* @@ -208,7 +208,7 @@ pinjalw = 150.0 * maximum allowable value for injected power (MW) (`constraint *----------------Divertor Variables----------------* -divfix = 1.0 * divertor structure vertical thickness (m) +dz_divertor = 1.0 * divertor structure vertical thickness (m) *------------------Error Handling------------------* diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index a0f3f03758..4717eb05d2 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -91,7 +91,7 @@ dr_fw_plasma_gap_outboard = 0.2 * Gap between plasma and first wall; outboard s dr_shld_inboard = 0.2 * inboard shield thickness (m) (`iteration variable 93`) dr_shld_outboard = 0.2 * outboard shield thickness (m) (`iteration variable 94`) dz_shld_upper = 0.2 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) -vgap_xpoint_divertor = 0. * vertical gap between x-point and divertor (m) (if = 0; it is calculated) +dz_xpoint_divertor = 0. * vertical gap between x-point and divertor (m) (if = 0; it is calculated) *---------------Buildings Variables----------------*