diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index eae9147491..f96589e072 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -1,20 +1,20 @@ # Radial and Vertical Build -Simplified scale diagrams of the vertical and horizontal cross-sections of the machine can be +Simplified scale diagrams of the vertical and horizontal cross-sections of the machine can be output in the `2-page summary` using the utility `plot_proc.py` (currently stored in `process/process/io`). -The coordinate system is $(R,Z)$ system, where $R$ is the radial distance from the vertical +The coordinate system is $(R,Z)$ system, where $R$ is the radial distance from the vertical centreline (axis) of the torus, and $Z$ is the vertical distance from the equatorial midplane. -Components are often referred to as being 'inboard' or 'outboard', which simply -means that they lie at a radius $R$ less than or greater than $R_0$, -respectively, where $R_0$ is the plasma major radius (`rmajor`). +Components are often referred to as being 'inboard' or 'outboard', which simply +means that they lie at a radius $R$ less than or greater than $R_0$, +respectively, where $R_0$ is the plasma major radius (`rmajor`). -The radial build is described in detail in the OUT.DAT file as in the example below, which lists -the major radius of each component in the midplane. The machine is axisymmetric, except for the -TF coils which are discrete. The variables marked "IP" below are input variables. Those marked -"ITV" are available as iteration variables (although it is not always advisable to use them as -iteration variables). Those marked with an asterisk (*) may or may not be input variables +The radial build is described in detail in the OUT.DAT file as in the example below, which lists +the major radius of each component in the midplane. The machine is axisymmetric, except for the +TF coils which are discrete. The variables marked "IP" below are input variables. Those marked +"ITV" are available as iteration variables (although it is not always advisable to use them as +iteration variables). Those marked with an asterisk (*) may or may not be input variables depending on the switches used. ```text @@ -52,10 +52,10 @@ The radial build is shown schematically below (click to zoom). Radial build -The vertical build is described in detail in the OUT.DAT as in the following example, which lists -the vertical coordinate of each component at the point furthest from the midplane (excluding the -CS, the other PF coils and the cryostat). The midplane is defined to be half way between the top -and bottom of the plasma. A single-null scenario is assumed to have a lower divertor, in which +The vertical build is described in detail in the OUT.DAT as in the following example, which lists +the vertical coordinate of each component at the point furthest from the midplane (excluding the +CS, the other PF coils and the cryostat). The midplane is defined to be half way between the top +and bottom of the plasma. A single-null scenario is assumed to have a lower divertor, in which case the machine is not symmetric about the midplane. ```text @@ -66,7 +66,7 @@ case the machine is not symmetric about the midplane. TF coil 1.576 9.862 (tfcth) Gap 0.050 8.286 (tftsgap) Thermal shield 0.050 8.236 (thshield) - Gap 0.050 8.186 (vgap2) + Gap 0.050 8.186 (vgap_vv_thermalshield) Vacuum vessel (and shielding) 0.600 8.136 (d_vv_top+shldtth) Gap 0.020 7.536 (vvblgap) 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 (divfix) Vacuum vessel (and shielding) 1.000 -9.652 (d_vv_bot+shldlth) - Gap 0.050 -9.702 (vgap2) + Gap 0.050 -9.702 (vgap_vv_thermalshield) Thermal shield 0.050 -9.752 (thshield) Gap 0.050 -9.802 (tftsgap) TF coil 1.576 -11.379 (tfcth) @@ -89,14 +89,14 @@ The vertical build is shown schematically below (click to zoom). Vertical build -Since PROCESS is essentially a 0-D code, the shape of each component is used to estimate its mass -and cost, but is not used otherwise. The first wall, blanket, shield and vacuum vessel may be -either D-shaped in cross-section, or each may be defined by two half-ellipses. The choice between +Since PROCESS is essentially a 0-D code, the shape of each component is used to estimate its mass +and cost, but is not used otherwise. The first wall, blanket, shield and vacuum vessel may be +either D-shaped in cross-section, or each may be defined by two half-ellipses. The choice between these two possibilities is set using input parameter `fwbsshape`, which should be - 1 for D-shaped, - 2 for ellipses. !!! Info "TF coil placement" - The radial build can vary from the figures above dependant on the placement of the inboard TF + 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)** diff --git a/process/build.py b/process/build.py index c09ceae1f6..3c0e5836d0 100755 --- a/process/build.py +++ b/process/build.py @@ -133,7 +133,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.tfcth + build_variables.tftsgap + build_variables.thshield_vb - + build_variables.vgap2 + + build_variables.vgap_vv_thermalshield + build_variables.d_vv_top + build_variables.shldtth + divertor_variables.divfix @@ -199,17 +199,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Gap", - build_variables.vgap2, + build_variables.vgap_vv_thermalshield, vbuild, - "(vgap2)", + "(vgap_vv_thermalshield)", ) po.ovarre( self.mfile, "Vessel - TF coil vertical gap (m)", - "(vgap2)", - build_variables.vgap2, + "(vgap_vv_thermalshield)", + build_variables.vgap_vv_thermalshield, ) - vbuild = vbuild - build_variables.vgap2 + vbuild = vbuild - build_variables.vgap_vv_thermalshield po.obuild( self.outfile, @@ -288,19 +288,19 @@ def calculate_vertical_build(self, output: bool) -> None: "(rminor*kappa)", ) - vbuild = vbuild - build_variables.vgap + vbuild = vbuild - build_variables.vgap_xpoint_divertor po.obuild( self.outfile, "Lower scrape-off", - build_variables.vgap, + build_variables.vgap_xpoint_divertor, vbuild, - "(vgap)", + "(vgap_xpoint_divertor)", ) po.ovarre( self.mfile, "Bottom scrape-off vertical thickness (m)", - "(vgap)", - build_variables.vgap, + "(vgap_xpoint_divertor)", + build_variables.vgap_xpoint_divertor, ) vbuild = vbuild - divertor_variables.divfix @@ -341,13 +341,13 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.d_vv_bot, ) - vbuild = vbuild - build_variables.vgap2 + vbuild = vbuild - build_variables.vgap_vv_thermalshield po.obuild( self.outfile, "Gap", - build_variables.vgap2, + build_variables.vgap_vv_thermalshield, vbuild, - "(vgap2)", + "(vgap_vv_thermalshield)", ) vbuild = vbuild - build_variables.thshield_vb @@ -404,7 +404,7 @@ def calculate_vertical_build(self, output: bool) -> None: + build_variables.tfcth + build_variables.tftsgap + build_variables.thshield_vb - + build_variables.vgap2 + + build_variables.vgap_vv_thermalshield + 0.5e0 * (build_variables.d_vv_top + build_variables.d_vv_bot) + build_variables.vvblgap + build_variables.shldtth @@ -471,17 +471,17 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Gap", - build_variables.vgap2, + build_variables.vgap_vv_thermalshield, vbuild, - "(vgap2)", + "(vgap_vv_thermalshield)", ) po.ovarre( self.mfile, "Vessel - TF coil vertical gap (m)", - "(vgap2)", - build_variables.vgap2, + "(vgap_vv_thermalshield)", + build_variables.vgap_vv_thermalshield, ) - vbuild = vbuild - build_variables.vgap2 + vbuild = vbuild - build_variables.vgap_vv_thermalshield po.obuild( self.outfile, @@ -579,19 +579,19 @@ def calculate_vertical_build(self, output: bool) -> None: "(rminor*kappa)", ) - vbuild = vbuild - build_variables.vgap + vbuild = vbuild - build_variables.vgap_xpoint_divertor po.obuild( self.outfile, "Lower scrape-off", - build_variables.vgap, + build_variables.vgap_xpoint_divertor, vbuild, - "(vgap)", + "(vgap_xpoint_divertor)", ) po.ovarre( self.mfile, "Bottom scrape-off vertical thickness (m)", - "(vgap)", - build_variables.vgap, + "(vgap_xpoint_divertor)", + build_variables.vgap_xpoint_divertor, ) vbuild = vbuild - divertor_variables.divfix @@ -632,13 +632,13 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.d_vv_bot, ) - vbuild = vbuild - build_variables.vgap2 + vbuild = vbuild - build_variables.vgap_vv_thermalshield po.obuild( self.outfile, "Gap", - build_variables.vgap2, + build_variables.vgap_vv_thermalshield, vbuild, - "(vgap2)", + "(vgap_vv_thermalshield)", ) vbuild = vbuild - build_variables.thshield_vb @@ -703,20 +703,20 @@ def calculate_vertical_build(self, output: bool) -> None: divht = self.divgeom(output) # Issue #481 Remove build_variables.vgaptf - if build_variables.vgap < 0.00001e0: - build_variables.vgap = divht + if build_variables.vgap_xpoint_divertor < 0.00001e0: + build_variables.vgap_xpoint_divertor = divht - # If build_variables.vgap /= 0 use the value set by the user. + # If build_variables.vgap_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 = ( physics_variables.rminor * physics_variables.kappa - + build_variables.vgap + + build_variables.vgap_xpoint_divertor + divertor_variables.divfix + build_variables.shldlth + build_variables.d_vv_bot - + build_variables.vgap2 + + build_variables.vgap_vv_thermalshield + build_variables.thshield_vb + build_variables.tftsgap ) @@ -730,7 +730,7 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.tfcth + build_variables.tftsgap + build_variables.thshield_vb - + build_variables.vgap2 + + build_variables.vgap_vv_thermalshield + build_variables.d_vv_top + build_variables.shldtth + build_variables.vvblgap @@ -1888,7 +1888,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.vgap + + build_variables.vgap_xpoint_divertor + divertor_variables.divfix - build_variables.blnktth - 0.5e0 * (build_variables.fwith + build_variables.fwoth) diff --git a/process/buildings.py b/process/buildings.py index 4ddaf6ec69..9eaadaf3aa 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -74,7 +74,7 @@ def run(self, output: bool = False): tfcoil_variables.n_tf, build_variables.rsldo, build_variables.rsldi, - 2.0e0 * (build_variables.hmax - build_variables.vgap2) + 2.0e0 * (build_variables.hmax - build_variables.vgap_vv_thermalshield) - build_variables.d_vv_top - build_variables.d_vv_bot, fwbs_variables.whtshld, @@ -532,7 +532,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): build_variables.tfcth + build_variables.tftsgap + build_variables.thshield_vb - + build_variables.vgap2 + + build_variables.vgap_vv_thermalshield ) ) hcomp_rad_thk = ( @@ -576,7 +576,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): build_variables.tfcth + build_variables.tftsgap + build_variables.thshield_vb - + build_variables.vgap2 + + build_variables.vgap_vv_thermalshield ) ) hcomp_rad_thk = ( diff --git a/process/divertor.py b/process/divertor.py index 711e793712..831b05659a 100644 --- a/process/divertor.py +++ b/process/divertor.py @@ -39,7 +39,7 @@ def run(self, output: bool) -> None: pv.rminor, pv.triang, bv.scrapli, - bv.vgap, + bv.vgap_xpoint_divertor, pv.pdivt, output=output, ) @@ -752,7 +752,7 @@ def divtart( rminor: float, triang: float, scrapli: float, - vgap: float, + vgap_xpoint_divertor: float, pdivt: float, output: bool, ) -> float: @@ -777,8 +777,8 @@ def divtart( :param scrapli: inboard scrape-off width (m) :type scrapli: float - :param vgap: top scrape-off width (m) - :type vgap: float + :param vgap_xpoint_divertor: top scrape-off width (m) + :type vgap_xpoint_divertor: float :param pdivt: power to the divertor (MW) :type pdivt: float @@ -800,15 +800,15 @@ def divtart( # Angle of diagonal divertor plate from horizontal - if vgap <= 0.0e0: - eh.fdiags[0] = vgap + if vgap_xpoint_divertor <= 0.0e0: + eh.fdiags[0] = vgap_xpoint_divertor eh.report_error(22) - theta = math.atan(vgap / (r2 - r1)) + theta = math.atan(vgap_xpoint_divertor / (r2 - r1)) # Vertical plate area - a1 = 2.0e0 * constants.pi * r1 * vgap + a1 = 2.0e0 * constants.pi * r1 * vgap_xpoint_divertor # Horizontal plate area diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 4e02b4b4fb..fc77b479fc 100755 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -259,11 +259,11 @@ "gapsto", "tftsgap", "tfthko", - "vgap", + "vgap_xpoint_divertor", "divfix", "d_vv_bot", "shldlth", - "vgap2", + "vgap_vv_thermalshield", ] diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index b0fdf13d7e..80df8b359e 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -113,6 +113,8 @@ "theat": "t_fusion_ramp", "ieped": None, "eped_sf": None, + "vgap2": "vgap_vv_thermalshield", + "vgap": "vgap_xpoint_divertor", } OBS_VARS_HELP = { diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 5036ac608a..0b83446360 100755 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -154,11 +154,11 @@ def parse_args(args): vertical_lower = [ "rminor*kappa", - "vgap", + "vgap_xpoint_divertor", "divfix", "shldlth", "d_vv_bot", - "vgap2", + "vgap_vv_thermalshield", "thshield_vb", "tftsgap", "tfcth", @@ -3174,7 +3174,7 @@ def main(args=None): "divfix", "shldtth", "d_vv_top", - "vgap2", + "vgap_vv_thermalshield", "thshield_vb", "tftsgap", "tfcth", @@ -3188,7 +3188,7 @@ def main(args=None): "vvblgap", "shldtth", "d_vv_top", - "vgap2", + "vgap_vv_thermalshield", "thshield_vb", "tftsgap", "tfcth", diff --git a/process/sctfcoil.py b/process/sctfcoil.py index b6ad69e9a0..0b70aa3b1e 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -2286,7 +2286,7 @@ def vv_stress_on_quench(self): H_vv = ( physics_variables.rminor * physics_variables.kappa - + build_variables.vgap + + build_variables.vgap_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 d8717c5994..20a2453f27 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -118,7 +118,7 @@ { "no": 22, "level": 3, - "message": "DIVCALL: Non-positive vgap" + "message": "DIVCALL: Non-positive vgap_xpoint_divertor" }, { "no": 23, diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 147fb60834..c192ccaa32 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -253,7 +253,7 @@ function component_half_height(icomponent) ! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - use build_variables, only: hmax, vgap, vgap2, blnktth, shldtth, scrapli, scraplo, & + use build_variables, only: hmax, vgap_xpoint_divertor, vgap_vv_thermalshield, blnktth, shldtth, scrapli, scraplo, & fwith, fwoth, d_vv_bot, d_vv_top use physics_variables, only: rminor, kappa, idivrt use divertor_variables, only: divfix @@ -272,11 +272,11 @@ function component_half_height(icomponent) ! Calculate component internal lower half-height (m) ! Blanket - if (icomponent==0) hbot = rminor*kappa + vgap + divfix - blnktth + if (icomponent==0) hbot = rminor*kappa + vgap_xpoint_divertor + divfix - blnktth ! Sheild - if (icomponent==1) hbot = rminor*kappa + vgap + divfix + if (icomponent==1) hbot = rminor*kappa + vgap_xpoint_divertor + divfix ! Vacuum vessel - if (icomponent==2) hbot = hmax - vgap2 - d_vv_bot + if (icomponent==2) hbot = hmax - vgap_vv_thermalshield - d_vv_bot ! Calculate component internal upper half-height (m) ! If a double null machine then symmetric diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index 747b2ac6c6..843ad5f61e 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -267,14 +267,14 @@ module build_variables real(dp) :: thshield_vb !! TF-VV thermal shield thickness, vertical build (m) - real(dp) :: vgap2 + real(dp) :: vgap_vv_thermalshield !! vertical gap between vacuum vessel and thermal shields (m) - real(dp) :: vgap + real(dp) :: vgap_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 if double-null) + !! vertical gap between top of plasma and first wall (m) (= vgap_xpoint_divertor if double-null) real(dp) :: vvblgap !! gap between vacuum vessel and blanket (m) @@ -376,8 +376,8 @@ subroutine init_build_variables thshield_ib = 0.05D0 thshield_ob = 0.05D0 thshield_vb = 0.05D0 - vgap2 = 0.163D0 - vgap= 0.0D0 + vgap_vv_thermalshield = 0.163D0 + vgap_xpoint_divertor= 0.0D0 vgaptop = 0.60D0 vvblgap = 0.05D0 plleni = 1.0D0 diff --git a/source/fortran/initial.f90 b/source/fortran/initial.f90 index 97f0b0b45d..b15cea7b56 100755 --- a/source/fortran/initial.f90 +++ b/source/fortran/initial.f90 @@ -242,7 +242,7 @@ subroutine check ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! use build_variables, only: blnkith, bore, gapoh, ohcth, precomp, iprecomp, & - i_r_cp_top, r_cp_top, vgaptop, vgap, shldtth, shldlth, d_vv_top, d_vv_bot, tf_in_cs + i_r_cp_top, r_cp_top, vgaptop, vgap_xpoint_divertor, shldtth, shldlth, d_vv_top, d_vv_bot, tf_in_cs use buildings_variables, only: esbldgm3, triv use current_drive_variables, only: gamcd, iefrf, irfcd use error_handling, only: errors_on, idiags, fdiags, report_error @@ -489,7 +489,7 @@ subroutine check if (i_single_null == 0) then idivrt = 2 - vgaptop = vgap + vgaptop = vgap_xpoint_divertor shldtth = shldlth d_vv_top = d_vv_bot call report_error(272) diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index c1d79dcaed..a28e50bb03 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -193,13 +193,13 @@ 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, shldoth, & - shldtth, shldlth, vgap2, plleni, fwoth, vvblgap, & + shldtth, shldlth, vgap_vv_thermalshield, plleni, fwoth, vvblgap, & thshield_ib, thshield_ob, thshield_vb, iprecomp, & blbpith, aplasmin, blbuoth, tfcth, & iohcl, tftsgap, clhsf, bore, plleno, scrapli, gapomin, ddwex, & rinboard, blnkoth, fseppc, plsepo, blnkith, & ohcth, plsepi, blbmith, gapoh, fcspc, scraplo, vgaptop, & - blbpoth, gapds, fwith, vgap, shldith, sigallpc, tfootfi, f_avspace,& + blbpoth, gapds, fwith, vgap_xpoint_divertor, shldith, sigallpc, tfootfi, f_avspace,& r_cp_top, d_vv_in, d_vv_out, d_vv_top, d_vv_bot, f_r_cp, i_r_cp_top use buildings_variables, only: hcwt, conv, wgt, trcl, rbwt, & esbldgm3, fndt, row, wgt2, pibv, clh1, stcl, clh2, & @@ -1421,11 +1421,11 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('thshield_vb') call parse_real_variable('thshield_vb', thshield_vb, 0.0D0, 10.0D0, & 'TF/VV thermal shield thickness, vertical build (m)') - case ('vgap') - call parse_real_variable('vgap', vgap, 0.0D0, 10.0D0, & + case ('vgap_xpoint_divertor') + call parse_real_variable('vgap_xpoint_divertor', vgap_xpoint_divertor, 0.0D0, 10.0D0, & 'Vert gap between x-pnt and divertor (m)') - case ('vgap2') - call parse_real_variable('vgap2', vgap2, 0.0D0, 10.0D0, & + case ('vgap_vv_thermalshield') + call parse_real_variable('vgap_vv_thermalshield', vgap_vv_thermalshield, 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 159a778949..ded54b5d08 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7916,8 +7916,8 @@ "vfpblkt": 0.1, "vfshld": 0.25, "vftf": 0.4, - "vgap": 0.0, - "vgap2": 0.163, + "vgap_xpoint_divertor": 0.0, + "vgap_vv_thermalshield": 0.163, "vgaptop": 0.6, "vlabel": "", "vlabel_2": "", @@ -11016,9 +11016,9 @@ "vfpblkt": "He purge gas fraction of blanket by volume (`iblanket= 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": "vertical gap between x-point and divertor (m) (if = 0, it is calculated)", - "vgap2": "vertical gap between vacuum vessel and thermal shields (m)", - "vgaptop": "vertical gap between top of plasma and first wall (m) (= vgap if double-null)", + "vgap_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)", "vlabel": "scan value name label", "vlabel_2": "scan value name label (2nd dimension)", "vlam": "", @@ -14956,11 +14956,11 @@ "lb": 0.0, "ub": 1.0 }, - "vgap": { + "vgap_xpoint_divertor": { "lb": 0.0, "ub": 10.0 }, - "vgap2": { + "vgap_vv_thermalshield": { "lb": 0.0, "ub": 10.0 }, @@ -17057,8 +17057,8 @@ "tfthko", "tftsgap", "thshield", - "vgap2", - "vgap", + "vgap_vv_thermalshield", + "vgap_xpoint_divertor", "vgaptop", "vvblgap", "plleni", @@ -20865,8 +20865,8 @@ "vfpblkt": "real_variable", "vfshld": "real_variable", "vftf": "real_variable", - "vgap": "real_variable", - "vgap2": "real_variable", + "vgap_xpoint_divertor": "real_variable", + "vgap_vv_thermalshield": "real_variable", "vgaptop": "real_variable", "vvblgap": "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 3e9a6220ae..5fca03a72f 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2152,7 +2152,7 @@ tfootfi = 1.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Vertical Build~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~* *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -vgap = 0.75 +vgap_xpoint_divertor = 0.75 * DESCRIPTION: Vertical Gap Between x-point and Divertor (m) * JUSTIFICATION: @@ -2180,7 +2180,7 @@ thshield_vb = 0.075 * DESCRIPTION: TF-VV Thermal Shield Thickness (m) * JUSTIFICATION: -vgap2 = 2.0 +vgap_vv_thermalshield = 2.0 * DESCRIPTION: Vertical Gap Between Vacuum Vessel and TF coil (m) * JUSTIFICATION: diff --git a/tests/regression/input_files/stellarator.IN.DAT b/tests/regression/input_files/stellarator.IN.DAT index aaf77a1387..046b6df70b 100644 --- a/tests/regression/input_files/stellarator.IN.DAT +++ b/tests/regression/input_files/stellarator.IN.DAT @@ -159,7 +159,7 @@ scraplo = 0.2 *Gap between plasma and first wall; outboard side (m) shldith = 0.2 *Inboard shield thickness (m) shldoth = 0.2 *Outboard shield thickness (m) shldtth = 0.2 *Upper/lower shield thickness (m) -vgap = 0. *Vertical gap between x-point and divertor (m) +vgap_xpoint_divertor = 0. *Vertical gap between x-point and divertor (m) thkcas = 0.05 * Thickness TF Coil case (for stellarator: Also for toroidal direction) *---------------Constraint Variables---------------* diff --git a/tests/unit/test_divertor.py b/tests/unit/test_divertor.py index 34f0da4ce8..1bfd919ead 100644 --- a/tests/unit/test_divertor.py +++ b/tests/unit/test_divertor.py @@ -137,13 +137,15 @@ def test_divtart(self, monkeypatch, divertor): rminor = 0.97142857142857153 triang = 0.5 scrapli = 0.09595 - vgap = 0.5 + vgap_xpoint_divertor = 0.5 pdivt = 7.7197999809272062 monkeypatch.setattr(dv, "i_hldiv", 1) expected_hldiv = 0.087770426974167357 - hldiv = divertor.divtart(rmajor, rminor, triang, scrapli, vgap, pdivt, False) + hldiv = divertor.divtart( + rmajor, rminor, triang, scrapli, vgap_xpoint_divertor, pdivt, False + ) assert hldiv == pytest.approx(expected_hldiv) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 2c420a64a6..0a6e800648 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -14062,7 +14062,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", 0.05) # Baseline 2018 + monkeypatch.setattr(build_variables, "vgap_xpoint_divertor", 0.05) # Baseline 2018 monkeypatch.setattr(build_variables, "shldtth", 0.3) # Baseline 2018 monkeypatch.setattr( divertor_variables, "divfix", 2.05