From fa31f851466041d2b2217f573942b0c6960e7138 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 10:12:42 +0000 Subject: [PATCH 01/16] fgamp removed and placed in obsolete --- process/io/obsolete_vars.py | 1 + source/fortran/divertor_variables.f90 | 4 ---- source/fortran/input.f90 | 5 +---- tests/integration/ref_dicts.json | 8 -------- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 8201c4e1f2..b80b96a4fb 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -74,4 +74,5 @@ "rad_fraction_core": "rad_fraction_LCFS", "thshield": ["thshield_ib", "thshield_ob", "thshield_vb"], "igeom": None, + "fgamp": None, } diff --git a/source/fortran/divertor_variables.f90 b/source/fortran/divertor_variables.f90 index dec2c2512f..b329e16800 100644 --- a/source/fortran/divertor_variables.f90 +++ b/source/fortran/divertor_variables.f90 @@ -99,9 +99,6 @@ module divertor_variables real(dp) :: fdiva !! divertor area fudge factor (for ITER, Sept 1990) - real(dp) :: fgamp - !! sheath potential factor (not used) - real(dp) :: fhout !! fraction of power to outboard divertor (for single null) @@ -214,7 +211,6 @@ subroutine init_divertor_variables divsur = 0.0D0 fdfs = 10.0D0 fdiva = 1.11D0 - fgamp = 1.0D0 fhout = 0.0D0 fififi = 4.0D-3 flux_exp = 2.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 22b23caf11..28dcb6ae33 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -263,7 +263,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) etalh, frbeam, harnum, xi_ebw 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, fgamp, frrp, xpertin, c1div, betai, bpsout, xparain, fdiva, & + omegan, prn1, frrp, xpertin, c1div, betai, bpsout, xparain, fdiva, & zeffdiv, hldivlim, rlenmax, divfix, c3div, divleg_profile_inner, & divleg_profile_outer, hldiv, i_hldiv use fwbs_variables, only: fblhebpo, vfblkt, fdiv, fvolso, fwcoolant, & @@ -1305,9 +1305,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fdiva') call parse_real_variable('fdiva', fdiva, 0.1D0, 2.0D0, & 'Divertor area fiddle factor') - case ('fgamp') - call parse_real_variable('fgamp', fgamp, -100.0D0, 100.0D0, & - 'Sheath potential factor') case ('fififi') call parse_real_variable('fififi', fififi, 1.0D-6, 1.0D0, & 'Coefficient for gamdiv') diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f52d191297..f106eba00a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1932,7 +1932,6 @@ "ffuspow": 1.0, "ffwal": 0.92, "fgamcd": 1.0, - "fgamp": 1.0, "fgrd": null, "fgrosbop": 0.0, "fgwped": 0.85, @@ -9660,7 +9659,6 @@ "ffuspow": "f-value for maximum fusion power (`constraint equation 9`, `iteration variable 26`)", "ffwal": "factor to convert plasma surface area to first wall area in neutron wall\n load calculation (`iwalld=1`)", "fgamcd": "f-value for current drive gamma (`constraint equation 37`, `iteration variable 40`)", - "fgamp": "sheath potential factor (not used)", "fgrd": "", "fgrosbop": "scaled fraction of gross power to balance-of-plant", "fgwped": "fraction of Greenwald density to set as pedestal-top density. If `<0`, pedestal-top\n density set manually using neped (`ipedestal>=1`). Needs to be `>0` if `ipedestal = 3`.\n (`iteration variable 145`)", @@ -12899,10 +12897,6 @@ "lb": 0.001, "ub": 10.0 }, - "fgamp": { - "lb": -100.0, - "ub": 100.0 - }, "fgwped": { "lb": -1.0, "ub": 5.0 @@ -18462,7 +18456,6 @@ "divsur", "fdfs", "fdiva", - "fgamp", "fhout", "fififi", "frrp", @@ -20914,7 +20907,6 @@ "ffuspow": "real_variable", "ffwal": "real_variable", "fgamcd": "real_variable", - "fgamp": "real_variable", "fgwped": "real_variable", "fgwsep": "real_variable", "fhcd": "real_variable", From d9e351d8db5f06982266a38e01631136c96f3de4 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 10:15:32 +0000 Subject: [PATCH 02/16] divleg_profile_inner placed in obsolete --- process/io/obsolete_vars.py | 1 + source/fortran/divertor_variables.f90 | 5 ----- source/fortran/input.f90 | 5 +---- tests/integration/ref_dicts.json | 8 -------- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index b80b96a4fb..337aef00f9 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -75,4 +75,5 @@ "thshield": ["thshield_ib", "thshield_ob", "thshield_vb"], "igeom": None, "fgamp": None, + "divleg_profile_inner": None, } diff --git a/source/fortran/divertor_variables.f90 b/source/fortran/divertor_variables.f90 index b329e16800..6adb102aa5 100644 --- a/source/fortran/divertor_variables.f90 +++ b/source/fortran/divertor_variables.f90 @@ -76,10 +76,6 @@ module divertor_variables real(dp) :: divfix !! divertor structure vertical thickness (m) - real(dp) :: divleg_profile_inner - !! length of 2D profile of inner leg surface (m) - !! default value = estimated from side-view strawperson diagram, August 2021 - real(dp) :: divleg_profile_outer !! length of 2D profile of outer leg surface (m) !! default value = estimated from side-view strawperson diagram, August 2021 @@ -204,7 +200,6 @@ subroutine init_divertor_variables divdens = 1.0D4 divdum = 0 divfix = 0.2D0 - divleg_profile_inner = 0.563D0 divleg_profile_outer = 2.596D0 divmas = 0.0D0 divplt = 0.035D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 28dcb6ae33..961defc346 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -264,7 +264,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, divleg_profile_inner, & + zeffdiv, hldivlim, rlenmax, divfix, c3div, & divleg_profile_outer, hldiv, i_hldiv use fwbs_variables, only: fblhebpo, vfblkt, fdiv, fvolso, fwcoolant, & pitch, iblanket, blktmodel, afwi, fblli2o, nphcdin, breeder_multiplier, & @@ -1290,9 +1290,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('divfix') call parse_real_variable('divfix', divfix, 0.1D0, 5.0D0, & 'Divertor structure vertical extent (m)') - case('divleg_profile_inner') - call parse_real_variable('divleg_profile_inner', divleg_profile_inner, 0.0D0, 10.0D0, & - 'Divertor inner leg surface, 2D profile (m)') case('divleg_profile_outer') call parse_real_variable('divleg_profile_outer', divleg_profile_outer, 0.0D0, 50.0D0, & 'Divertor outer leg surface, 2D profile (m)') diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f106eba00a..b09d400daa 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1643,7 +1643,6 @@ "divdens": 10000.0, "divdum": 0.0, "divfix": 0.2, - "divleg_profile_inner": 0.563, "divleg_profile_outer": 2.596, "divlife": 0.0, "divmas": 0.0, @@ -9415,7 +9414,6 @@ "divdens": "divertor structure density (kg/m3)", "divdum": "switch for divertor Zeff model:\n", "divfix": "divertor structure vertical thickness (m)", - "divleg_profile_inner": "length of 2D profile of inner leg surface (m)\n default value = estimated from side-view strawperson diagram, August 2021", "divleg_profile_outer": "length of 2D profile of outer leg surface (m)\n default value = estimated from side-view strawperson diagram, August 2021", "divlife": "Full power lifetime of divertor (y)", "divmas": "divertor plate mass (kg)", @@ -12453,10 +12451,6 @@ "lb": 0.1, "ub": 5.0 }, - "divleg_profile_inner": { - "lb": 0.0, - "ub": 10.0 - }, "divleg_profile_outer": { "lb": 0.0, "ub": 50.0 @@ -18449,7 +18443,6 @@ "divdens", "divdum", "divfix", - "divleg_profile_inner", "divleg_profile_outer", "divmas", "divplt", @@ -20795,7 +20788,6 @@ "divdens": "real_variable", "divdum": "int_variable", "divfix": "real_variable", - "divleg_profile_inner": "real_variable", "divleg_profile_outer": "real_variable", "divplt": "real_variable", "dnbeta": "real_variable", From 701ea1d32800b6827fda06ad16330d256e420bf4 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 10:17:25 +0000 Subject: [PATCH 03/16] divleg_profile_outer placed in obsolete --- process/io/obsolete_vars.py | 1 + source/fortran/divertor_variables.f90 | 5 ----- source/fortran/input.f90 | 5 +---- tests/integration/ref_dicts.json | 8 -------- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 337aef00f9..6813085248 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -76,4 +76,5 @@ "igeom": None, "fgamp": None, "divleg_profile_inner": None, + "divleg_profile_outer": None, } diff --git a/source/fortran/divertor_variables.f90 b/source/fortran/divertor_variables.f90 index 6adb102aa5..81d3f97bee 100644 --- a/source/fortran/divertor_variables.f90 +++ b/source/fortran/divertor_variables.f90 @@ -76,10 +76,6 @@ module divertor_variables real(dp) :: divfix !! divertor structure vertical thickness (m) - real(dp) :: divleg_profile_outer - !! length of 2D profile of outer leg surface (m) - !! default value = estimated from side-view strawperson diagram, August 2021 - real(dp) :: divmas !! divertor plate mass (kg) @@ -200,7 +196,6 @@ subroutine init_divertor_variables divdens = 1.0D4 divdum = 0 divfix = 0.2D0 - divleg_profile_outer = 2.596D0 divmas = 0.0D0 divplt = 0.035D0 divsur = 0.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 961defc346..10fe0b28e6 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -265,7 +265,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) 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, & - divleg_profile_outer, hldiv, i_hldiv + hldiv, i_hldiv use fwbs_variables, only: fblhebpo, vfblkt, fdiv, fvolso, fwcoolant, & pitch, iblanket, blktmodel, afwi, fblli2o, nphcdin, breeder_multiplier, & fw_armour_thickness, roughness, fwclfr, breedmat, fblli, fblvd, & @@ -1290,9 +1290,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('divfix') call parse_real_variable('divfix', divfix, 0.1D0, 5.0D0, & 'Divertor structure vertical extent (m)') - case('divleg_profile_outer') - call parse_real_variable('divleg_profile_outer', divleg_profile_outer, 0.0D0, 50.0D0, & - 'Divertor outer leg surface, 2D profile (m)') case ('divplt') call parse_real_variable('divplt', divplt, 0.01D0, 1.0D0, & 'Divertor plate thickness (m)') diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b09d400daa..5eae72298c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1643,7 +1643,6 @@ "divdens": 10000.0, "divdum": 0.0, "divfix": 0.2, - "divleg_profile_outer": 2.596, "divlife": 0.0, "divmas": 0.0, "divplt": 0.035, @@ -9414,7 +9413,6 @@ "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)", - "divleg_profile_outer": "length of 2D profile of outer leg surface (m)\n default value = estimated from side-view strawperson diagram, August 2021", "divlife": "Full power lifetime of divertor (y)", "divmas": "divertor plate mass (kg)", "divplt": "divertor plate thickness (m) (from Spears, Sept 1990)", @@ -12451,10 +12449,6 @@ "lb": 0.1, "ub": 5.0 }, - "divleg_profile_outer": { - "lb": 0.0, - "ub": 50.0 - }, "divplt": { "lb": 0.01, "ub": 1.0 @@ -18443,7 +18437,6 @@ "divdens", "divdum", "divfix", - "divleg_profile_outer", "divmas", "divplt", "divsur", @@ -20788,7 +20781,6 @@ "divdens": "real_variable", "divdum": "int_variable", "divfix": "real_variable", - "divleg_profile_outer": "real_variable", "divplt": "real_variable", "dnbeta": "real_variable", "dp_he": "real_variable", From a44c5c767745214991956fcbcd6b16e62ec2d83a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 10:23:40 +0000 Subject: [PATCH 04/16] iprmnloss placed in obsolete --- process/io/obsolete_vars.py | 1 + source/fortran/heat_transport_variables.f90 | 7 ------- source/fortran/input.f90 | 5 +---- tests/integration/ref_dicts.json | 8 -------- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 6813085248..984622dd11 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -77,4 +77,5 @@ "fgamp": None, "divleg_profile_inner": None, "divleg_profile_outer": None, + "iprimnloss": None, } diff --git a/source/fortran/heat_transport_variables.f90 b/source/fortran/heat_transport_variables.f90 index 27cdd09a26..896731c73a 100644 --- a/source/fortran/heat_transport_variables.f90 +++ b/source/fortran/heat_transport_variables.f90 @@ -107,12 +107,6 @@ module heat_transport_variables !! - =0 pre-2014 version !! - =1 comprehensive 2014 model - integer :: iprimnloss - !! switch for lost neutron power through holes destiny (ipowerflow=0): - !! - !! - =0 does not contribute to energy generation cycle - !! - =1 contributes to energy generation cycle - integer :: iprimshld !! Switch for shield thermal power destiny: !! @@ -224,7 +218,6 @@ subroutine init_heat_transport_variables htpmw_shld = 0.0D0 htpsecmw = 0.0D0 ipowerflow = 1 - iprimnloss = 0 iprimshld = 1 nphx = 0 pacpmw = 0.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 10fe0b28e6..2a16fc4644 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -283,7 +283,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use heat_transport_variables, only: htpmw_fw, baseel, fmgdmw, htpmw_div, & pwpm2, etath, vachtmw, iprimshld, fpumpdiv, pinjmax, htpmw_blkt, etatf, & htpmw_min, fpumpblkt, ipowerflow, htpmw_shld, fpumpshld, trithtmw, & - iprimnloss, fpumpfw, crypmw_max, f_crypmw + fpumpfw, crypmw_max, f_crypmw use ife_variables, only: bldzu, etali, sombdr, gainve, cdriv0, v1dzl, & bldrc, fauxbop, pfusife, dcdrv0, fwdr, pdrive, mcdriv, ucconc, shdr, & v3dzu, bldzl, rrin, maxmat, shmatf, fwmatf, drveff, flirad, shdzu, v2dzu, & @@ -2500,9 +2500,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('ipowerflow') call parse_int_variable('ipowerflow', ipowerflow, 0, 1, & 'Switch for power flow model') - case ('iprimnloss') - call parse_int_variable('iprimnloss', iprimnloss, 0, 1, & - 'Switch for lost neutron power destiny') case ('iprimshld') call parse_int_variable('iprimshld', iprimshld, 0, 1, & 'Switch for shield thermal power destiny') diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 5eae72298c..89c9ee7652 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2661,7 +2661,6 @@ "ipowerflow": 1.0, "iprecomp": 1.0, "iprimdiv": 0.0, - "iprimnloss": 0.0, "iprimshld": 1.0, "iprofile": 1.0, "ips": 0.0, @@ -10019,7 +10018,6 @@ "ipowerflow": "switch for power flow model:\n
    \n
  • =0 pre-2014 version
    • \n
  • =1 comprehensive 2014 model
    • \n
", "iprecomp": "Switch for existence of central solenoid pre-compression structure:\n
    \n
  • =0 no pre-compression structure
    • \n
  • =1 calculated pre-compression structure
    • \n
", "iprimdiv": "", - "iprimnloss": "switch for lost neutron power through holes destiny (ipowerflow=0):\n
    \n
  • =0 does not contribute to energy generation cycle
    • \n
  • =1 contributes to energy generation cycle
    • \n
", "iprimshld": "Switch for shield thermal power destiny:\n
    \n
  • =0 does not contribute to energy generation cycle
    • \n
  • =1 contributes to energy generation cycle
    • \n
", "iprofile": "switch for current profile consistency:\n
    \n
  • =0 use input values for alphaj, rli, dnbeta (but see gtscale option)
    • \n
  • =1 make these consistent with input q, q_0 values (recommend `icurr=4` with this option)
    • \n
", "ips": "switch for Pfirsch-Schl\u00fcter current scaling (issue #413):\n
    \n
  • =0 Do not calculate
    • \n
  • =1 Use SCENE scaling
    • \n
", @@ -13721,10 +13719,6 @@ "lb": 0, "ub": 1 }, - "iprimnloss": { - "lb": 0, - "ub": 1 - }, "iprimshld": { "lb": 0, "ub": 1 @@ -18734,7 +18728,6 @@ "htpmw_shld", "htpsecmw", "ipowerflow", - "iprimnloss", "iprimshld", "nphx", "pacpmw", @@ -21107,7 +21100,6 @@ "ipnet": "int_variable", "ipowerflow": "int_variable", "iprecomp": "int_variable", - "iprimnloss": "int_variable", "iprimshld": "int_variable", "iprofile": "int_variable", "ips": "int_variable", From 374ad36415107e85b1fc0525b2f77e15dc37f420 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 11:44:26 +0000 Subject: [PATCH 05/16] rho_ecrh set as obsolete --- process/io/obsolete_vars.py | 1 + process/io/plot_radial_build.py | 2 +- process/io/plot_scans.py | 2 +- source/fortran/current_drive_variables.f90 | 4 ---- source/fortran/input.f90 | 5 +---- source/fortran/scan.f90 | 6 +++--- tests/integration/ref_dicts.json | 9 --------- 7 files changed, 7 insertions(+), 22 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 984622dd11..563ede9abe 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -78,4 +78,5 @@ "divleg_profile_inner": None, "divleg_profile_outer": None, "iprimnloss": None, + "rho_ecrh": None, } diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index 1e6f017830..83f6fcd343 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -277,7 +277,7 @@ def main(args=None): "boundu(135)", "blnkoth", "fimp(9)", - "rho_ecrh", + "Obsolete", # Removed "alstrtf", "tmargmin_tf", "boundu(152)", diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py index aebccad619..36425a9eec 100644 --- a/process/io/plot_scans.py +++ b/process/io/plot_scans.py @@ -359,7 +359,7 @@ def main(args=None): nsweep_dict[40] = "boundu(135)" nsweep_dict[41] = "blnkoth" nsweep_dict[42] = "fimp(9)" - nsweep_dict[43] = "rho_ecrh" + nsweep_dict[43] = "Obsolete" # Removed nsweep_dict[44] = "alstrtf" nsweep_dict[45] = "tmargmin_tf" nsweep_dict[46] = "boundu(152)" diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index adbe82f375..14ef5d6717 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -119,9 +119,6 @@ module current_drive_variables real(dp) :: gamma_ecrh !! User input ECRH gamma (1.0e20 A/(W m^2)) - real(dp) :: rho_ecrh - !! normalised minor radius at which electron cyclotron current drive is maximum - real(dp) :: xi_ebw !! User scaling input for EBW plasma heating. Default 0.43 @@ -263,7 +260,6 @@ subroutine init_current_drive_variables ftritbm = 1.0D-6 gamcd = 0.0D0 gamma_ecrh = 0.35D0 - rho_ecrh = 0.1D0 xi_ebw = 0.8D0 iefrf = 5 iefrffix = 0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 2a16fc4644..6bb2dcf518 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -258,7 +258,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) ucpens, cland, ucwindpf, i_cp_lifetime, cplife_input, & startupratio use current_drive_variables, only: pinjfixmw, etaech, pinjalw, etanbi, & - ftritbm, gamma_ecrh, pheat, rho_ecrh, beamwd, enbeam, pheatfix, bscfmax, & + ftritbm, gamma_ecrh, pheat, beamwd, enbeam, pheatfix, bscfmax, & forbitloss, nbshield, tbeamin, feffcd, iefrf, iefrffix, irfcd, cboot, & etalh, frbeam, harnum, xi_ebw use divertor_variables, only: fdfs, anginc, divdens, divclfr, c4div, & @@ -1159,9 +1159,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('harnum') call parse_real_variable('harnum', harnum, 1.0D0, 10.0D0, & 'cyclotron harmonic frequency number') - case ('rho_ecrh') - call parse_real_variable('rho_ecrh', rho_ecrh, 0.0D0, 1.0D0, & - 'normalised minor radius at which electron cyclotron current drive is maximum') case ('xi_ebw') call parse_real_variable('xi_ebw', xi_ebw, 0.0D0, 1.0D0, & 'User input EBW scaling for Plasma Heating') diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index ce5c75800f..1a8f23fcc5 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -620,7 +620,7 @@ subroutine scan_select(nwp, swp, iscn, vlab, xlab) use constraint_variables, only: fiooic, walalw, bmxlim, fqval, taulimit, & gammax, tbrnmn, tbrmin, fjprot, pnetelin, powfmax use cost_variables, only: cfactr, iavail, fkind, startupratio - use current_drive_variables, only: rho_ecrh, bscfmax, etaech + use current_drive_variables, only: bscfmax, etaech use divertor_variables, only: hldivlim use error_handling, only: idiags, report_error use fwbs_variables, only: inlet_temp_liq, outlet_temp_liq, blpressure_liq, & @@ -765,8 +765,8 @@ subroutine scan_select(nwp, swp, iscn, vlab, xlab) impurity_arr_frac(9) = fimp(9) vlab = 'fimp(9)' ; xlab = 'Argon fraction' case (43) - rho_ecrh = swp(iscn) - vlab = 'rho_ecrh' ; xlab = 'rho at which ECCD is max' + ! rho_ecrh = swp(iscn) + vlab = 'obsolete' ; xlab = 'obsolete' case (44) sig_tf_case_max = swp(iscn) vlab = 'sig_tf_case_max' ; xlab = 'Allowable_stress_in_tf_coil_case_Tresca_(pa)' diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 89c9ee7652..9cf621dfe9 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4309,7 +4309,6 @@ 0.0, 0.0 ], - "rho_ecrh": 0.1, "rho_max_dn": null, "rho_max_dt": null, "rho_star": 0.0, @@ -10706,7 +10705,6 @@ "resdl": "", "residual_sig_hoop": "residual hoop stress in strucutal material (Pa)", "rfxf": "", - "rho_ecrh": "normalised minor radius at which electron cyclotron current drive is maximum", "rho_max_dn": "r/a where the density gradient is largest (`ipedestal==0`)", "rho_max_dt": "r/a where the temperature gradient is largest (`ipedestal==0`)", "rho_star": "", @@ -14563,10 +14561,6 @@ "lb": 0.0, "ub": 1000000000.0 }, - "rho_ecrh": { - "lb": 0.0, - "ub": 1.0 - }, "rho_tf_joints": { "lb": 0.0, "ub": 0.01 @@ -18324,7 +18318,6 @@ "ftritbm", "gamcd", "gamma_ecrh", - "rho_ecrh", "xi_ebw", "iefrf", "iefrffix", @@ -20530,7 +20523,6 @@ "40": "boundu(135)", "41": "blnkoth", "42": "fimp(9)", - "43": "rho_ecrh", "44": "sig_tf_case_max", "5": "oacdcp", "6": "walalw", @@ -21334,7 +21326,6 @@ "reinke_mode": "int_variable", "relerr_sol": "real_variable", "residual_sig_hoop": "real_variable", - "rho_ecrh": "real_variable", "rho_tf_joints": "real_variable", "rhopedn": "real_variable", "rhopedt": "real_variable", From 0f2e195f9c6f0729a68c5fe86701cd12155ddbbd Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 11:47:34 +0000 Subject: [PATCH 06/16] ifispact set as obsolete --- process/io/obsolete_vars.py | 1 + source/fortran/initial.f90 | 3 +-- source/fortran/input.f90 | 5 +---- source/fortran/physics_variables.f90 | 7 ------- tests/integration/ref_dicts.json | 8 -------- 5 files changed, 3 insertions(+), 21 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 563ede9abe..f42e435b27 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -79,4 +79,5 @@ "divleg_profile_outer": None, "iprimnloss": None, "rho_ecrh": None, + "ifispact": None, } diff --git a/source/fortran/initial.f90 b/source/fortran/initial.f90 index 7ecf2bdc81..5ebf4cfe57 100755 --- a/source/fortran/initial.f90 +++ b/source/fortran/initial.f90 @@ -261,7 +261,7 @@ subroutine check use physics_variables, only: aspect, eped_sf, fdeut, fgwped, fhe3, & fgwsep, ftrit, ibss, i_single_null, icurr, ieped, idivrt, ishape, & iradloss, isc, ipedestal, ilhthresh, itart, nesep, rhopedn, rhopedt, & - rnbeam, ifispact, neped, te, tauee_in, tesep, teped, itartpf, ftar + rnbeam, neped, te, tauee_in, tesep, teped, itartpf, ftar use pulse_variables, only: lpulse use reinke_variables, only: fzactual, impvardiv use tfcoil_variables, only: casthi, casthi_is_fraction, casths, i_tf_sup, & @@ -345,7 +345,6 @@ subroutine check if (ftrit < 1.0D-3) then ! tritium fraction is negligible triv = 0.0D0 - ifispact = 0 trithtmw = 0.0D0 end if diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 6bb2dcf518..78cf80f9c8 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -310,7 +310,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) ifalphap, tauee_in, alphaj, alphat, icurr, q, ti, tesep, rli, triang, & itart, ralpne, iprofile, triang95, rad_fraction_sol, betbm0, protium, & teped, fhe3, iwalld, gamma, falpha, fgwped, gtscale, tbeta, ibss, & - iradloss, te, alphan, rmajor, kappa, ifispact, iinvqd, fkzohm, beamfus0, & + iradloss, te, alphan, rmajor, kappa, iinvqd, fkzohm, beamfus0, & tauratio, idensl, ieped, bt, iscrp, ipnlaws, betalim, betalim_lower, & idia, ips, m_s_limit, burnup_in use pf_power_variables, only: iscenr, maxpoloidalpower @@ -679,9 +679,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('ifalphap') call parse_int_variable('ifalphap', ifalphap, 0, 1, & 'Switch for fast alpha pressure fit') - case ('ifispact') - call parse_int_variable('ifispact', ifispact, 0, 0, & - 'Switch for neutronics calculations') case ('ignite') call parse_int_variable('ignite', ignite, 0, 1, & 'Switch for ignited plasma assumption') diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 1a06f384c9..d9bf7a9e34 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -305,12 +305,6 @@ module physics_variables !! - =0 ITER physics rules (Uckan) fit !! - =1 Modified fit (D. Ward) - better at high temperature - integer :: ifispact - !! switch for neutronics calculations: - !! - !! - =0 neutronics calculations turned off - !! - =1 neutronics calculations turned on - integer :: ignite !! switch for ignition assumption. Obviously, ignite must be zero if current drive !! is required. If ignite is 1, any auxiliary power is assumed to be used only during @@ -982,7 +976,6 @@ subroutine init_physics_variables idensl = 7 idivrt = 2 ifalphap = 1 - ifispact = 0 ignite = 0 iinvqd = 1 ipedestal = 1 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9cf621dfe9..dd281447cc 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2462,7 +2462,6 @@ "ife": 0.0, "ifedrv": 2.0, "ifetyp": 0.0, - "ifispact": 0.0, "ifueltyp": 0.0, "ignite": 0.0, "iinvqd": 1.0, @@ -9954,7 +9953,6 @@ "ife": "Switch for IFE option:\n
    \n
  • =0 use tokamak, RFP or stellarator model
    • \n
  • =1 use IFE model
    • \n
", "ifedrv": "Switch for type of IFE driver:\n
    \n
  • =-1 use gainve, etave for gain and driver efficiency
    • \n
  • =0 use tgain, drveff for gain and driver efficiency
    • \n
  • =1 use laser driver based on SOMBRERO design
    • \n
  • =2 use heavy ion beam driver based on OSIRIS
    • \n
  • =3 Input pfusife, rrin and drveff
    • \n
", "ifetyp": "Switch for type of IFE device build:\n
    \n
  • =0 generic (cylindrical) build
    • \n
  • =1 OSIRIS-like build
    • \n
  • =2 SOMBRERO-like build
    • \n
  • =3 HYLIFE-II-like build
    • \n
  • =4 2019 build
    • \n
", - "ifispact": "switch for neutronics calculations:\n
    \n
  • =0 neutronics calculations turned off
    • \n
  • =1 neutronics calculations turned on
    • \n
", "ifueltyp": "Switch for fuel type:\n
    \n
  • =2 treat initial blanket, divertor, first wall\n as capital costs. Treat all later items and\n fraction fcdfuel of CD equipment as fuel costs
    • \n
  • =1 treat blanket divertor, first wall and\n fraction fcdfuel of CD equipment as fuel cost
    • \n
  • =0 treat these as capital cost
    • \n
", "igeom": "switch for plasma geometry calculation:\n
    \n
  • =0 original method (possibly based on Peng ST modelling)
    • \n
  • =1 improved (and traceable) method
    • \n
", "ignite": "switch for ignition assumption. Obviously, ignite must be zero if current drive\n is required. If ignite is 1, any auxiliary power is assumed to be used only during\n plasma start-up, and is excluded from all steady-state power balance calculations.\n
    \n
  • =0 do not assume plasma ignition
    • \n
  • =1 assume ignited (but include auxiliary power in costs)\n
", @@ -13621,10 +13619,6 @@ "lb": 0, "ub": 4 }, - "ifispact": { - "lb": 0, - "ub": 0 - }, "ifueltyp": { "lb": 0, "ub": 2 @@ -19643,7 +19637,6 @@ "idensl", "idivrt", "ifalphap", - "ifispact", "igeom", "ignite", "iinvqd", @@ -21065,7 +21058,6 @@ "ife": "int_variable", "ifedrv": "int_variable", "ifetyp": "int_variable", - "ifispact": "int_variable", "ifueltyp": "int_variable", "igeom": "int_variable", "ignite": "int_variable", From 876be1fa24f85a2243510bf3136645077e52a12a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 11:56:52 +0000 Subject: [PATCH 07/16] fms* placed as obsolete --- process/io/obsolete_vars.py | 8 ++++ source/fortran/build_variables.f90 | 32 --------------- source/fortran/input.f90 | 34 +++------------- tests/integration/ref_dicts.json | 65 ------------------------------ 4 files changed, 13 insertions(+), 126 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index f42e435b27..2e79cd63a2 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -80,4 +80,12 @@ "iprimnloss": None, "rho_ecrh": None, "ifispact": None, + "fmsbc": None, + "fmsbl": None, + "fmsdwe": None, + "fmsdwi": None, + "fmsfw": None, + "fmsoh": None, + "fmssh": None, + "fmstf": None, } diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index dd7d28edc9..5b643985cd 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -85,30 +85,6 @@ module build_variables real(dp) :: fcspc !! Fraction of space occupied by CS pre-compression structure - real(dp) :: fmsbc - !! Martensitic fraction of steel in (non-existent!) bucking cylinder - - real(dp) :: fmsbl - !! Martensitic fraction of steel in blanket - - real(dp) :: fmsdwe - !! Martensitic fraction of steel in cryostat - - real(dp) :: fmsdwi - !! Martensitic fraction of steel in vacuum vessel - - real(dp) :: fmsfw - !! Martensitic fraction of steel in first wall - - real(dp) :: fmsoh - !! Martensitic fraction of steel in central solenoid - - real(dp) :: fmssh - !! Martensitic fraction of steel in shield - - real(dp) :: fmstf - !! Martensitic fraction of steel in TF coil - real(dp) :: fseppc !! Separation force in CS coil pre-compression structure @@ -348,14 +324,6 @@ subroutine init_build_variables d_vv_bot = 0.07D0 f_avspace = 1.0D0 fcspc = 0.6D0 - fmsbc = 0.0D0 - fmsbl = 0.0D0 - fmsdwe = 0.0D0 - fmsdwi = 0.0D0 - fmsfw = 0.0D0 - fmsoh = 0.0D0 - fmssh = 0.0D0 - fmstf = 0.0D0 fseppc = 3.5D8 fwarea = 0.0D0 fwareaib = 0.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 78cf80f9c8..306ba6e29a 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -192,13 +192,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, fmsfw, blbmoth, blbuith, fmsbc, shldoth, & - fmsdwi, shldtth, shldlth, vgap2, plleni, fwoth, vvblgap, fmsbl, & + use build_variables, only: tf_in_cs, blbmoth, blbuith, shldoth, & + shldtth, shldlth, vgap2, plleni, fwoth, vvblgap, & thshield_ib, thshield_ob, thshield_vb, iprecomp, & - blbpith, aplasmin, blbuoth, tfcth, fmsdwe, & + blbpith, aplasmin, blbuoth, tfcth, & iohcl, tftsgap, clhsf, bore, plleno, scrapli, gapomin, ddwex, & - rinboard, fmstf, blnkoth, fseppc, plsepo, fmssh, blnkith, & - ohcth, plsepi, fmsoh, blbmith, gapoh, fcspc, scraplo, vgaptop, & + rinboard, blnkoth, fseppc, plsepo, blnkith, & + ohcth, plsepi, blbmith, gapoh, fcspc, scraplo, vgaptop, & blbpoth, gapds, fwith, vgap, 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, & @@ -1432,30 +1432,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fcspc') call parse_real_variable('fcspc', fcspc, 0.0D0, 1.0D0, & 'Fraction of space occupied by CS pre-comp structure') - case ('fmsbc') - call parse_real_variable('fmsbc', fmsbc, 0.0D0, 1.0D0, & - 'Martensitic frac of steel in buck cyl') - case ('fmsbl') - call parse_real_variable('fmsbl', fmsbl, 0.0D0, 1.0D0, & - 'Martensitic frac of steel in blanket') - case ('fmsdwe') - call parse_real_variable('fmsdwe', fmsdwe, 0.0D0, 1.0D0, & - 'Martensitic frac of steel in cryostat') - case ('fmsdwi') - call parse_real_variable('fmsdwi', fmsdwi, 0.0D0, 1.0D0, & - 'Martensitic frac of steel in vacuum vessel') - case ('fmsfw') - call parse_real_variable('fmsfw', fmsfw, 0.0D0, 1.0D0, & - 'Martensitic frac of steel in first wall') - case ('fmsoh') - call parse_real_variable('fmsoh', fmsoh, 0.0D0, 1.0D0, & - 'Martensitic frac of steel in Central Solenoid') - case ('fmssh') - call parse_real_variable('fmssh', fmssh, 0.0D0, 1.0D0, & - 'Martensitic frac of steel in shield') - case ('fmstf') - call parse_real_variable('fmstf', fmstf, 0.0D0, 1.0D0, & - 'Martensitic frac of steel in TF coil') case ('fseppc') call parse_real_variable('fseppc', fseppc, 1.0D6, 1.0D9, & 'CS separation force held by CS pre-comp structure') diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index dd281447cc..a8c4117c61 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1980,14 +1980,6 @@ "fluxdens_to_pa": "1.0D0/1.55e23", "fmgdmw": 0.0, "fmom": null, - "fmsbc": 0.0, - "fmsbl": 0.0, - "fmsdwe": 0.0, - "fmsdwi": 0.0, - "fmsfw": 0.0, - "fmsoh": 0.0, - "fmssh": 0.0, - "fmstf": 0.0, "fmt_str": "\"(a,1pe10.3)\"", "fmva": 1.0, "fnbshinef": 1.0, @@ -9687,14 +9679,6 @@ "fluxdens_to_pa": "", "fmgdmw": "power to mgf (motor-generator flywheel) units (MW) (ignored if `iscenr=2`)", "fmom": "momentum factor [-]", - "fmsbc": "Martensitic fraction of steel in (non-existent!) bucking cylinder", - "fmsbl": "Martensitic fraction of steel in blanket", - "fmsdwe": "Martensitic fraction of steel in cryostat", - "fmsdwi": "Martensitic fraction of steel in vacuum vessel", - "fmsfw": "Martensitic fraction of steel in first wall", - "fmsoh": "Martensitic fraction of steel in central solenoid", - "fmssh": "Martensitic fraction of steel in shield", - "fmstf": "Martensitic fraction of steel in TF coil", "fmt_str": "", "fmva": "f-value for maximum MVA (`constraint equation 19`, `iteration variable 30`)", "fnbshinef": "f-value for maximum neutral beam shine-through fraction\n (`constraint equation 59`, `iteration variable 105`)", @@ -12959,38 +12943,6 @@ "lb": 0.0, "ub": 100.0 }, - "fmsbc": { - "lb": 0.0, - "ub": 1.0 - }, - "fmsbl": { - "lb": 0.0, - "ub": 1.0 - }, - "fmsdwe": { - "lb": 0.0, - "ub": 1.0 - }, - "fmsdwi": { - "lb": 0.0, - "ub": 1.0 - }, - "fmsfw": { - "lb": 0.0, - "ub": 1.0 - }, - "fmsoh": { - "lb": 0.0, - "ub": 1.0 - }, - "fmssh": { - "lb": 0.0, - "ub": 1.0 - }, - "fmstf": { - "lb": 0.0, - "ub": 1.0 - }, "fmva": { "lb": 0.001, "ub": 10.0 @@ -17502,14 +17454,6 @@ "d_vv_bot", "f_avspace", "fcspc", - "fmsbc", - "fmsbl", - "fmsdwe", - "fmsdwi", - "fmsfw", - "fmsoh", - "fmssh", - "fmstf", "fseppc", "fwarea", "fwareaib", @@ -20890,15 +20834,6 @@ "flirad": "real_variable", "flpitch": "real_variable", "fmgdmw": "real_variable", - "fmsbc": "real_variable", - "fmsbl": "real_variable", - "fmsdwe": "real_variable", - "fmsdwi": "real_variable", - "fmsfw": "real_variable", - "fmsoh": "real_variable", - "fmssh": "real_variable", - "fmstf": "real_variable", - "fmva": "real_variable", "fnbshinef": "real_variable", "fndt": "real_variable", "fne0": "real_variable", From dcec1ff4f9bb11c2d4864e6fb60414921498ac7d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 13:18:58 +0000 Subject: [PATCH 08/16] quench_detection_ef marked as obsolete --- process/io/obsolete_vars.py | 1 + source/fortran/input.f90 | 5 +---- source/fortran/tfcoil_variables.f90 | 4 ---- tests/integration/ref_dicts.json | 8 -------- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 2e79cd63a2..ea2636fe2e 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -88,4 +88,5 @@ "fmsoh": None, "fmssh": None, "fmstf": None, + "quench_detection_ef": None, } diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 306ba6e29a..d375239492 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -324,7 +324,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) f_w, bmn, shear, m_res, f_rad, flpitch, istell, max_gyrotron_frequency, & te0_ecrh_achievable use tfcoil_variables, only: fcoolcp, tfinsgap, vftf, & - quench_detection_ef, fhts, dr_tf_wp, rcool, rhotfleg, thkcas, & + fhts, dr_tf_wp, rcool, rhotfleg, thkcas, & casthi, n_pancake, bcritsc, i_tf_sup, str_pf_con_res, thwcndut, farc4tf, & thicndut, tftmp, oacdcp, tmax_croco, ptempalw, tmargmin_tf, tmpcry, & sig_tf_case_max, dztop, dcond, str_cs_con_res, etapump, drtop, vcool, dcondins, & @@ -1926,9 +1926,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('quench_model') call parse_string_variable('quench_model', quench_model, & 'Switch for TF coil quench model (Only applies to REBCO magnet at present)') - case ('quench_detection_ef') - call parse_real_variable('quench_detection_ef', quench_detection_ef, 0.0D0, 1.0D1, & - 'Electric field at which TF quench is detected and discharge begins (V/m)') case ('tmax_croco') call parse_real_variable('tmax_croco', tmax_croco, 4.0D0, 1.0D3, & diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 0a04449a80..066d16f6e7 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -480,9 +480,6 @@ module tfcoil_variables !! - ='exponential' exponential quench with constant discharge resistor !! - ='linear' quench with constant voltage - real(dp) :: quench_detection_ef - !! Electric field at which TF quench is detected and discharge begins (V/m) - real(dp) :: time1 !! Time at which TF quench is detected (s) @@ -950,7 +947,6 @@ subroutine init_tfcoil_variables str_wp_max = 0.7D-2 i_str_wp = 1 quench_model = 'exponential' - quench_detection_ef = 0D0 time1 = 0D0 tcritsc = 16.0D0 tdmptf = 10.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a8c4117c61..a2141a0e3b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3807,7 +3807,6 @@ "qstar": 0.0, "qtargettotal": 5000000.0, "qtaue": 0.0, - "quench_detection_ef": 0.0, "quench_model": "'exponential'", "r1": 0.0, "r2": 0.0, @@ -10616,7 +10615,6 @@ "qstar": "cylindrical safety factor", "qtargettotal": "Power density on target including surface recombination [W/m2] (`iteration variable 124`)", "qtaue": "exponent for temperature term in energy confinement time formula", - "quench_detection_ef": "Electric field at which TF quench is detected and discharge begins (V/m)", "quench_model": "switch for TF coil quench model (Only applies to REBCO magnet at present, issue #522):\n
    \n
  • ='exponential' exponential quench with constant discharge resistor
    • \n
  • ='linear' quench with constant voltage
    • \n
", "r1": "IFE device radial build (m)", "r2": "IFE device radial build (m)", @@ -14423,10 +14421,6 @@ "lb": 0.001, "ub": 100000000.0 }, - "quench_detection_ef": { - "lb": 0.0, - "ub": 10.0 - }, "r_cp_top": { "lb": 0.001, "ub": 10.0 @@ -20147,7 +20141,6 @@ "str_wp_max", "i_str_wp", "quench_model", - "quench_detection_ef", "time1", "taucq", "tcritsc", @@ -21232,7 +21225,6 @@ "qnty_sfty_fac": "real_variable", "qnuc": "real_variable", "qtargettotal": "real_variable", - "quench_detection_ef": "real_variable", "r_cp_top": "real_variable", "rad_fraction_sol": "real_variable", "ralpne": "real_variable", From f9fc95c9b65a773532e61719278bb7990bdfced4 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 14:49:17 +0000 Subject: [PATCH 09/16] farc4tf marked as obsolete --- process/io/obsolete_vars.py | 1 + source/fortran/input.f90 | 5 +---- source/fortran/tfcoil_variables.f90 | 5 +---- tests/integration/ref_dicts.json | 8 -------- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index ea2636fe2e..b89fc0e89c 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -89,4 +89,5 @@ "fmssh": None, "fmstf": None, "quench_detection_ef": None, + "farc4tf": None, } diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index d375239492..4a8fdeac2d 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -325,7 +325,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) te0_ecrh_achievable use tfcoil_variables, only: fcoolcp, tfinsgap, vftf, & fhts, dr_tf_wp, rcool, rhotfleg, thkcas, & - casthi, n_pancake, bcritsc, i_tf_sup, str_pf_con_res, thwcndut, farc4tf, & + casthi, n_pancake, bcritsc, i_tf_sup, str_pf_con_res, thwcndut, & thicndut, tftmp, oacdcp, tmax_croco, ptempalw, tmargmin_tf, tmpcry, & sig_tf_case_max, dztop, dcond, str_cs_con_res, etapump, drtop, vcool, dcondins, & i_tf_tresca, dhecoil, tmaxpro, n_tf, tcpav, fcutfsu, jbus, & @@ -1673,9 +1673,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('eyoung_res_tf_buck') call parse_real_variable('eyoung_res_tf_buck', eyoung_res_tf_buck, 1.0D-10, 1.0D12, & 'Reinforced aluminium Young modulus for TF stress calc.') - case ('farc4tf') - call parse_real_variable('farc4tf', farc4tf, 0.0D0, 1.0D0, & - 'TF coil shape parameter') case ('t_crit_nbti') call parse_real_variable('t_crit_nbti ', t_crit_nbti , 0.0D0, 15.0D0, & 'Critical temperature of GL_nbti ') diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 066d16f6e7..f227d0fcf5 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -163,8 +163,6 @@ module tfcoil_variables real(dp) :: estotftgj !! total stored energy in the toroidal field (GJ) - real(dp) :: farc4tf - !! factor to size height of point 4 on TF coil real(dp) :: b_crit_upper_nbti !! upper critical field of GL_nbti real(dp) :: t_crit_nbti @@ -718,7 +716,7 @@ module tfcoil_variables real(dp) :: wwp2 !! width of second step of winding pack (m) - ! Superconducting TF coil shape parameters (see also farc4tf); + ! Superconducting TF coil shape parameters; ! the TF inner surface top half is approximated by four circular arcs. ! Arc 1 goes through points 1 and 2 on the inner surface. Arc 2 ! goes through points 2 and 3, etc. @@ -881,7 +879,6 @@ subroutine init_tfcoil_variables dcondins = 1800.0D0 dhecoil = 0.005D0 estotftgj = 0.0D0 - farc4tf = 0.7D0 b_crit_upper_nbti = 14.86D0 t_crit_nbti = 9.04D0 max_force_density = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a2141a0e3b..7cc2d7ebbb 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1858,7 +1858,6 @@ "falpe": 0.0, "falpha": 0.95, "falpi": 0.0, - "farc4tf": 0.7, "fauxbop": 0.06, "fauxmn": 1.0, "favail": 1.0, @@ -9580,7 +9579,6 @@ "falpe": "fraction of alpha energy to electrons", "falpha": "fraction of alpha power deposited in plasma (Physics of Energetic Ions, p.2489)", "falpi": "fraction of alpha power to ions", - "farc4tf": "factor to size height of point 4 on TF coil", "fauxbop": "fraction of gross electric power to balance-of-plant (IFE)", "fauxmn": "f-value for minimum auxiliary power (`constraint equation 40`, `iteration variable 64`)", "favail": "F-value for minimum availability (`constraint equation 61`)", @@ -12653,10 +12651,6 @@ "lb": 0.0, "ub": 1.0 }, - "farc4tf": { - "lb": 0.0, - "ub": 1.0 - }, "fauxbop": { "lb": 0.0, "ub": 1.0 @@ -20073,7 +20067,6 @@ "dcondins", "dhecoil", "estotftgj", - "farc4tf", "b_crit_upper_nbti", "t_crit_nbti", "max_force_density", @@ -20754,7 +20747,6 @@ "f_w": "real_variable", "factor": "real_variable", "falpha": "real_variable", - "farc4tf": "real_variable", "fauxbop": "real_variable", "fauxmn": "real_variable", "favail": "real_variable", From 0c008b10867eb21b589934747b432ddc6fab4e03 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 14:57:47 +0000 Subject: [PATCH 10/16] impvar marked as obsolete --- process/io/obsolete_vars.py | 1 + source/fortran/impurity_radiation.f90 | 7 +------ source/fortran/input.f90 | 5 +---- source/fortran/iteration_variables.f90 | 6 ++---- source/fortran/physics.f90 | 2 +- source/fortran/scan.f90 | 2 +- tests/integration/ref_dicts.json | 8 ++------ 7 files changed, 9 insertions(+), 22 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index b89fc0e89c..33700bbde0 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -90,4 +90,5 @@ "fmstf": None, "quench_detection_ef": None, "farc4tf": None, + "impvar": None, } diff --git a/source/fortran/impurity_radiation.f90 b/source/fortran/impurity_radiation.f90 index cfd1d77698..3f9e9f9992 100644 --- a/source/fortran/impurity_radiation.f90 +++ b/source/fortran/impurity_radiation.f90 @@ -42,7 +42,7 @@ module impurity_radiation_module !! fimp(nimp) /1.0,0.1,0.02,0.0,0.0,0.0,0.0,0.0,0.0016,0.0,0.0,0.0,0.0,0.0/ : !! impurity number density fractions relative to electron density - !! (iteration variable 102 is fimp(impvar)) + !! real(dp), public, dimension(nimp) :: fimp character*2, public, dimension(nimp) :: imp_label @@ -67,10 +67,6 @@ module impurity_radiation_module ! Deprecated real(dp), public :: fimpvar - !! impvar : impurity to be iterated (deprecated) - !! variable number 102 is turned on - integer, public :: impvar - ! Declare impurity data type ! type :: imp_dat @@ -142,7 +138,6 @@ subroutine init_impurity_radiation_module 'Xe', & 'W_'/) fimpvar = 1.0D-3 - impvar = 9 toolow = .false. impurity_arr_Label = " " impurity_arr_Z = 0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 4a8fdeac2d..423ba4feb7 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -292,7 +292,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fburn, fwdzu, etave, v3dr, uctarg, shdzl, ucflib, v3dzl, v1dzu, v2dzl, & chdzl, chrad, cdriv1, tgain, somtdr, v2matf, rrmax, bldr, frrmax, & blmatf, ife - use impurity_radiation_module, only: coreradius, nimp, impvar, fimpvar, & + use impurity_radiation_module, only: coreradius, nimp, fimpvar, & coreradiationfraction, fimp use numerics, only: factor, boundl, minmax, neqns, nvar, epsfcn, ixc, & epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc @@ -696,9 +696,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('ilhthresh') call parse_int_variable('ilhthresh', ilhthresh, 1, 21, & 'Switch for L-H power threshold to enforce') - case ('impvar') - call parse_int_variable('impvar', impvar, 3, nimp, & - 'Index for impurity fraction iteration variable') write(outfile,*) 'impvar is now deprecated - use iteration variables 125-136 instead.' case ('ipedestal') call parse_int_variable('ipedestal', ipedestal, 0, 1, & diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index 1d280046b0..ca46ed4068 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -2241,19 +2241,17 @@ end subroutine init_itv_102 real(kind(1.d0)) function itv_102() use impurity_radiation_module, only: impurity_arr_frac - use impurity_radiation_module, only: impvar implicit none - itv_102 = impurity_arr_frac(impvar) + itv_102 = impurity_arr_frac(2) end function itv_102 subroutine set_itv_102(ratio) use impurity_radiation_module, only: impurity_arr_frac - use impurity_radiation_module, only: impvar use impurity_radiation_module, only: fimpvar implicit none real(kind(1.d0)) :: ratio fimpvar = ratio - impurity_arr_frac(impvar) = fimpvar + impurity_arr_frac(2) = fimpvar end subroutine set_itv_102 !--------------------------------- diff --git a/source/fortran/physics.f90 b/source/fortran/physics.f90 index 80aa177bbd..c69a2f7164 100644 --- a/source/fortran/physics.f90 +++ b/source/fortran/physics.f90 @@ -3500,7 +3500,7 @@ subroutine outplas(outfile) call ovarre(outfile,'Average mass of all ions (amu)','(aion)',aion, 'OP ') ! MDK Say which impurity is varied, if iteration variable fimpvar (102) is turned on !if (any(ixc == 102)) then - ! call ovarst(outfile,'Impurity used as an iteration variable' , '', '"' // impurity_arr(impvar)%label // '"') + ! call ovarst(outfile,'Impurity used as an iteration variable' , '', '"' // %label // '"') ! call ovarre(outfile,'Fractional density of variable impurity (ion / electron density)','(fimpvar)',fimpvar) !end if call oblnkl(outfile) diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index 1a8f23fcc5..e35aeb8285 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -737,7 +737,7 @@ subroutine scan_select(nwp, swp, iscn, vlab, xlab) vlab = 'coreradius' ; xlab = 'Core_radius' case (30) fimpvar = swp(iscn) - ! impurity_arr(impvar)%frac = fimpvar + ! impurity_arr()%frac = fimpvar vlab = 'fimpvar' ; xlab = 'Impurity_fraction' case (31) taulimit = swp(iscn) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 7cc2d7ebbb..e5507c5516 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2601,7 +2601,6 @@ 5.0 ], "impuritypowerlost": null, - "impvar": 9.0, "impvardiv": 9.0, "infile": 0.0, "info": null, @@ -9276,7 +9275,7 @@ "coppera_m2_max": "Maximum TF coil current / copper area (A/m2)", "copperaoh_m2": "CS coil current / copper area (A/m2) (`sweep variable 61`)", "copperaoh_m2_max": "Maximum CS coil current / copper area (A/m2)", - "coreradiationfraction": "coreradiationfraction /1.0/ : fraction of radiation from 'core' region that is subtracted from the loss power\nfimp(nimp) /1.0,0.1,0.02,0.0,0.0,0.0,0.0,0.0,0.0016,0.0,0.0,0.0,0.0,0.0/ :\n impurity number density fractions relative to electron density\n (iteration variable 102 is fimp(impvar))", + "coreradiationfraction": "coreradiationfraction /1.0/ : fraction of radiation from 'core' region that is subtracted from the loss power\nfimp(nimp) /1.0,0.1,0.02,0.0,0.0,0.0,0.0,0.0,0.0016,0.0,0.0,0.0,0.0,0.0/ :\n impurity number density fractions relative to electron density\n)", "coreradius": "coreradius /0.6/ : normalised radius defining the 'core' region", "cost_factor_bop": "cost scaling factor for energy conversion system", "cost_factor_buildings": "cost scaling factor for buildings", @@ -9949,7 +9948,7 @@ "ilw_storage_w": "ILW waste storage building length, width, height (m)", "im": "", "imod": "", - "imp_label": "imp_label(nimp) : impurity ion species names:
    \n \n
  • ( 1) Hydrogen (fraction calculated by code)\n
  • ( 2) Helium\n
  • ( 3) Beryllium\n
  • ( 4) Carbon\n
  • ( 5) Nitrogen\n
  • ( 6) Oxygen\n
  • ( 7) Neon\n
  • ( 8) Silicon\n
  • ( 9) Argon\n
  • (10) Iron\n
  • (11) Nickel\n
  • (12) Krypton\n
  • (13) Xenon\n
  • (14) Tungsten
\n\n fimpvar /1.0e-3/ : impurity fraction to be used as fimp(impvar)\n (iteration variable 102)\n\n\n", + "imp_label": "imp_label(nimp) : impurity ion species names:
    \n \n
  • ( 1) Hydrogen (fraction calculated by code)\n
  • ( 2) Helium\n
  • ( 3) Beryllium\n
  • ( 4) Carbon\n
  • ( 5) Nitrogen\n
  • ( 6) Oxygen\n
  • ( 7) Neon\n
  • ( 8) Silicon\n
  • ( 9) Argon\n
  • (10) Iron\n
  • (11) Nickel\n
  • (12) Krypton\n
  • (13) Xenon\n
  • (14) Tungsten
\n\n\n", "impurities_present": "", "impurity_arr_Label": "", "impurity_arr_Lz_Wm3": "", @@ -9963,7 +9962,6 @@ "impurity_data": "", "impurity_enrichment": "Ratio of each impurity concentration in SOL to confined plasma + the enrichment for Argon\n is also propagated for PLASMOD (`ipedestal=3`)", "impuritypowerlost": "Power lost due to impurity radiation [W]", - "impvar": "", "impvardiv": "Index of impurity to be iterated for Reinke divertor detachment criterion", "infile": "", "info": "", @@ -18798,7 +18796,6 @@ "fimp", "imp_label", "fimpvar", - "impvar", "all_array_hotfix_len", "impurity_arr_Label", "impurity_arr_Z", @@ -20990,7 +20987,6 @@ "ilw_storage_l": "real_variable", "ilw_storage_w": "real_variable", "impurity_enrichment": "real_array", - "impvar": "int_variable", "impvardiv": "int_variable", "initialpressure": "real_variable", "inlet_temp": "real_variable", From d35cf52374a4b173c00a4ab43dc8b0f595850061 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 15:17:29 +0000 Subject: [PATCH 11/16] fimpvar marked as obsolete --- process/io/obsolete_vars.py | 1 + process/io/plot_scans.py | 2 +- process/io/process_config.py | 2 +- scripts/create_dicts_config.py | 2 +- source/fortran/impurity_radiation.f90 | 6 ------ source/fortran/initial.f90 | 3 +-- source/fortran/input.f90 | 5 +---- source/fortran/iteration_variables.f90 | 28 +++--------------------- source/fortran/numerics.f90 | 2 +- source/fortran/physics.f90 | 5 ----- source/fortran/scan.f90 | 11 +++++----- tests/integration/ref_dicts.json | 30 +++----------------------- 12 files changed, 18 insertions(+), 79 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 33700bbde0..9c702c7f5d 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -91,4 +91,5 @@ "quench_detection_ef": None, "farc4tf": None, "impvar": None, + "fimpvar": None, } diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py index 36425a9eec..9dacb4dfb2 100644 --- a/process/io/plot_scans.py +++ b/process/io/plot_scans.py @@ -346,7 +346,7 @@ def main(args=None): nsweep_dict[27] = "tbrmin" nsweep_dict[28] = "bt" nsweep_dict[29] = "coreradius" - nsweep_dict[30] = "fimpvar" + nsweep_dict[30] = "fimpvar" # OBSOLETE nsweep_dict[31] = "taulimit" nsweep_dict[32] = "epsvmc" nsweep_dict[33] = "ttarget" diff --git a/process/io/process_config.py b/process/io/process_config.py index 7e0b63c888..2ce7bbfe41 100755 --- a/process/io/process_config.py +++ b/process/io/process_config.py @@ -769,7 +769,7 @@ def __init__(self, configfilename="config_evaluate_uncertainties.json"): if "bound" in varname: del_list += [varname] add_bounds = True - elif "fimp(" in varname: # fimpvar also exists! + elif "fimp(" in varname: # has different format in MFILE!! fimpno = int(varname.split("(")[1].split(")")[0]) self.output_vars[i] = "fimp({:02}".format(fimpno) diff --git a/scripts/create_dicts_config.py b/scripts/create_dicts_config.py index 1c44d9dddc..2a621b6bfa 100644 --- a/scripts/create_dicts_config.py +++ b/scripts/create_dicts_config.py @@ -16,7 +16,7 @@ ] # parameters that start with f, but are not f-values -NON_F_VALUES = ["fcohbop", "fvsbrnni", "feffcd", "fcutfsu", "fimpvar"] +NON_F_VALUES = ["fcohbop", "fvsbrnni", "feffcd", "fcutfsu"] # PROCESS TF Coil types DICT_TF_TYPE = { diff --git a/source/fortran/impurity_radiation.f90 b/source/fortran/impurity_radiation.f90 index 3f9e9f9992..09815f8467 100644 --- a/source/fortran/impurity_radiation.f90 +++ b/source/fortran/impurity_radiation.f90 @@ -62,11 +62,6 @@ module impurity_radiation_module !!
  • (13) Xenon !!
  • (14) Tungsten - !! fimpvar /1.0e-3/ : impurity fraction to be used as fimp(impvar) - !! (iteration variable 102) - ! Deprecated - real(dp), public :: fimpvar - ! Declare impurity data type ! type :: imp_dat @@ -137,7 +132,6 @@ subroutine init_impurity_radiation_module 'Kr', & 'Xe', & 'W_'/) - fimpvar = 1.0D-3 toolow = .false. impurity_arr_Label = " " impurity_arr_Z = 0 diff --git a/source/fortran/initial.f90 b/source/fortran/initial.f90 index 5ebf4cfe57..5276fdbb55 100755 --- a/source/fortran/initial.f90 +++ b/source/fortran/initial.f90 @@ -24,7 +24,7 @@ subroutine initial init_itv_74, init_itv_75, init_itv_79, init_itv_81, init_itv_82, init_itv_83, & init_itv_84, init_itv_85, init_itv_86, init_itv_89, init_itv_90, init_itv_91, & init_itv_92, init_itv_93, init_itv_94, init_itv_95, init_itv_96, init_itv_97, & - init_itv_98, init_itv_102, init_itv_103, init_itv_104, init_itv_105, & + init_itv_98, init_itv_103, init_itv_104, init_itv_105, & init_itv_106, init_itv_107, init_itv_108, init_itv_109, init_itv_110, & init_itv_111, init_itv_112, init_itv_113, init_itv_114, init_itv_115, & init_itv_116, init_itv_117, init_itv_118, init_itv_119, init_itv_120, & @@ -155,7 +155,6 @@ subroutine initial call init_itv_97 call init_itv_98 !Not used - call init_itv_102 call init_itv_103 call init_itv_104 call init_itv_105 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 423ba4feb7..49ef7318fd 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -292,7 +292,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fburn, fwdzu, etave, v3dr, uctarg, shdzl, ucflib, v3dzl, v1dzu, v2dzl, & chdzl, chrad, cdriv1, tgain, somtdr, v2matf, rrmax, bldr, frrmax, & blmatf, ife - use impurity_radiation_module, only: coreradius, nimp, fimpvar, & + use impurity_radiation_module, only: coreradius, nimp, & coreradiationfraction, fimp use numerics, only: factor, boundl, minmax, neqns, nvar, epsfcn, ixc, & epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc @@ -595,9 +595,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fimp') call parse_real_array('fimp', fimp, isub1, nimp, & 'Impurity density fraction', icode) - case ('fimpvar') - call parse_real_variable('fimpvar', fimpvar, 1.0D-6, 0.5D0, & - 'Impurity fraction to be varied') case ('fkzohm') call parse_real_variable('fkzohm', fkzohm, 0.5D0, 2.0D0, & 'Zohm elongation scaling multiplier') diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index ca46ed4068..ed65fd83f8 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -2230,29 +2230,7 @@ end subroutine set_itv_98 !--------------------------------- - subroutine init_itv_102 - !!
  • (102) fimpvar - use numerics, only: lablxc, boundl, boundu - implicit none - lablxc(102) = 'fimpvar ' - boundl(102) = 1.00D-6 - boundu(102) = 0.010D0 - end subroutine init_itv_102 - - real(kind(1.d0)) function itv_102() - use impurity_radiation_module, only: impurity_arr_frac - implicit none - itv_102 = impurity_arr_frac(2) - end function itv_102 - - subroutine set_itv_102(ratio) - use impurity_radiation_module, only: impurity_arr_frac - use impurity_radiation_module, only: fimpvar - implicit none - real(kind(1.d0)) :: ratio - fimpvar = ratio - impurity_arr_frac(2) = fimpvar - end subroutine set_itv_102 + !--------------------------------- @@ -4082,7 +4060,7 @@ subroutine loadxc case (99); case (100); case (101); - case (102); xcm(i) = itv_102() + case (102); case (103); xcm(i) = itv_103() case (104); xcm(i) = itv_104() case (105); xcm(i) = itv_105() @@ -4349,7 +4327,7 @@ subroutine convxc(xc,nn) case (99); case (100); case (101); - case (102); call set_itv_102(ratio) + case (102); case (103); call set_itv_103(ratio) case (104); call set_itv_104(ratio) case (105); call set_itv_105(ratio) diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 340f040302..d69130141c 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -303,7 +303,7 @@ module numerics !!
  • (99) NOT USED !!
  • (100) NOT USED !!
  • (101) NOT USED - !!
  • (102) fimpvar + !!
  • (102) fimpvar # OBSOLETE !!
  • (103) flhthresh (f-value for equation 15) !!
  • (104) fcwr (f-value for equation 23) !!
  • (105) fnbshinef (f-value for equation 59) diff --git a/source/fortran/physics.f90 b/source/fortran/physics.f90 index c69a2f7164..c33af37688 100644 --- a/source/fortran/physics.f90 +++ b/source/fortran/physics.f90 @@ -3498,11 +3498,6 @@ subroutine outplas(outfile) end do call ovarre(outfile,'Average mass of all ions (amu)','(aion)',aion, 'OP ') - ! MDK Say which impurity is varied, if iteration variable fimpvar (102) is turned on - !if (any(ixc == 102)) then - ! call ovarst(outfile,'Impurity used as an iteration variable' , '', '"' // %label // '"') - ! call ovarre(outfile,'Fractional density of variable impurity (ion / electron density)','(fimpvar)',fimpvar) - !end if call oblnkl(outfile) call ovarrf(outfile,'Effective charge','(zeff)',zeff, 'OP ') diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index e35aeb8285..7368a26264 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -67,7 +67,7 @@ module scan_module !!
  • 27 tbrmin (for blktmodel > 0 only) !!
  • 28 bt !!
  • 29 coreradius - !!
  • 30 fimpvar + !!
  • 30 fimpvar # OBSOLETE !!
  • 31 taulimit !!
  • 32 epsvmc !!
  • 33 ttarget @@ -267,7 +267,7 @@ subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar) outvar(49,iscan) = 0.0D0 end if outvar(50,iscan) = pdivt/rmajor - !outvar(51,iscan) = fimpvar + !outvar(51,iscan) = fimpvar #OBSOLETE outvar(51,iscan) = 0.0d0 outvar(52,iscan) = pradmw outvar(53,iscan) = tpeak @@ -625,7 +625,7 @@ subroutine scan_select(nwp, swp, iscn, vlab, xlab) use error_handling, only: idiags, report_error use fwbs_variables, only: inlet_temp_liq, outlet_temp_liq, blpressure_liq, & n_liq_recirc, bz_channel_conduct_liq, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, pitch - use impurity_radiation_module, only: fimp, fimpvar, coreradius, impurity_arr_frac + use impurity_radiation_module, only: fimp, coreradius, impurity_arr_frac use physics_variables, only: kappa, dnbeta, te, aspect, ftar, bt, & rad_fraction_sol, triang, rmajor, beamfus0, hfact use numerics, only: epsvmc, boundu, boundl @@ -736,9 +736,8 @@ subroutine scan_select(nwp, swp, iscn, vlab, xlab) coreradius = swp(iscn) vlab = 'coreradius' ; xlab = 'Core_radius' case (30) - fimpvar = swp(iscn) - ! impurity_arr()%frac = fimpvar - vlab = 'fimpvar' ; xlab = 'Impurity_fraction' + !fimpvar = swp(iscn) + vlab = 'OBSOLETE' ; xlab = 'OBSOLETE' case (31) taulimit = swp(iscn) vlab = 'taulimit' ; xlab = 'Taup/taueff_lower_limit' diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e5507c5516..bffc7ee5d7 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1958,7 +1958,6 @@ 0.0, 0.0 ], - "fimpvar": 0.001, "fio": 0.0, "fiooic": 0.5, "fipir": 1.0, @@ -9654,7 +9653,6 @@ "figmer": "physics figure of merit (= plascuraspect*sbar, where `sbar=1`)", "fileprefix": "input file prefix", "fimp": "", - "fimpvar": "impvar : impurity to be iterated (deprecated)\n variable number 102 is turned on", "fio": "", "fiooic": "f-value for TF coil operating current / critical current ratio\n (`constraint equation 33`, `iteration variable 50`)", "fipir": "f-value for Ip/Irod upper limit\n constraint equation icc = 46\n iteration variable ixc = 72", @@ -10063,7 +10061,7 @@ "ksic": "power fraction for outboard double-null scrape-off plasma", "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
      \n
      \n
    • ( 1) Beta (consistency equation) (itv 5)\n
    • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
    • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
    • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
    • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
    • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
    • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
    • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
    • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
    • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
    • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
    • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
    • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
    • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
    • (15) LH power threshold limit (itv 103)\n
    • (16) Net electric power lower limit (itv 25,1,2,3)\n
    • (17) Radiation fraction upper limit (itv 28)\n
    • (18) Divertor heat load upper limit (itv 27)\n
    • (19) MVA upper limit (itv 30)\n
    • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
    • (21) Plasma minor radius lower limit (itv 32)\n
    • (22) Divertor collisionality upper limit (itv 34,43)\n
    • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
    • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
    • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
    • (26) Central solenoid EOF current density upper limit (ipfres=0)\n (itv 38,37,41,12)\n
    • (27) Central solenoid BOP current density upper limit (ipfres=0)\n (itv 39,37,41,12)\n
    • (28) Fusion gain Q lower limit (itv 45,47,40)\n
    • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
    • (30) Injection power upper limit (itv 46,47,11)\n
    • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
    • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
    • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
    • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
    • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
    • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
    • (37) Current drive gamma upper limit (itv 40,47)\n
    • (38) First wall coolant temperature rise upper limit (itv 62)\n
    • (39) First wall peak temperature upper limit (itv 63)\n
    • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
    • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
    • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
    • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
    • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
    • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
    • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
    • (47) NOT USED\n
    • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
    • (49) NOT USED\n
    • (50) IFE repetition rate upper limit (IFE)\n
    • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
    • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
    • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
    • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
    • (55) Vacuum vessel helium concentration upper limit iblanket =2 (itv 96,93,94)\n
    • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3,102)\n
    • (57) NOT USED\n
    • (58) NOT USED\n
    • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
    • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
    • (61) Minimum availability value (itv 107)\n
    • (62) taup/taueff the ratio of particle to energy confinement times (itv 110)\n
    • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
    • (64) Zeff less than or equal to zeffmax (itv 112)\n
    • (65) Dump time set by VV loads (itv 56, 113)\n
    • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(tohs), 115)\n
    • (67) Simple Radiation Wall load limit (itv 116, 102, 4,6)\n
    • (68) Psep * Bt / qAR upper limit (itv 117)\n
    • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
    • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
    • (71) ensure that neomp = separatrix density (nesep) x neratio\n
    • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
    • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
    • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
    • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
    • (76) Eich critical separatrix density\n
    • (77) TF coil current per turn upper limit\n
    • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
    • (79) Peak CS field upper limit (itv 149 fbmaxcs)\n
    • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
    • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
    • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
    • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
    • (84) Lower limit for beta (itv 173 fbetatry_lower)\n
    • (85) Constraint for CP lifetime\n
    • (86) Constraint for TF coil turn dimension\n
    • (87) Constraint for cryogenic power\n
    • (88) Constraint for TF coil strain absolute value\n
    • (89) Constraint for CS coil quench protection\n
    • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
    \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
      \n
      \n
    • ( 1) major radius\n
    • ( 2) not used\n
    • ( 3) neutron wall load\n
    • ( 4) P_tf + P_pf\n
    • ( 5) fusion gain Q\n
    • ( 6) cost of electricity\n
    • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
    • ( 8) aspect ratio\n
    • ( 9) divertor heat load\n
    • (10) toroidal field\n
    • (11) total injected power\n
    • (12) hydrogen plant capital cost OBSOLETE\n
    • (13) hydrogen production rate OBSOLETE\n
    • (14) pulse length\n
    • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
    • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
    • (17) net electrical output\n
    • (18) Null Figure of Merit\n
    • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
    \n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
      \n
      \n
    • ( 1) aspect\n
    • ( 2) bt\n
    • ( 3) rmajor\n
    • ( 4) te\n
    • ( 5) beta\n
    • ( 6) dene\n
    • ( 7) rnbeam\n
    • ( 8) fbeta (f-value for equation 6)\n
    • ( 9) fdene (f-value for equation 5)\n
    • (10) hfact\n
    • (11) pheat\n
    • (12) oacdcp\n
    • (13) tfcth (NOT RECOMMENDED)\n
    • (14) fwalld (f-value for equation 8)\n
    • (15) fvs (f-value for equation 12)\n
    • (16) ohcth\n
    • (17) tdwell\n
    • (18) q\n
    • (19) enbeam\n
    • (20) tcpav\n
    • (21) ftburn (f-value for equation 13)\n
    • (22) NOT USED\n
    • (23) fcoolcp\n
    • (24) NOT USED\n
    • (25) fpnetel (f-value for equation 16)\n
    • (26) ffuspow (f-value for equation 9)\n
    • (27) fhldiv (f-value for equation 18)\n
    • (28) fradpwr (f-value for equation 17), total radiation fraction\n
    • (29) bore\n
    • (30) fmva (f-value for equation 19)\n
    • (31) gapomin\n
    • (32) frminor (f-value for equation 21)\n
    • (33) fportsz (f-value for equation 20)\n
    • (34) fdivcol (f-value for equation 22)\n
    • (35) fpeakb (f-value for equation 25)\n
    • (36) fbetatry (f-value for equation 24)\n
    • (37) coheof\n
    • (38) fjohc (f-value for equation 26)\n
    • (39) fjohc0 (f-value for equation 27)\n
    • (40) fgamcd (f-value for equation 37)\n
    • (41) fcohbop\n
    • (42) gapoh\n
    • (43) NOT USED\n
    • (44) fvsbrnni\n
    • (45) fqval (f-value for equation 28)\n
    • (46) fpinj (f-value for equation 30)\n
    • (47) feffcd\n
    • (48) fstrcase (f-value for equation 31)\n
    • (49) fstrcond (f-value for equation 32)\n
    • (50) fiooic (f-value for equation 33)\n
    • (51) fvdump (f-value for equation 34)\n
    • (52) vdalw\n
    • (53) fjprot (f-value for equation 35)\n
    • (54) ftmargtf (f-value for equation 36)\n
    • (55) NOT USED\n
    • (56) tdmptf\n
    • (57) thkcas\n
    • (58) thwcndut\n
    • (59) fcutfsu\n
    • (60) cpttf\n
    • (61) gapds\n
    • (62) fdtmp (f-value for equation 38)\n
    • (63) ftpeak (f-value for equation 39)\n
    • (64) fauxmn (f-value for equation 40)\n
    • (65) tohs\n
    • (66) ftohs (f-value for equation 41)\n
    • (67) ftcycl (f-value for equation 42)\n
    • (68) fptemp (f-value for equation 44)\n
    • (69) rcool\n
    • (70) vcool\n
    • (71) fq (f-value for equation 45)\n
    • (72) fipir (f-value for equation 46)\n
    • (73) scrapli\n
    • (74) scraplo\n
    • (75) tfootfi\n
    • (76) NOT USED\n
    • (77) NOT USED\n
    • (78) NOT USED\n
    • (79) fbetap (f-value for equation 48)\n
    • (80) NOT USED\n
    • (81) edrive\n
    • (82) drveff\n
    • (83) tgain\n
    • (84) chrad\n
    • (85) pdrive\n
    • (86) frrmax (f-value for equation 50)\n
    • (87) NOT USED\n
    • (88) NOT USED\n
    • (89) ftbr (f-value for equation 52)\n
    • (90) blbuith\n
    • (91) blbuoth\n
    • (92) fflutf (f-value for equation 53)\n
    • (93) shldith\n
    • (94) shldoth\n
    • (95) fptfnuc (f-value for equation 54)\n
    • (96) fvvhe (f-value for equation 55)\n
    • (97) fpsepr (f-value for equation 56)\n
    • (98) li6enrich\n
    • (99) NOT USED\n
    • (100) NOT USED\n
    • (101) NOT USED\n
    • (102) fimpvar\n
    • (103) flhthresh (f-value for equation 15)\n
    • (104) fcwr (f-value for equation 23)\n
    • (105) fnbshinef (f-value for equation 59)\n
    • (106) ftmargoh (f-value for equation 60)\n
    • (107) favail (f-value for equation 61)\n
    • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
    • (109) ralpne: thermal alpha density / electron density\n
    • (110) ftaulimit: Lower limit on taup/taueff the ratio of alpha\n
    • (111) fniterpump: f-value for constraint that number\n
    • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
    • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
    • (114) fw_channel_length: Length of a single first wall channel\n
    • (115) fpoloidalpower: f-value for max rate of change of\n
    • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
    • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
    • (118) fpsep: f-value to ensure separatrix power is less than\n
    • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
    • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
    • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
    • (122) oh_steel_frac : streel fraction of Central Solenoid\n
    • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
    • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
    • (125) fimp(3) : Beryllium density fraction relative to electron density\n
    • (126) fimp(4) : Carbon density fraction relative to electron density\n
    • (127) fimp(5) : Nitrogen fraction relative to electron density\n
    • (128) fimp(6) : Oxygen density fraction relative to electron density\n
    • (129) fimp(7) : Neon density fraction relative to electron density\n
    • (130) fimp(8) : Silicon density fraction relative to electron density\n
    • (131) fimp(9) : Argon density fraction relative to electron density\n
    • (132) fimp(10) : Iron density fraction relative to electron density\n
    • (133) fimp(11) : Nickel density fraction relative to electron density\n
    • (134) fimp(12) : Krypton density fraction relative to electron density\n
    • (135) fimp(13) : Xenon density fraction relative to electron density\n
    • (136) fimp(14) : Tungsten density fraction relative to electron density\n
    • (137) fplhsep (f-value for equation 73)\n
    • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
    • (139) copper_thick : thickness of copper layer in tape (m)\n
    • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
    • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
    • (142) nesep : electron density at separatrix [m-3]\n
    • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
    • (144) fnesep : Eich critical electron density at separatrix\n
    • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
    • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
    • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
    • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
    • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
    • (150) plasmod_fcdp : (P_CD - Pheat)/(Pmax-Pheat)\n
    • (151) plasmod_fradc : Pline_Xe / (Palpha + Paux - PlineAr - Psync - Pbrad)\n
    • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
    • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
    • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
    • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
    • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
    • (157) fvssu : F-value for available to required start up flux (con. 51)\n
    • (158) croco_thick : Thickness of CroCo copper tube (m)\n
    • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
    • (160) f_avspace (f-value for equation 83)\n
    • (161) fbetatry_lower (f-value for equation 84)\n
    • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
    • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
    • (164) f_crypmw : f-value for cryogenic plant power\n
    • (165) fstr_wp : f-value for TF coil strain absolute value\n
    • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
    • (167) fecrh_ignition: f-value for equation 90\n
    • (168) EMPTY : Description\n
    • (169) EMPTY : Description\n
    • (170) EMPTY : Description\n
    • (171) EMPTY : Description\n
    • (172) EMPTY : Description\n
    • (173) EMPTY : Description\n
    • (174) EMPTY : Description\n
    • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
        \n
        \n
      • ( 1) aspect\n
      • ( 2) bt\n
      • ( 3) rmajor\n
      • ( 4) te\n
      • ( 5) beta\n
      • ( 6) dene\n
      • ( 7) rnbeam\n
      • ( 8) fbeta (f-value for equation 6)\n
      • ( 9) fdene (f-value for equation 5)\n
      • (10) hfact\n
      • (11) pheat\n
      • (12) oacdcp\n
      • (13) tfcth (NOT RECOMMENDED)\n
      • (14) fwalld (f-value for equation 8)\n
      • (15) fvs (f-value for equation 12)\n
      • (16) ohcth\n
      • (17) tdwell\n
      • (18) q\n
      • (19) enbeam\n
      • (20) tcpav\n
      • (21) ftburn (f-value for equation 13)\n
      • (22) NOT USED\n
      • (23) fcoolcp\n
      • (24) NOT USED\n
      • (25) fpnetel (f-value for equation 16)\n
      • (26) ffuspow (f-value for equation 9)\n
      • (27) fhldiv (f-value for equation 18)\n
      • (28) fradpwr (f-value for equation 17), total radiation fraction\n
      • (29) bore\n
      • (30) fmva (f-value for equation 19)\n
      • (31) gapomin\n
      • (32) frminor (f-value for equation 21)\n
      • (33) fportsz (f-value for equation 20)\n
      • (34) fdivcol (f-value for equation 22)\n
      • (35) fpeakb (f-value for equation 25)\n
      • (36) fbetatry (f-value for equation 24)\n
      • (37) coheof\n
      • (38) fjohc (f-value for equation 26)\n
      • (39) fjohc0 (f-value for equation 27)\n
      • (40) fgamcd (f-value for equation 37)\n
      • (41) fcohbop\n
      • (42) gapoh\n
      • (43) NOT USED\n
      • (44) fvsbrnni\n
      • (45) fqval (f-value for equation 28)\n
      • (46) fpinj (f-value for equation 30)\n
      • (47) feffcd\n
      • (48) fstrcase (f-value for equation 31)\n
      • (49) fstrcond (f-value for equation 32)\n
      • (50) fiooic (f-value for equation 33)\n
      • (51) fvdump (f-value for equation 34)\n
      • (52) vdalw\n
      • (53) fjprot (f-value for equation 35)\n
      • (54) ftmargtf (f-value for equation 36)\n
      • (55) NOT USED\n
      • (56) tdmptf\n
      • (57) thkcas\n
      • (58) thwcndut\n
      • (59) fcutfsu\n
      • (60) cpttf\n
      • (61) gapds\n
      • (62) fdtmp (f-value for equation 38)\n
      • (63) ftpeak (f-value for equation 39)\n
      • (64) fauxmn (f-value for equation 40)\n
      • (65) tohs\n
      • (66) ftohs (f-value for equation 41)\n
      • (67) ftcycl (f-value for equation 42)\n
      • (68) fptemp (f-value for equation 44)\n
      • (69) rcool\n
      • (70) vcool\n
      • (71) fq (f-value for equation 45)\n
      • (72) fipir (f-value for equation 46)\n
      • (73) scrapli\n
      • (74) scraplo\n
      • (75) tfootfi\n
      • (76) NOT USED\n
      • (77) NOT USED\n
      • (78) NOT USED\n
      • (79) fbetap (f-value for equation 48)\n
      • (80) NOT USED\n
      • (81) edrive\n
      • (82) drveff\n
      • (83) tgain\n
      • (84) chrad\n
      • (85) pdrive\n
      • (86) frrmax (f-value for equation 50)\n
      • (87) NOT USED\n
      • (88) NOT USED\n
      • (89) ftbr (f-value for equation 52)\n
      • (90) blbuith\n
      • (91) blbuoth\n
      • (92) fflutf (f-value for equation 53)\n
      • (93) shldith\n
      • (94) shldoth\n
      • (95) fptfnuc (f-value for equation 54)\n
      • (96) fvvhe (f-value for equation 55)\n
      • (97) fpsepr (f-value for equation 56)\n
      • (98) li6enrich\n
      • (99) NOT USED\n
      • (100) NOT USED\n
      • (101) NOT USED\n
      • (103) flhthresh (f-value for equation 15)\n
      • (104) fcwr (f-value for equation 23)\n
      • (105) fnbshinef (f-value for equation 59)\n
      • (106) ftmargoh (f-value for equation 60)\n
      • (107) favail (f-value for equation 61)\n
      • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
      • (109) ralpne: thermal alpha density / electron density\n
      • (110) ftaulimit: Lower limit on taup/taueff the ratio of alpha\n
      • (111) fniterpump: f-value for constraint that number\n
      • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
      • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
      • (114) fw_channel_length: Length of a single first wall channel\n
      • (115) fpoloidalpower: f-value for max rate of change of\n
      • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
      • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
      • (118) fpsep: f-value to ensure separatrix power is less than\n
      • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
      • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
      • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
      • (122) oh_steel_frac : streel fraction of Central Solenoid\n
      • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
      • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
      • (125) fimp(3) : Beryllium density fraction relative to electron density\n
      • (126) fimp(4) : Carbon density fraction relative to electron density\n
      • (127) fimp(5) : Nitrogen fraction relative to electron density\n
      • (128) fimp(6) : Oxygen density fraction relative to electron density\n
      • (129) fimp(7) : Neon density fraction relative to electron density\n
      • (130) fimp(8) : Silicon density fraction relative to electron density\n
      • (131) fimp(9) : Argon density fraction relative to electron density\n
      • (132) fimp(10) : Iron density fraction relative to electron density\n
      • (133) fimp(11) : Nickel density fraction relative to electron density\n
      • (134) fimp(12) : Krypton density fraction relative to electron density\n
      • (135) fimp(13) : Xenon density fraction relative to electron density\n
      • (136) fimp(14) : Tungsten density fraction relative to electron density\n
      • (137) fplhsep (f-value for equation 73)\n
      • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
      • (139) copper_thick : thickness of copper layer in tape (m)\n
      • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
      • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
      • (142) nesep : electron density at separatrix [m-3]\n
      • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
      • (144) fnesep : Eich critical electron density at separatrix\n
      • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
      • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
      • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
      • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
      • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
      • (150) plasmod_fcdp : (P_CD - Pheat)/(Pmax-Pheat)\n
      • (151) plasmod_fradc : Pline_Xe / (Palpha + Paux - PlineAr - Psync - Pbrad)\n
      • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
      • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
      • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
      • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
      • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
      • (157) fvssu : F-value for available to required start up flux (con. 51)\n
      • (158) croco_thick : Thickness of CroCo copper tube (m)\n
      • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
      • (160) f_avspace (f-value for equation 83)\n
      • (161) fbetatry_lower (f-value for equation 84)\n
      • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
      • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
      • (164) f_crypmw : f-value for cryogenic plant power\n
      • (165) fstr_wp : f-value for TF coil strain absolute value\n
      • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
      • (167) fecrh_ignition: f-value for equation 90\n
      • (168) EMPTY : Description\n
      • (169) EMPTY : Description\n
      • (170) EMPTY : Description\n
      • (171) EMPTY : Description\n
      • (172) EMPTY : Description\n
      • (173) EMPTY : Description\n
      • (174) EMPTY : Description\n
      • (175) EMPTY : Description\n\n\n\n", "lambda_EU": "Decay length in EUROFER [cm]", "lambda_He_VV": "Decay length [cm]", "lambda_n_BZ_IB": "Decay length in IB BZ [cm]", @@ -10301,7 +10299,7 @@ "nre": "", "nsix": "", "nsixi": "", - "nsweep": "Switch denoting quantity to scan:
          \n
        • 1 aspect\n
        • 2 hldivlim\n
        • 3 pnetelin\n
        • 4 hfact\n
        • 5 oacdcp\n
        • 6 walalw\n
        • 7 beamfus0\n
        • 8 fqval\n
        • 9 te\n
        • 10 boundu(15: fvs)\n
        • 11 dnbeta\n
        • 12 bscfmax (use negative values only)\n
        • 13 boundu(10: hfact)\n
        • 14 fiooic\n
        • 15 fjprot\n
        • 16 rmajor\n
        • 17 bmxlim\n
        • 18 gammax\n
        • 19 boundl(16: ohcth)\n
        • 20 tbrnmn\n
        • 21 not used\n
        • 22 cfactr (N.B. requires iavail=0)\n
        • 23 boundu(72: fipir)\n
        • 24 powfmax\n
        • 25 kappa\n
        • 26 triang\n
        • 27 tbrmin (for blktmodel > 0 only)\n
        • 28 bt\n
        • 29 coreradius\n
        • 30 fimpvar\n
        • 31 taulimit\n
        • 32 epsvmc\n
        • 33 ttarget\n
        • 34 qtargettotal\n
        • 35 lambda_q_omp\n
        • 36 lambda_target\n
        • 37 lcon_factor\n
        • 38 Neon upper limit\n
        • 39 Argon upper limit\n
        • 40 Xenon upper limit\n
        • 41 blnkoth\n
        • 42 Argon fraction fimp(9)\n
        • 43 normalised minor radius at which electron cyclotron current drive is maximum\n
        • 44 Allowable maximum shear stress (Tresca) in tf coil structural material\n
        • 45 Minimum allowable temperature margin ; tf coils\n
        • 46 boundu(150) fgwsep\n
        • 47 impurity_enrichment(9) Argon impurity enrichment\n
        • 48 TF coil - n_pancake (integer turn winding pack)\n
        • 49 TF coil - n_layer (integer turn winding pack)\n
        • 50 Xenon fraction fimp(13)\n
        • 51 Power fraction to lower DN Divertor ftar\n
        • 52 SoL radiation fraction\n
        • 54 GL_nbti upper critical field at 0 Kelvin\n
        • 55 `shldith` : Inboard neutron shield thickness\n
        • 56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n
        • 57 `bt` lower boundary\n
        • 58 `scrapli` : Inboard plasma-first wall gap\n
        • 59 `scraplo` : Outboard plasma-first wall gap\n
        • 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n
        • 61 copperaoh_m2_max : CS coil current / copper area\n
        • 62 coheof : CS coil current density at EOF\n
        • 63 ohcth : CS thickness (m)\n
        • 64 ohhghf : CS height (m)
        ", + "nsweep": "Switch denoting quantity to scan:
          \n
        • 1 aspect\n
        • 2 hldivlim\n
        • 3 pnetelin\n
        • 4 hfact\n
        • 5 oacdcp\n
        • 6 walalw\n
        • 7 beamfus0\n
        • 8 fqval\n
        • 9 te\n
        • 10 boundu(15: fvs)\n
        • 11 dnbeta\n
        • 12 bscfmax (use negative values only)\n
        • 13 boundu(10: hfact)\n
        • 14 fiooic\n
        • 15 fjprot\n
        • 16 rmajor\n
        • 17 bmxlim\n
        • 18 gammax\n
        • 19 boundl(16: ohcth)\n
        • 20 tbrnmn\n
        • 21 not used\n
        • 22 cfactr (N.B. requires iavail=0)\n
        • 23 boundu(72: fipir)\n
        • 24 powfmax\n
        • 25 kappa\n
        • 26 triang\n
        • 27 tbrmin (for blktmodel > 0 only)\n
        • 28 bt\n
        • 29 coreradius\n
        • 31 taulimit\n
        • 32 epsvmc\n
        • 33 ttarget\n
        • 34 qtargettotal\n
        • 35 lambda_q_omp\n
        • 36 lambda_target\n
        • 37 lcon_factor\n
        • 38 Neon upper limit\n
        • 39 Argon upper limit\n
        • 40 Xenon upper limit\n
        • 41 blnkoth\n
        • 42 Argon fraction fimp(9)\n
        • 43 normalised minor radius at which electron cyclotron current drive is maximum\n
        • 44 Allowable maximum shear stress (Tresca) in tf coil structural material\n
        • 45 Minimum allowable temperature margin ; tf coils\n
        • 46 boundu(150) fgwsep\n
        • 47 impurity_enrichment(9) Argon impurity enrichment\n
        • 48 TF coil - n_pancake (integer turn winding pack)\n
        • 49 TF coil - n_layer (integer turn winding pack)\n
        • 50 Xenon fraction fimp(13)\n
        • 51 Power fraction to lower DN Divertor ftar\n
        • 52 SoL radiation fraction\n
        • 54 GL_nbti upper critical field at 0 Kelvin\n
        • 55 `shldith` : Inboard neutron shield thickness\n
        • 56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n
        • 57 `bt` lower boundary\n
        • 58 `scrapli` : Inboard plasma-first wall gap\n
        • 59 `scraplo` : Outboard plasma-first wall gap\n
        • 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n
        • 61 copperaoh_m2_max : CS coil current / copper area\n
        • 62 coheof : CS coil current density at EOF\n
        • 63 ohcth : CS thickness (m)\n
        • 64 ohhghf : CS height (m)
        ", "nsweep_2": "nsweep_2 /3/ : switch denoting quantity to scan for 2D scan:", "nt": "", "ntype": "switch for vacuum pump type:\n
          \n
        • =0 - for turbomolecular pump (magnetic bearing) with speed of 2.0 m3/s\n (1.95 for N2, 1.8 for He, 1.8 for DT)
          • \n
        • =1 - for compound cryopump with nominal speed of 10.0 m3/s\n (9.0 for N2, 5.0 for He and 25.0 for DT)
          • \n
        ", @@ -12885,10 +12883,6 @@ "lb": 1e-06, "ub": 1.0 }, - "fimpvar": { - "lb": 1e-06, - "ub": 0.5 - }, "fiooic": { "lb": 0.001, "ub": 10.0 @@ -15469,7 +15463,6 @@ "DICT_IXC2NSWEEP": { "1": "1", "10": "4", - "102": "30", "12": "5", "120": "33", "124": "34", @@ -15723,10 +15716,6 @@ "lb": 1e-08, "ub": 0.01 }, - "fimpvar": { - "lb": 1e-06, - "ub": 0.01 - }, "fiooic": { "lb": 0.001, "ub": 1.0 @@ -16160,7 +16149,6 @@ "fgwped": 0.85, "fgwsep": 0.5, "fhldiv": 1.0, - "fimpvar": 0.001, "fiooic": 0.5, "fipir": 1.0, "fjohc": 1.0, @@ -16269,11 +16257,6 @@ "name": "hfact", "ub": 3.0 }, - "102": { - "lb": 1e-06, - "name": "fimpvar", - "ub": 0.01 - }, "103": { "lb": 1.0, "name": "flhthresh", @@ -17073,7 +17056,6 @@ "DICT_IXC_SIMPLE": { "1": "aspect", "10": "hfact", - "102": "fimpvar", "103": "flhthresh", "104": "fcwr", "105": "fnbshinef", @@ -17294,7 +17276,6 @@ "fimp(12)": "134", "fimp(13)": "135", "fimp(14)": "136", - "fimpvar": "102", "fiooic": "50", "fipir": "72", "fjohc": "38", @@ -18795,7 +18776,6 @@ "coreradiationfraction", "fimp", "imp_label", - "fimpvar", "all_array_hotfix_len", "impurity_arr_Label", "impurity_arr_Z", @@ -20391,7 +20371,6 @@ "15": "53", "16": "3", "28": "2", - "30": "102", "33": "120", "34": "124", "4": "10", @@ -20429,7 +20408,6 @@ "28": "bt", "29": "coreradius", "3": "pnetelin", - "30": "fimpvar", "31": "taulimit", "32": "epsvmc", "33": "ttarget", @@ -20804,7 +20782,6 @@ "fhts": "real_variable", "fififi": "real_variable", "fimp": "real_array", - "fimpvar": "real_variable", "fiooic": "real_variable", "fipir": "real_variable", "fjohc": "real_variable", @@ -21496,8 +21473,7 @@ "fcohbop", "fvsbrnni", "feffcd", - "fcutfsu", - "fimpvar" + "fcutfsu" ], "PARAMETER_DEFAULTS": [ "rmajor", From 8267041ea23f36b470511d68d1273feed04a7acd Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 5 Dec 2023 15:40:15 +0000 Subject: [PATCH 12/16] integration test removal of fimpvar and impvar --- .../proc-pages/physics-models/error.txt | 6 +--- .../proc-pages/physics-models/plasma.md | 5 +-- process/io/plot_radial_build.py | 1 - process/io/plot_scans.py | 2 +- source/fortran/numerics.f90 | 4 +-- source/fortran/scan.f90 | 4 +-- tests/integration/data/ref_IN.DAT | 4 --- tests/integration/data/scan_MFILE.DAT | 31 ------------------- .../data/uncertainties_nonopt_ref_IN.DAT | 4 --- .../integration/data/uncertainties_ref_IN.DAT | 4 --- tests/integration/ref_dicts.json | 2 +- 11 files changed, 8 insertions(+), 59 deletions(-) diff --git a/documentation/proc-pages/physics-models/error.txt b/documentation/proc-pages/physics-models/error.txt index f06db71109..2f9529e681 100644 --- a/documentation/proc-pages/physics-models/error.txt +++ b/documentation/proc-pages/physics-models/error.txt @@ -504,11 +504,7 @@ account the fuel ratios \texttt{fdeut}, \texttt{ftrit} and be input by the user. The impurity fraction of one of the elements listed in array -\texttt{fimp} may be used as an iteration variable. The element to use -is specified using input parameter \texttt{impvar}, which may be set to -a value between 3 and \texttt{nimp}, and the initial estimate to use for -the element's impurity fraction must be set using iteration variable no. -102 (\texttt{fimpvar}). +\texttt{fimp} may be used as an iteration variable. The synchrotron radiation power\footnote{Albajar, Nuclear Fusion \textbf{41} (2001) 665} \footnote{Fidone, Giruzzi and Granata, Nuclear diff --git a/documentation/proc-pages/physics-models/plasma.md b/documentation/proc-pages/physics-models/plasma.md index 44344df1ec..7cb2f28a5b 100644 --- a/documentation/proc-pages/physics-models/plasma.md +++ b/documentation/proc-pages/physics-models/plasma.md @@ -378,10 +378,7 @@ plasma quasi-neutrality taking into account the fuel ratios be input by the user or selected as an iteration variable. The impurity fraction of any one of the elements listed in array `fimp` (other than hydrogen -isotopes and helium) may be used as an iteration variable. The element to use is specified using -input parameter `impvar`, which may be set to a value between 3 and `nimp`, and the initial -estimate to use for the element's impurity fraction must be set using iteration -variable no. 102 (`fimpvar`). +isotopes and helium) may be used as an iteration variable. The synchrotron radiation power[^11] [^12] is assumed to originate from the plasma core. The wall reflection factor `ssync` may be set by the user. diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index 83f6fcd343..7caab53903 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -264,7 +264,6 @@ def main(args=None): "tbrmin", "bt", "coreradius", - "fimpvar", "taulimit", "epsvmc", "ttarget", diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py index 9dacb4dfb2..6dcb83bbf0 100644 --- a/process/io/plot_scans.py +++ b/process/io/plot_scans.py @@ -346,7 +346,7 @@ def main(args=None): nsweep_dict[27] = "tbrmin" nsweep_dict[28] = "bt" nsweep_dict[29] = "coreradius" - nsweep_dict[30] = "fimpvar" # OBSOLETE + nsweep_dict[30] = "" # OBSOLETE nsweep_dict[31] = "taulimit" nsweep_dict[32] = "epsvmc" nsweep_dict[33] = "ttarget" diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index d69130141c..7edc4bffff 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -156,7 +156,7 @@ module numerics !!
      • (53) Neutron fluence on TF coil upper limit (itv 92,93,94) !!
      • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94) !!
      • (55) Vacuum vessel helium concentration upper limit iblanket =2 (itv 96,93,94) - !!
      • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3,102) + !!
      • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3) !!
      • (57) NOT USED !!
      • (58) NOT USED !!
      • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 ) @@ -168,7 +168,7 @@ module numerics !!
      • (65) Dump time set by VV loads (itv 56, 113) !!
      • (66) Limit on rate of change of energy in poloidal field !! (Use iteration variable 65(tohs), 115) - !!
      • (67) Simple Radiation Wall load limit (itv 116, 102, 4,6) + !!
      • (67) Simple Radiation Wall load limit (itv 116, 4,6) !!
      • (68) Psep * Bt / qAR upper limit (itv 117) !!
      • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118) !!
      • (70) ensure that teomp = separatrix temperature in the pedestal profile, diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index 7368a26264..2a2dc96f2c 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -362,7 +362,7 @@ subroutine scan_1d_write_plot(iscan, outvar) plabel(48) = 'Net_electric_Pwr_(MW)____' plabel(49) = 'Recirculating_Fraction___' plabel(50) = 'Psep/R___________________' - plabel(51) = 'fimpvar__________________' + plabel(51) = '' !OBSOLETE plabel(52) = 'Tot._radiation_power_(MW)' plabel(53) = 'First_wall_peak_temp_(K)_' plabel(54) = 'Cu_frac_TFC_conductor____' @@ -560,7 +560,7 @@ subroutine scan_2d_write_plot(iscan, outvar, sweep_1_vals, sweep_2_vals) plabel(48) = 'Net_electric_Pwr_(MW)____' plabel(49) = 'Recirculating_Fraction___' plabel(50) = 'Psep/R___________________' - plabel(51) = 'fimpvar__________________' + plabel(51) = '' !OBSOLETE plabel(52) = 'Tot._radiation_power_(MW)' plabel(53) = 'First_wall_peak_temp_(K)_' plabel(54) = 'Cu_frac_TFC_conductor____' diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 67fb77ec91..4ea7753a11 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -71,7 +71,6 @@ ixc = 58 * thwcndut boundl(58) = 8.0d-3 ixc = 61 * gapds boundl(61) = 0.02 -ixc = 102 * fimpvar ixc = 103 * flhthresh boundu(103) = 10.0 ixc = 117 *fpsepbqar @@ -218,8 +217,6 @@ fimp(11) = 0.0 fimp(12) = 0.0 fimp(13) = 0.00044 fimp(14) = 5e-05 -fimpvar = 0.0003891 * Impurity fraction to be used as fimp(impvar) -impvar = 13 * Fimp element value to be varied if iteration *---------------------Numerics---------------------* @@ -370,7 +367,6 @@ tburn = 1.0d4 * Burn time (s) (calculated if lpulse=1) thkcas = 5.2465E-01 thwcndut = 8.0000E-03 gapds = 2.0000E-02 - fimpvar = 3.7786E-04 flhthresh = 1.4972E+00 fpsepbqar = 1.0000E+00 ftaucq = 9.1874E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 49d424caa1..d83bf87a78 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -107,9 +107,6 @@ gapds___________________________________________________________________ (itvar028)____________________ 2.0000E-02 gapds_(final_value/initial_value)_______________________________________ (xcm028)______________________ 1.0000E+00 gapds_(range_normalised)________________________________________________ (nitvar028)___________________ 0.0000E+00 - fimpvar_________________________________________________________________ (itvar029)____________________ 3.5634E-04 - fimpvar_(final_value/initial_value)_____________________________________ (xcm029)______________________ 8.0986E-01 - fimpvar_(range_normalised)______________________________________________ (nitvar029)___________________ 3.5537E-02 flhthresh_______________________________________________________________ (itvar030)____________________ 1.5324E+00 flhthresh_(final_value/initial_value)___________________________________ (xcm030)______________________ 1.0235E+00 flhthresh_(range_normalised)____________________________________________ (nitvar030)___________________ 5.9153E-02 @@ -1106,9 +1103,6 @@ gapds___________________________________________________________________ (itvar028)____________________ 2.0000E-02 gapds_(final_value/initial_value)_______________________________________ (xcm028)______________________ 1.0000E+00 gapds_(range_normalised)________________________________________________ (nitvar028)___________________ 0.0000E+00 - fimpvar_________________________________________________________________ (itvar029)____________________ 3.5634E-04 - fimpvar_(final_value/initial_value)_____________________________________ (xcm029)______________________ 1.0000E+00 - fimpvar_(range_normalised)______________________________________________ (nitvar029)___________________ 3.5537E-02 flhthresh_______________________________________________________________ (itvar030)____________________ 1.5324E+00 flhthresh_(final_value/initial_value)___________________________________ (xcm030)______________________ 1.0000E+00 flhthresh_(range_normalised)____________________________________________ (nitvar030)___________________ 5.9153E-02 @@ -2105,9 +2099,6 @@ gapds___________________________________________________________________ (itvar028)____________________ 2.0000E-02 gapds_(final_value/initial_value)_______________________________________ (xcm028)______________________ 1.0000E+00 gapds_(range_normalised)________________________________________________ (nitvar028)___________________ 0.0000E+00 - fimpvar_________________________________________________________________ (itvar029)____________________ 3.5634E-04 - fimpvar_(final_value/initial_value)_____________________________________ (xcm029)______________________ 1.0000E+00 - fimpvar_(range_normalised)______________________________________________ (nitvar029)___________________ 3.5537E-02 flhthresh_______________________________________________________________ (itvar030)____________________ 1.5324E+00 flhthresh_(final_value/initial_value)___________________________________ (xcm030)______________________ 1.0000E+00 flhthresh_(range_normalised)____________________________________________ (nitvar030)___________________ 5.9153E-02 @@ -3104,9 +3095,6 @@ gapds___________________________________________________________________ (itvar028)____________________ 2.0000E-02 gapds_(final_value/initial_value)_______________________________________ (xcm028)______________________ 1.0000E+00 gapds_(range_normalised)________________________________________________ (nitvar028)___________________ 0.0000E+00 - fimpvar_________________________________________________________________ (itvar029)____________________ 3.5634E-04 - fimpvar_(final_value/initial_value)_____________________________________ (xcm029)______________________ 1.0000E+00 - fimpvar_(range_normalised)______________________________________________ (nitvar029)___________________ 3.5537E-02 flhthresh_______________________________________________________________ (itvar030)____________________ 1.5324E+00 flhthresh_(final_value/initial_value)___________________________________ (xcm030)______________________ 1.0000E+00 flhthresh_(range_normalised)____________________________________________ (nitvar030)___________________ 5.9153E-02 @@ -4103,9 +4091,6 @@ gapds___________________________________________________________________ (itvar028)____________________ 2.0000E-02 gapds_(final_value/initial_value)_______________________________________ (xcm028)______________________ 1.0000E+00 gapds_(range_normalised)________________________________________________ (nitvar028)___________________ 0.0000E+00 - fimpvar_________________________________________________________________ (itvar029)____________________ 3.5634E-04 - fimpvar_(final_value/initial_value)_____________________________________ (xcm029)______________________ 1.0000E+00 - fimpvar_(range_normalised)______________________________________________ (nitvar029)___________________ 3.5537E-02 flhthresh_______________________________________________________________ (itvar030)____________________ 1.5324E+00 flhthresh_(final_value/initial_value)___________________________________ (xcm030)______________________ 1.0000E+00 flhthresh_(range_normalised)____________________________________________ (nitvar030)___________________ 5.9153E-02 @@ -5102,9 +5087,6 @@ gapds___________________________________________________________________ (itvar028)____________________ 2.0000E-02 gapds_(final_value/initial_value)_______________________________________ (xcm028)______________________ 1.0000E+00 gapds_(range_normalised)________________________________________________ (nitvar028)___________________ 0.0000E+00 - fimpvar_________________________________________________________________ (itvar029)____________________ 3.5634E-04 - fimpvar_(final_value/initial_value)_____________________________________ (xcm029)______________________ 1.0000E+00 - fimpvar_(range_normalised)______________________________________________ (nitvar029)___________________ 3.5537E-02 flhthresh_______________________________________________________________ (itvar030)____________________ 1.5324E+00 flhthresh_(final_value/initial_value)___________________________________ (xcm030)______________________ 1.0000E+00 flhthresh_(range_normalised)____________________________________________ (nitvar030)___________________ 5.9153E-02 @@ -6101,9 +6083,6 @@ gapds___________________________________________________________________ (itvar028)____________________ 2.0000E-02 gapds_(final_value/initial_value)_______________________________________ (xcm028)______________________ 1.0000E+00 gapds_(range_normalised)________________________________________________ (nitvar028)___________________ 0.0000E+00 - fimpvar_________________________________________________________________ (itvar029)____________________ 3.5634E-04 - fimpvar_(final_value/initial_value)_____________________________________ (xcm029)______________________ 1.0000E+00 - fimpvar_(range_normalised)______________________________________________ (nitvar029)___________________ 3.5537E-02 flhthresh_______________________________________________________________ (itvar030)____________________ 1.5324E+00 flhthresh_(final_value/initial_value)___________________________________ (xcm030)______________________ 1.0000E+00 flhthresh_(range_normalised)____________________________________________ (nitvar030)___________________ 5.9153E-02 @@ -7100,9 +7079,6 @@ gapds___________________________________________________________________ (itvar028)____________________ 2.0000E-02 gapds_(final_value/initial_value)_______________________________________ (xcm028)______________________ 1.0000E+00 gapds_(range_normalised)________________________________________________ (nitvar028)___________________ 0.0000E+00 - fimpvar_________________________________________________________________ (itvar029)____________________ 3.5634E-04 - fimpvar_(final_value/initial_value)_____________________________________ (xcm029)______________________ 1.0000E+00 - fimpvar_(range_normalised)______________________________________________ (nitvar029)___________________ 3.5537E-02 flhthresh_______________________________________________________________ (itvar030)____________________ 1.5324E+00 flhthresh_(final_value/initial_value)___________________________________ (xcm030)______________________ 1.0000E+00 flhthresh_(range_normalised)____________________________________________ (nitvar030)___________________ 5.9153E-02 @@ -8099,9 +8075,6 @@ gapds___________________________________________________________________ (itvar028)____________________ 2.0000E-02 gapds_(final_value/initial_value)_______________________________________ (xcm028)______________________ 1.0000E+00 gapds_(range_normalised)________________________________________________ (nitvar028)___________________ 0.0000E+00 - fimpvar_________________________________________________________________ (itvar029)____________________ 3.5634E-04 - fimpvar_(final_value/initial_value)_____________________________________ (xcm029)______________________ 1.0000E+00 - fimpvar_(range_normalised)______________________________________________ (nitvar029)___________________ 3.5537E-02 flhthresh_______________________________________________________________ (itvar030)____________________ 1.5324E+00 flhthresh_(final_value/initial_value)___________________________________ (xcm030)______________________ 1.0000E+00 flhthresh_(range_normalised)____________________________________________ (nitvar030)___________________ 5.9153E-02 @@ -9084,7 +9057,6 @@ ixc = 58 * thwcndut boundl(58) = 8.0d-3 ixc = 61 * gapds boundl(61) = 0.02 -ixc = 102 * fimpvar ixc = 103 * flhthresh boundu(103) = 10.0 ixc = 117 *fpsepbqar @@ -9231,8 +9203,6 @@ fimp(11) = 0.0 fimp(12) = 0.0 fimp(13) = 0.00044 fimp(14) = 5e-05 -fimpvar = 0.0003891 * Impurity fraction to be used as fimp(impvar) -impvar = 13 * Fimp element value to be varied if iteration *---------------------Numerics---------------------* @@ -9384,7 +9354,6 @@ tburn = 1.0d4 * Burn time (s) (calculated if lpulse=1) thkcas = 5.2465E-01 thwcndut = 8.0000E-03 gapds = 2.0000E-02 - fimpvar = 3.7786E-04 flhthresh = 1.4972E+00 fpsepbqar = 1.0000E+00 ftaucq = 9.1874E-01 diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index ea797f8c09..90dd567d3c 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -71,7 +71,6 @@ ixc = 58 * thwcndut boundl(58) = 8.0d-3 ixc = 61 * gapds boundl(61) = 0.02 -ixc = 102 * fimpvar * ixc = 103 * flhthresh * boundu(103) = 10.0 ixc = 117 *fpsepbqar @@ -218,8 +217,6 @@ fimp(11) = 0.0 fimp(12) = 0.0 fimp(13) = 0.00044 fimp(14) = 5e-05 -fimpvar = 0.0003891 * Impurity fraction to be used as fimp(impvar) -impvar = 13 * Fimp element value to be varied if iteration *---------------------Numerics---------------------* @@ -370,7 +367,6 @@ tburn = 1.0d4 * Burn time (s) (calculated if lpulse=1) thkcas = 5.2465E-01 thwcndut = 8.0000E-03 gapds = 2.0000E-02 - fimpvar = 3.7786E-04 flhthresh = 1.4972E+00 fpsepbqar = 1.0000E+00 ftaucq = 9.1874E-01 diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 3883a0bfbb..ca8c4c947e 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -71,7 +71,6 @@ ixc = 58 * thwcndut boundl(58) = 8.0d-3 ixc = 61 * gapds boundl(61) = 0.02 -ixc = 102 * fimpvar * ixc = 103 * flhthresh * boundu(103) = 10.0 ixc = 117 *fpsepbqar @@ -218,8 +217,6 @@ fimp(11) = 0.0 fimp(12) = 0.0 fimp(13) = 0.00044 fimp(14) = 5e-05 -fimpvar = 0.0003891 * Impurity fraction to be used as fimp(impvar) -impvar = 13 * Fimp element value to be varied if iteration *---------------------Numerics---------------------* @@ -370,7 +367,6 @@ tburn = 1.0d4 * Burn time (s) (calculated if lpulse=1) thkcas = 5.2465E-01 thwcndut = 8.0000E-03 gapds = 2.0000E-02 - fimpvar = 3.7786E-04 flhthresh = 1.4972E+00 fpsepbqar = 1.0000E+00 ftaucq = 9.1874E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index bffc7ee5d7..0001fca317 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -10059,7 +10059,7 @@ "ki": "", "kron": "", "ksic": "power fraction for outboard double-null scrape-off plasma", - "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
          \n
          \n
        • ( 1) Beta (consistency equation) (itv 5)\n
        • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
        • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
        • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
        • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
        • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
        • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
        • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
        • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
        • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
        • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
        • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
        • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
        • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
        • (15) LH power threshold limit (itv 103)\n
        • (16) Net electric power lower limit (itv 25,1,2,3)\n
        • (17) Radiation fraction upper limit (itv 28)\n
        • (18) Divertor heat load upper limit (itv 27)\n
        • (19) MVA upper limit (itv 30)\n
        • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
        • (21) Plasma minor radius lower limit (itv 32)\n
        • (22) Divertor collisionality upper limit (itv 34,43)\n
        • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
        • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
        • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
        • (26) Central solenoid EOF current density upper limit (ipfres=0)\n (itv 38,37,41,12)\n
        • (27) Central solenoid BOP current density upper limit (ipfres=0)\n (itv 39,37,41,12)\n
        • (28) Fusion gain Q lower limit (itv 45,47,40)\n
        • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
        • (30) Injection power upper limit (itv 46,47,11)\n
        • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
        • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
        • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
        • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
        • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
        • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
        • (37) Current drive gamma upper limit (itv 40,47)\n
        • (38) First wall coolant temperature rise upper limit (itv 62)\n
        • (39) First wall peak temperature upper limit (itv 63)\n
        • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
        • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
        • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
        • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
        • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
        • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
        • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
        • (47) NOT USED\n
        • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
        • (49) NOT USED\n
        • (50) IFE repetition rate upper limit (IFE)\n
        • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
        • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
        • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
        • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
        • (55) Vacuum vessel helium concentration upper limit iblanket =2 (itv 96,93,94)\n
        • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3,102)\n
        • (57) NOT USED\n
        • (58) NOT USED\n
        • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
        • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
        • (61) Minimum availability value (itv 107)\n
        • (62) taup/taueff the ratio of particle to energy confinement times (itv 110)\n
        • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
        • (64) Zeff less than or equal to zeffmax (itv 112)\n
        • (65) Dump time set by VV loads (itv 56, 113)\n
        • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(tohs), 115)\n
        • (67) Simple Radiation Wall load limit (itv 116, 102, 4,6)\n
        • (68) Psep * Bt / qAR upper limit (itv 117)\n
        • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
        • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
        • (71) ensure that neomp = separatrix density (nesep) x neratio\n
        • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
        • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
        • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
        • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
        • (76) Eich critical separatrix density\n
        • (77) TF coil current per turn upper limit\n
        • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
        • (79) Peak CS field upper limit (itv 149 fbmaxcs)\n
        • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
        • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
        • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
        • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
        • (84) Lower limit for beta (itv 173 fbetatry_lower)\n
        • (85) Constraint for CP lifetime\n
        • (86) Constraint for TF coil turn dimension\n
        • (87) Constraint for cryogenic power\n
        • (88) Constraint for TF coil strain absolute value\n
        • (89) Constraint for CS coil quench protection\n
        • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
        \n\n\n\n", + "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
          \n
          \n
        • ( 1) Beta (consistency equation) (itv 5)\n
        • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
        • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
        • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
        • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
        • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
        • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
        • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
        • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
        • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
        • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
        • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
        • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
        • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
        • (15) LH power threshold limit (itv 103)\n
        • (16) Net electric power lower limit (itv 25,1,2,3)\n
        • (17) Radiation fraction upper limit (itv 28)\n
        • (18) Divertor heat load upper limit (itv 27)\n
        • (19) MVA upper limit (itv 30)\n
        • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
        • (21) Plasma minor radius lower limit (itv 32)\n
        • (22) Divertor collisionality upper limit (itv 34,43)\n
        • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
        • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
        • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
        • (26) Central solenoid EOF current density upper limit (ipfres=0)\n (itv 38,37,41,12)\n
        • (27) Central solenoid BOP current density upper limit (ipfres=0)\n (itv 39,37,41,12)\n
        • (28) Fusion gain Q lower limit (itv 45,47,40)\n
        • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
        • (30) Injection power upper limit (itv 46,47,11)\n
        • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
        • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
        • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
        • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
        • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
        • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
        • (37) Current drive gamma upper limit (itv 40,47)\n
        • (38) First wall coolant temperature rise upper limit (itv 62)\n
        • (39) First wall peak temperature upper limit (itv 63)\n
        • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
        • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
        • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
        • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
        • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
        • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
        • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
        • (47) NOT USED\n
        • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
        • (49) NOT USED\n
        • (50) IFE repetition rate upper limit (IFE)\n
        • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
        • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
        • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
        • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
        • (55) Vacuum vessel helium concentration upper limit iblanket =2 (itv 96,93,94)\n
        • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
        • (57) NOT USED\n
        • (58) NOT USED\n
        • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
        • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
        • (61) Minimum availability value (itv 107)\n
        • (62) taup/taueff the ratio of particle to energy confinement times (itv 110)\n
        • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
        • (64) Zeff less than or equal to zeffmax (itv 112)\n
        • (65) Dump time set by VV loads (itv 56, 113)\n
        • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(tohs), 115)\n
        • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
        • (68) Psep * Bt / qAR upper limit (itv 117)\n
        • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
        • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
        • (71) ensure that neomp = separatrix density (nesep) x neratio\n
        • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
        • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
        • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
        • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
        • (76) Eich critical separatrix density\n
        • (77) TF coil current per turn upper limit\n
        • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
        • (79) Peak CS field upper limit (itv 149 fbmaxcs)\n
        • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
        • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
        • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
        • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
        • (84) Lower limit for beta (itv 173 fbetatry_lower)\n
        • (85) Constraint for CP lifetime\n
        • (86) Constraint for TF coil turn dimension\n
        • (87) Constraint for cryogenic power\n
        • (88) Constraint for TF coil strain absolute value\n
        • (89) Constraint for CS coil quench protection\n
        • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
        \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
          \n
          \n
        • ( 1) major radius\n
        • ( 2) not used\n
        • ( 3) neutron wall load\n
        • ( 4) P_tf + P_pf\n
        • ( 5) fusion gain Q\n
        • ( 6) cost of electricity\n
        • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
        • ( 8) aspect ratio\n
        • ( 9) divertor heat load\n
        • (10) toroidal field\n
        • (11) total injected power\n
        • (12) hydrogen plant capital cost OBSOLETE\n
        • (13) hydrogen production rate OBSOLETE\n
        • (14) pulse length\n
        • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
        • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
        • (17) net electrical output\n
        • (18) Null Figure of Merit\n
        • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
        \n\n\n", "lablxc": "lablxc(ipnvars) : labels describing iteration variables
          \n
          \n
        • ( 1) aspect\n
        • ( 2) bt\n
        • ( 3) rmajor\n
        • ( 4) te\n
        • ( 5) beta\n
        • ( 6) dene\n
        • ( 7) rnbeam\n
        • ( 8) fbeta (f-value for equation 6)\n
        • ( 9) fdene (f-value for equation 5)\n
        • (10) hfact\n
        • (11) pheat\n
        • (12) oacdcp\n
        • (13) tfcth (NOT RECOMMENDED)\n
        • (14) fwalld (f-value for equation 8)\n
        • (15) fvs (f-value for equation 12)\n
        • (16) ohcth\n
        • (17) tdwell\n
        • (18) q\n
        • (19) enbeam\n
        • (20) tcpav\n
        • (21) ftburn (f-value for equation 13)\n
        • (22) NOT USED\n
        • (23) fcoolcp\n
        • (24) NOT USED\n
        • (25) fpnetel (f-value for equation 16)\n
        • (26) ffuspow (f-value for equation 9)\n
        • (27) fhldiv (f-value for equation 18)\n
        • (28) fradpwr (f-value for equation 17), total radiation fraction\n
        • (29) bore\n
        • (30) fmva (f-value for equation 19)\n
        • (31) gapomin\n
        • (32) frminor (f-value for equation 21)\n
        • (33) fportsz (f-value for equation 20)\n
        • (34) fdivcol (f-value for equation 22)\n
        • (35) fpeakb (f-value for equation 25)\n
        • (36) fbetatry (f-value for equation 24)\n
        • (37) coheof\n
        • (38) fjohc (f-value for equation 26)\n
        • (39) fjohc0 (f-value for equation 27)\n
        • (40) fgamcd (f-value for equation 37)\n
        • (41) fcohbop\n
        • (42) gapoh\n
        • (43) NOT USED\n
        • (44) fvsbrnni\n
        • (45) fqval (f-value for equation 28)\n
        • (46) fpinj (f-value for equation 30)\n
        • (47) feffcd\n
        • (48) fstrcase (f-value for equation 31)\n
        • (49) fstrcond (f-value for equation 32)\n
        • (50) fiooic (f-value for equation 33)\n
        • (51) fvdump (f-value for equation 34)\n
        • (52) vdalw\n
        • (53) fjprot (f-value for equation 35)\n
        • (54) ftmargtf (f-value for equation 36)\n
        • (55) NOT USED\n
        • (56) tdmptf\n
        • (57) thkcas\n
        • (58) thwcndut\n
        • (59) fcutfsu\n
        • (60) cpttf\n
        • (61) gapds\n
        • (62) fdtmp (f-value for equation 38)\n
        • (63) ftpeak (f-value for equation 39)\n
        • (64) fauxmn (f-value for equation 40)\n
        • (65) tohs\n
        • (66) ftohs (f-value for equation 41)\n
        • (67) ftcycl (f-value for equation 42)\n
        • (68) fptemp (f-value for equation 44)\n
        • (69) rcool\n
        • (70) vcool\n
        • (71) fq (f-value for equation 45)\n
        • (72) fipir (f-value for equation 46)\n
        • (73) scrapli\n
        • (74) scraplo\n
        • (75) tfootfi\n
        • (76) NOT USED\n
        • (77) NOT USED\n
        • (78) NOT USED\n
        • (79) fbetap (f-value for equation 48)\n
        • (80) NOT USED\n
        • (81) edrive\n
        • (82) drveff\n
        • (83) tgain\n
        • (84) chrad\n
        • (85) pdrive\n
        • (86) frrmax (f-value for equation 50)\n
        • (87) NOT USED\n
        • (88) NOT USED\n
        • (89) ftbr (f-value for equation 52)\n
        • (90) blbuith\n
        • (91) blbuoth\n
        • (92) fflutf (f-value for equation 53)\n
        • (93) shldith\n
        • (94) shldoth\n
        • (95) fptfnuc (f-value for equation 54)\n
        • (96) fvvhe (f-value for equation 55)\n
        • (97) fpsepr (f-value for equation 56)\n
        • (98) li6enrich\n
        • (99) NOT USED\n
        • (100) NOT USED\n
        • (101) NOT USED\n
        • (103) flhthresh (f-value for equation 15)\n
        • (104) fcwr (f-value for equation 23)\n
        • (105) fnbshinef (f-value for equation 59)\n
        • (106) ftmargoh (f-value for equation 60)\n
        • (107) favail (f-value for equation 61)\n
        • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
        • (109) ralpne: thermal alpha density / electron density\n
        • (110) ftaulimit: Lower limit on taup/taueff the ratio of alpha\n
        • (111) fniterpump: f-value for constraint that number\n
        • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
        • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
        • (114) fw_channel_length: Length of a single first wall channel\n
        • (115) fpoloidalpower: f-value for max rate of change of\n
        • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
        • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
        • (118) fpsep: f-value to ensure separatrix power is less than\n
        • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
        • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
        • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
        • (122) oh_steel_frac : streel fraction of Central Solenoid\n
        • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
        • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
        • (125) fimp(3) : Beryllium density fraction relative to electron density\n
        • (126) fimp(4) : Carbon density fraction relative to electron density\n
        • (127) fimp(5) : Nitrogen fraction relative to electron density\n
        • (128) fimp(6) : Oxygen density fraction relative to electron density\n
        • (129) fimp(7) : Neon density fraction relative to electron density\n
        • (130) fimp(8) : Silicon density fraction relative to electron density\n
        • (131) fimp(9) : Argon density fraction relative to electron density\n
        • (132) fimp(10) : Iron density fraction relative to electron density\n
        • (133) fimp(11) : Nickel density fraction relative to electron density\n
        • (134) fimp(12) : Krypton density fraction relative to electron density\n
        • (135) fimp(13) : Xenon density fraction relative to electron density\n
        • (136) fimp(14) : Tungsten density fraction relative to electron density\n
        • (137) fplhsep (f-value for equation 73)\n
        • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
        • (139) copper_thick : thickness of copper layer in tape (m)\n
        • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
        • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
        • (142) nesep : electron density at separatrix [m-3]\n
        • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
        • (144) fnesep : Eich critical electron density at separatrix\n
        • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
        • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
        • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
        • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
        • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
        • (150) plasmod_fcdp : (P_CD - Pheat)/(Pmax-Pheat)\n
        • (151) plasmod_fradc : Pline_Xe / (Palpha + Paux - PlineAr - Psync - Pbrad)\n
        • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
        • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
        • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
        • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
        • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
        • (157) fvssu : F-value for available to required start up flux (con. 51)\n
        • (158) croco_thick : Thickness of CroCo copper tube (m)\n
        • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
        • (160) f_avspace (f-value for equation 83)\n
        • (161) fbetatry_lower (f-value for equation 84)\n
        • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
        • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
        • (164) f_crypmw : f-value for cryogenic plant power\n
        • (165) fstr_wp : f-value for TF coil strain absolute value\n
        • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
        • (167) fecrh_ignition: f-value for equation 90\n
        • (168) EMPTY : Description\n
        • (169) EMPTY : Description\n
        • (170) EMPTY : Description\n
        • (171) EMPTY : Description\n
        • (172) EMPTY : Description\n
        • (173) EMPTY : Description\n
        • (174) EMPTY : Description\n
        • (175) EMPTY : Description\n\n\n\n", "lambda_EU": "Decay length in EUROFER [cm]", From 61184ce33b59741a90ea3106882ec51141530389 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 7 Dec 2023 09:00:56 +0000 Subject: [PATCH 13/16] impurity docs update --- documentation/proc-pages/physics-models/plasma.md | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/proc-pages/physics-models/plasma.md b/documentation/proc-pages/physics-models/plasma.md index 7cb2f28a5b..8568fd0be9 100644 --- a/documentation/proc-pages/physics-models/plasma.md +++ b/documentation/proc-pages/physics-models/plasma.md @@ -379,6 +379,7 @@ be input by the user or selected as an iteration variable. The impurity fraction of any one of the elements listed in array `fimp` (other than hydrogen isotopes and helium) may be used as an iteration variable. +The impurity fraction to be varied can be set simply with `fimp(i) = `, where `i` is the corresponding number value for the desired impurity in the table above. The synchrotron radiation power[^11] [^12] is assumed to originate from the plasma core. The wall reflection factor `ssync` may be set by the user. From 1580ac75916d0b3b13843084a723285f84faba99 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 7 Dec 2023 09:04:14 +0000 Subject: [PATCH 14/16] Added fimpvar back in as obsolete --- process/io/plot_radial_build.py | 1 + 1 file changed, 1 insertion(+) diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index 7caab53903..733410f3af 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -264,6 +264,7 @@ def main(args=None): "tbrmin", "bt", "coreradius", + "Obsolete" # Removed "taulimit", "epsvmc", "ttarget", From b3f0e7e3f2c2b4680746259e236c4ce79639d3e5 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 7 Dec 2023 10:55:55 +0000 Subject: [PATCH 15/16] black fixes --- process/io/plot_radial_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index 733410f3af..97f2eb5851 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -264,7 +264,7 @@ def main(args=None): "tbrmin", "bt", "coreradius", - "Obsolete" # Removed + "Obsolete", # Removed "taulimit", "epsvmc", "ttarget", From c1617806450ece9c742d07ed866cb56c436979ed Mon Sep 17 00:00:00 2001 From: Timothy <75321887+timothy-nunn@users.noreply.github.com> Date: Wed, 20 Dec 2023 11:44:18 +0000 Subject: [PATCH 16/16] Remove ecrh from input --- source/fortran/input.f90 | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 3b06afb32d..f7f4eafe08 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -1153,9 +1153,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('wave_mode') call parse_int_variable('wave_mode', wave_mode, 0, 1, & 'Cyclotron wave mode switch') - case ('rho_ecrh') - call parse_real_variable('rho_ecrh', rho_ecrh, 0.0D0, 1.0D0, & - 'normalised minor radius at which electron cyclotron current drive is maximum') case ('xi_ebw') call parse_real_variable('xi_ebw', xi_ebw, 0.0D0, 1.0D0, & 'User input EBW scaling for Plasma Heating')