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 4479f33e56..fff2c5ee3d 100644 --- a/documentation/proc-pages/physics-models/plasma.md +++ b/documentation/proc-pages/physics-models/plasma.md @@ -377,10 +377,8 @@ 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 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. diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 8201c4e1f2..9c702c7f5d 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -74,4 +74,22 @@ "rad_fraction_core": "rad_fraction_LCFS", "thshield": ["thshield_ib", "thshield_ob", "thshield_vb"], "igeom": None, + "fgamp": None, + "divleg_profile_inner": None, + "divleg_profile_outer": None, + "iprimnloss": None, + "rho_ecrh": None, + "ifispact": None, + "fmsbc": None, + "fmsbl": None, + "fmsdwe": None, + "fmsdwi": None, + "fmsfw": None, + "fmsoh": None, + "fmssh": None, + "fmstf": None, + "quench_detection_ef": None, + "farc4tf": None, + "impvar": None, + "fimpvar": None, } diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index 2c0733e128..29b55255df 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", - "fimpvar", + "Obsolete", # Removed "taulimit", "epsvmc", "ttarget", @@ -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..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" + nsweep_dict[30] = "" # OBSOLETE nsweep_dict[31] = "taulimit" nsweep_dict[32] = "epsvmc" nsweep_dict[33] = "ttarget" @@ -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/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/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/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 4d30d4e6c6..103f7c35d6 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -125,9 +125,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 @@ -270,7 +267,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/divertor_variables.f90 b/source/fortran/divertor_variables.f90 index dec2c2512f..81d3f97bee 100644 --- a/source/fortran/divertor_variables.f90 +++ b/source/fortran/divertor_variables.f90 @@ -76,14 +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 - real(dp) :: divmas !! divertor plate mass (kg) @@ -99,9 +91,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) @@ -207,14 +196,11 @@ 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 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/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/impurity_radiation.f90 b/source/fortran/impurity_radiation.f90 index cfd1d77698..09815f8467 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 @@ -62,15 +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 - - !! impvar : impurity to be iterated (deprecated) - !! variable number 102 is turned on - integer, public :: impvar - ! Declare impurity data type ! type :: imp_dat @@ -141,8 +132,6 @@ subroutine init_impurity_radiation_module 'Kr', & 'Xe', & 'W_'/) - fimpvar = 1.0D-3 - impvar = 9 toolow = .false. impurity_arr_Label = " " impurity_arr_Z = 0 diff --git a/source/fortran/initial.f90 b/source/fortran/initial.f90 index 8a40a68b08..2adc158e93 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 @@ -261,7 +260,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 +344,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 78501cb1d8..f7f4eafe08 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, & @@ -258,14 +258,14 @@ 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, wave_mode 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, & - zeffdiv, hldivlim, rlenmax, divfix, c3div, divleg_profile_inner, & - divleg_profile_outer, hldiv, i_hldiv + omegan, prn1, frrp, xpertin, c1div, betai, bpsout, xparain, fdiva, & + zeffdiv, hldivlim, rlenmax, divfix, c3div, & + 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, & @@ -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, & @@ -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, & coreradiationfraction, fimp use numerics, only: factor, boundl, minmax, neqns, nvar, epsfcn, ixc, & epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc @@ -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 @@ -324,8 +324,8 @@ 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, & - casthi, n_pancake, bcritsc, i_tf_sup, str_pf_con_res, thwcndut, farc4tf, & + fhts, dr_tf_wp, rcool, rhotfleg, thkcas, & + 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, & @@ -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') @@ -679,9 +676,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') @@ -699,9 +693,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, & @@ -1162,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') @@ -1293,12 +1281,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)') case ('divplt') call parse_real_variable('divplt', divplt, 0.01D0, 1.0D0, & 'Divertor plate thickness (m)') @@ -1308,9 +1290,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') @@ -1450,30 +1429,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') @@ -1715,9 +1670,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 ') @@ -1968,9 +1920,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, & @@ -2512,9 +2461,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/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index 1d280046b0..ed65fd83f8 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -2230,31 +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 - use impurity_radiation_module, only: impvar - implicit none - itv_102 = impurity_arr_frac(impvar) - 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 - end subroutine set_itv_102 + !--------------------------------- @@ -4084,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() @@ -4351,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 d539be736b..4410f0d675 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, @@ -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 80aa177bbd..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' , '', '"' // impurity_arr(impvar)%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/physics_variables.f90 b/source/fortran/physics_variables.f90 index c05ff5ed65..b771407eaf 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -304,12 +304,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 @@ -977,7 +971,6 @@ subroutine init_physics_variables idensl = 7 idivrt = 2 ifalphap = 1 - ifispact = 0 ignite = 0 iinvqd = 1 ipedestal = 1 diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index ce5c75800f..2a2dc96f2c 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 @@ -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____' @@ -620,12 +620,12 @@ 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, & 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(impvar)%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' @@ -765,8 +764,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/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 0a04449a80..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 @@ -480,9 +478,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) @@ -721,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. @@ -884,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 @@ -950,7 +944,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/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 3732b554c4..b303c07d92 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1643,8 +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, "divplt": 0.035, @@ -1860,7 +1858,6 @@ "falpe": 0.0, "falpha": 0.95, "falpi": 0.0, - "farc4tf": 0.7, "fauxbop": 0.06, "fauxmn": 1.0, "favail": 1.0, @@ -1932,7 +1929,6 @@ "ffuspow": 1.0, "ffwal": 0.92, "fgamcd": 1.0, - "fgamp": 1.0, "fgrd": null, "fgrosbop": 0.0, "fgwped": 0.85, @@ -1962,7 +1958,6 @@ 0.0, 0.0 ], - "fimpvar": 0.001, "fio": 0.0, "fiooic": 0.5, "fipir": 1.0, @@ -1983,14 +1978,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, @@ -2465,7 +2452,6 @@ "ife": 0.0, "ifedrv": 2.0, "ifetyp": 0.0, - "ifispact": 0.0, "ifueltyp": 0.0, "ignite": 0.0, "iinvqd": 1.0, @@ -2614,7 +2600,6 @@ 5.0 ], "impuritypowerlost": null, - "impvar": 9.0, "impvardiv": 9.0, "infile": 0.0, "info": null, @@ -2664,7 +2649,6 @@ "ipowerflow": 1.0, "iprecomp": 1.0, "iprimdiv": 0.0, - "iprimnloss": 0.0, "iprimshld": 1.0, "iprofile": 1.0, "ips": 0.0, @@ -3732,7 +3716,6 @@ "qstar": 0.0, "qtargettotal": 5000000.0, "qtaue": 0.0, - "quench_detection_ef": 0.0, "quench_model": "'exponential'", "r1": 0.0, "r2": 0.0, @@ -4225,7 +4208,6 @@ 0.0, 0.0 ], - "rho_ecrh": 0.1, "rho_max_dn": null, "rho_max_dt": null, "rho_star": 0.0, @@ -9203,7 +9185,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", @@ -9327,8 +9309,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)", "divplt": "divertor plate thickness (m) (from Spears, Sept 1990)", @@ -9508,7 +9488,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`)", @@ -9571,7 +9550,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`)", @@ -9586,7 +9564,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", @@ -9607,14 +9584,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`)", @@ -9871,7 +9840,6 @@ "ife": "Switch for IFE option:\n", "ifedrv": "Switch for type of IFE driver:\n", "ifetyp": "Switch for type of IFE device build:\n", - "ifispact": "switch for neutronics calculations:\n", "ifueltyp": "Switch for fuel type:\n", "igeom": "switch for plasma geometry calculation:\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", @@ -9887,7 +9855,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 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\n", "impurities_present": "", "impurity_arr_Label": "", "impurity_arr_Lz_Wm3": "", @@ -9901,7 +9869,6 @@ "impurity_data": "", "impurity_enrichment": "Ratio of each impurity concentration in SOL to confined plasma + the enrichment for Argon\n", "impuritypowerlost": "Power lost due to impurity radiation [W]", - "impvar": "", "impvardiv": "Index of impurity to be iterated for Reinke divertor detachment criterion", "infile": "", "info": "", @@ -9933,7 +9900,6 @@ "ipowerflow": "switch for power flow model:\n", "iprecomp": "Switch for existence of central solenoid pre-compression structure:\n", "iprimdiv": "", - "iprimnloss": "switch for lost neutron power through holes destiny (ipowerflow=0):\n", "iprimshld": "Switch for shield thermal power destiny:\n", "iprofile": "switch for current profile consistency:\n", "ips": "switch for Pfirsch-Schl\u00fcter current scaling (issue #413):\n", @@ -10001,7 +9967,7 @@ "ki": "", "kron": "", "ksic": "power fraction for outboard double-null scrape-off plasma", - "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)\n\n\n\n", + "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)\n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:\n\n\n", "lablxc": "lablxc(ipnvars) : labels describing iteration variables