From ae10e27e06c9af50b7cee6f1b45eedb7f93bab03 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 8 Nov 2024 13:39:44 +0000 Subject: [PATCH 01/48] Rename and reorganize plasma documentation: separate radiation content into its own file and update references --- ...on_impurities.md => plasma_composition.md} | 22 +------------------ .../physics-models/plasma_radiation.md | 21 ++++++++++++++++++ mkdocs.yml | 3 ++- 3 files changed, 24 insertions(+), 22 deletions(-) rename documentation/proc-pages/physics-models/{plasma_radiation_impurities.md => plasma_composition.md} (52%) create mode 100644 documentation/proc-pages/physics-models/plasma_radiation.md diff --git a/documentation/proc-pages/physics-models/plasma_radiation_impurities.md b/documentation/proc-pages/physics-models/plasma_composition.md similarity index 52% rename from documentation/proc-pages/physics-models/plasma_radiation_impurities.md rename to documentation/proc-pages/physics-models/plasma_composition.md index 48589657bc..0cf679cfc6 100644 --- a/documentation/proc-pages/physics-models/plasma_radiation_impurities.md +++ b/documentation/proc-pages/physics-models/plasma_composition.md @@ -34,24 +34,4 @@ The impurity fraction of any one of the elements listed in array `fimp` (other t 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[^2] [^3] is assumed to originate from the -plasma core. The wall reflection factor `ssync` may be set by the user. - -By changing the input parameter `coreradius`, the user may set the normalised -radius defining the 'core' region. Only the impurity and synchrotron radiation -from this affects the confinement scaling. Figure 1 below shows the -radiation power contributions. - -![Schematic diagram of radiation power contributions](../images/radiation.png "Schematic diagram of radiation power contributions") -*Figure 1: Schematic diagram of the radiation power contributions and how they are split between core and edge radiation* - -Constraint equation no. 17 with iteration variable no. 28 (`fradpwr`) -ensures that the calculated total radiation power does not exceed the total -power available that can be converted to radiation (i.e. the sum of the fusion -alpha power, other charged particle fusion power, auxiliary injected power and -the ohmic power). This constraint should always be turned on. - -[^1]: H. Lux, R. Kemp, D.J. Ward, M. Sertoli, 'Impurity radiation in DEMO -systems modelling', Fus. Eng. | Des. **101**, 42-51 (2015) -[^2]: Albajar, Nuclear Fusion **41** (2001) 665 -[^3]: Fidone, Giruzzi and Granata, Nuclear Fusion **41** (2001) 1755 \ No newline at end of file +[^1]: H. Lux, R. Kemp, D.J. Ward, M. Sertoli, Impurity radiation in DEMO systems modelling, Fusion Engineering and Design, Volume 101, 2015, Pages 42-51, ISSN 0920-3796, https://doi.org/10.1016/j.fusengdes.2015.10.002. diff --git a/documentation/proc-pages/physics-models/plasma_radiation.md b/documentation/proc-pages/physics-models/plasma_radiation.md new file mode 100644 index 0000000000..bcc6effa49 --- /dev/null +++ b/documentation/proc-pages/physics-models/plasma_radiation.md @@ -0,0 +1,21 @@ +# Plasma Radiation + +The synchrotron radiation power[^1] [^2] is assumed to originate from the +plasma core. The wall reflection factor `ssync` may be set by the user. + +By changing the input parameter `coreradius`, the user may set the normalised +radius defining the 'core' region. Only the impurity and synchrotron radiation +from this affects the confinement scaling. Figure 1 below shows the +radiation power contributions. + +![Schematic diagram of radiation power contributions](../images/radiation.png "Schematic diagram of radiation power contributions") +*Figure 1: Schematic diagram of the radiation power contributions and how they are split between core and edge radiation* + +Constraint equation no. 17 with iteration variable no. 28 (`fradpwr`) +ensures that the calculated total radiation power does not exceed the total +power available that can be converted to radiation (i.e. the sum of the fusion +alpha power, other charged particle fusion power, auxiliary injected power and +the ohmic power). This constraint should always be turned on. + +[^1]: Albajar, Nuclear Fusion **41** (2001) 665 +[^2]: Fidone, Giruzzi and Granata, Nuclear Fusion **41** (2001) 1755 \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index 3e038e1711..b0228303f0 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -56,7 +56,8 @@ nav: - Overview: physics-models/plasma_beta/plasma_beta.md - Fast Alpha: physics-models/plasma_beta/plasma_alpha_beta_contribution.md - Density Limit: physics-models/plasma_density.md - - Composition, Impurities & Radiation: physics-models/plasma_radiation_impurities.md + - Composition & Impurities: physics-models/plasma_composition.md + - Radiation: physics-models/plasma_radiation.md - Plasma Current: - Overview: physics-models/plasma_current/plasma_current.md - Bootstrap Current: physics-models/plasma_current/bootstrap_current.md From e5f1d6d0a4feb28d2fecc82e34c35f735bcc1f59 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 7 Jan 2025 15:33:25 +0000 Subject: [PATCH 02/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20impurity=20specie?= =?UTF-8?q?s=20count=20variable=20from=20nimp=20to=20n=5Fimpurities=20for?= =?UTF-8?q?=20consistency=20across=20documentation=20and=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/physics-models/error.txt | 4 +-- process/physics.py | 12 ++++---- source/fortran/impurity_radiation.f90 | 30 +++++++++---------- source/fortran/input.f90 | 6 ++-- tests/integration/ref_dicts.json | 10 +++---- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/documentation/proc-pages/physics-models/error.txt b/documentation/proc-pages/physics-models/error.txt index d69f47881d..b79082b548 100644 --- a/documentation/proc-pages/physics-models/error.txt +++ b/documentation/proc-pages/physics-models/error.txt @@ -470,8 +470,8 @@ density and temperature profiles\footnote{H. Lux, R. Kemp, D.J. Ward, M. \textbar{} Des. \textbf{101}, 42-51 (2015)} The impurity number density fractions relative to the electron density -are set using input array \texttt{fimp(1,...,nimp)}, where -\texttt{nimp\ =\ 14} is the number of impurity species in the radiation +are set using input array \texttt{fimp(1,...,n_impurities)}, where +\texttt{n_impurities\ =\ 14} is the number of impurity species in the radiation model. The available impurities are as follows: \begin{longtable}[]{@{}cl@{}} diff --git a/process/physics.py b/process/physics.py index d94e0d8858..1120f4f6dd 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2694,7 +2694,7 @@ def plasma_composition(): # Sum of Zi.ni for all impurity ions (those with charge > helium) znimp = 0.0 - for imp in range(impurity_radiation_module.nimp): + for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: znimp += impurity_radiation.zav_of_te( imp, np.array([physics_variables.te]) @@ -2740,7 +2740,7 @@ def plasma_composition(): # Total impurity density physics_variables.dnz = 0.0 - for imp in range(impurity_radiation_module.nimp): + for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: physics_variables.dnz += ( impurity_radiation_module.impurity_arr_frac[imp] @@ -2777,7 +2777,7 @@ def plasma_composition(): # Calculation should be sum(ni.Zi^2) / sum(ni.Zi), # but ne = sum(ni.Zi) through quasineutrality physics_variables.zeff = 0.0 - for imp in range(impurity_radiation_module.nimp): + for imp in range(impurity_radiation_module.n_impurities): physics_variables.zeff += ( impurity_radiation_module.impurity_arr_frac[imp] * impurity_radiation.zav_of_te( @@ -2840,7 +2840,7 @@ def plasma_composition(): + physics_variables.dnprot + physics_variables.abeam * physics_variables.dnbeam ) - for imp in range(impurity_radiation_module.nimp): + for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: physics_variables.aion += ( physics_variables.dene @@ -2862,7 +2862,7 @@ def plasma_composition(): / 2.0 + current_drive_variables.f_tritium_beam * physics_variables.dnbeam / 3.0 ) / physics_variables.dene - for imp in range(impurity_radiation_module.nimp): + for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: physics_variables.zeffai += ( impurity_radiation_module.impurity_arr_frac[imp] @@ -4005,7 +4005,7 @@ def outplas(self): po.oblnkl(self.outfile) po.ocmmnt(self.outfile, "Plasma ion densities / electron density:") - for imp in range(impurity_radiation_module.nimp): + for imp in range(impurity_radiation_module.n_impurities): # MDK Update fimp, as this will make the ITV output work correctly. impurity_radiation_module.fimp[imp] = ( impurity_radiation_module.impurity_arr_frac[imp] diff --git a/source/fortran/impurity_radiation.f90 b/source/fortran/impurity_radiation.f90 index a281840f24..bc65dd889c 100644 --- a/source/fortran/impurity_radiation.f90 +++ b/source/fortran/impurity_radiation.f90 @@ -30,8 +30,8 @@ module impurity_radiation_module !! (It is recommended to turn on !! constraint eqn.17 with iteration variable 28: fradpwr.) - integer, public, parameter :: nimp = 14 - !! nimp /14/ FIX : number of ion species in impurity radiation model + integer, public, parameter :: n_impurities = 14 + !! n_impurities /14/ FIX : number of ion species in impurity radiation model real(dp), public :: coreradius !! coreradius /0.6/ : normalised radius defining the 'core' region @@ -39,13 +39,13 @@ module impurity_radiation_module real(dp), public :: coreradiationfraction !! coreradiationfraction /1.0/ : fraction of radiation from 'core' region that is subtracted from the loss power - !! 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/ : + !! fimp(n_impurities) /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 !! - real(dp), public, dimension(nimp) :: fimp + real(dp), public, dimension(n_impurities) :: fimp - character*2, public, dimension(nimp) :: imp_label - !! imp_label(nimp) : impurity ion species names:
    + character*2, public, dimension(n_impurities) :: imp_label + !! imp_label(n_impurities) : impurity ion species names:
      !!
    • ( 1) Hydrogen (fraction calculated by code) !!
    • ( 2) Helium !!
    • ( 3) Beryllium @@ -89,17 +89,17 @@ module impurity_radiation_module ! Temp_keV, Lz_Wm3, Zav ! since these can no longer be allocatable - character*2, dimension(nimp) :: impurity_arr_Label - integer, dimension(nimp) :: impurity_arr_Z - real(dp), dimension(nimp) :: impurity_arr_amass - real(dp), dimension(nimp) :: impurity_arr_frac - integer, dimension(nimp) :: impurity_arr_len_tab - real(dp), dimension(nimp, all_array_hotfix_len) :: impurity_arr_Temp_keV - real(dp), dimension(nimp, all_array_hotfix_len) :: impurity_arr_Lz_Wm3 - real(dp), dimension(nimp, all_array_hotfix_len) :: impurity_arr_Zav + character*2, dimension(n_impurities) :: impurity_arr_Label + integer, dimension(n_impurities) :: impurity_arr_Z + real(dp), dimension(n_impurities) :: impurity_arr_amass + real(dp), dimension(n_impurities) :: impurity_arr_frac + integer, dimension(n_impurities) :: impurity_arr_len_tab + real(dp), dimension(n_impurities, all_array_hotfix_len) :: impurity_arr_Temp_keV + real(dp), dimension(n_impurities, all_array_hotfix_len) :: impurity_arr_Lz_Wm3 + real(dp), dimension(n_impurities, all_array_hotfix_len) :: impurity_arr_Zav -! type(imp_dat), dimension(nimp), save, public :: impurity_arr +! type(imp_dat), dimension(n_impurities), save, public :: impurity_arr logical, public :: toolow !! Used for reporting error in function pimpden diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 80226475c2..f7ca26e3ea 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -293,7 +293,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, & + use impurity_radiation_module, only: coreradius, n_impurities, & coreradiationfraction, fimp use numerics, only: factor, boundl, minmax, neqns, nvar, epsfcn, ixc, & epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc @@ -594,7 +594,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) call parse_real_variable('f_helium3', f_helium3, 0.0D0, 1.0D0, & 'Helium-3 fuel fraction') case ('fimp') - call parse_real_array('fimp', fimp, isub1, nimp, & + call parse_real_array('fimp', fimp, isub1, n_impurities, & 'Impurity density fraction', icode) case ('fkzohm') call parse_real_variable('fkzohm', fkzohm, 0.5D0, 2.0D0, & @@ -3222,7 +3222,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) 'Switch for Reinke Criterion mode (0=H, 1=I)') case ('impvardiv') - call parse_int_variable('impvardiv', impvardiv, 3, nimp, & + call parse_int_variable('impvardiv', impvardiv, 3, n_impurities, & 'Index of impurity to be iterated for Reike criterion') diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 28c7958c3d..277dbd7b86 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3405,7 +3405,7 @@ "ngrp": 3.0, "ngrpmx": 10.0, "ni0": 0.0, - "nimp": 14.0, + "n_impurities": 14.0, "nin": 10.0, "nineqns": 0.0, "niter": null, @@ -9182,7 +9182,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)", + "coreradiationfraction": "coreradiationfraction /1.0/ : fraction of radiation from 'core' region that is subtracted from the loss power\nfimp(n_impurities) /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", @@ -9848,7 +9848,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\n", + "imp_label": "imp_label(n_impurities) : 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": "", @@ -10168,7 +10168,7 @@ "ngrp": "number of groups of PF coils. Symmetric coil pairs should all be in the same group", "ngrpmx": "maximum number of groups of PF coils", "ni0": "central ion density (/m3)", - "nimp": "nimp /14/ FIX : number of ion species in impurity radiation model", + "n_impurities": "n_impurities /14/ FIX : number of ion species in impurity radiation model", "nin": "", "nineqns": "nineqns /0/ : number of inequality constraints VMCON must satisfy\n (leave at zero for now)", "niter": "", @@ -18365,7 +18365,7 @@ "zu7" ], "impurity_radiation_module": [ - "nimp", + "n_impurities", "coreradius", "coreradiationfraction", "fimp", From 6be0ddac38474193a5b9c97e427d8d2abb565cd7 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 7 Jan 2025 15:53:25 +0000 Subject: [PATCH 03/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20afuel=20variable?= =?UTF-8?q?=20to=20m=5Ffuel=5Famu=20for=20consistency=20across=20the=20cod?= =?UTF-8?q?ebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 4 +- process/divertor.py | 2 +- process/physics.py | 92 ++++++++++++++-------------- process/stellarator.py | 10 +-- process/vacuum.py | 2 +- source/fortran/physics_variables.f90 | 4 +- tests/integration/ref_dicts.json | 6 +- tests/unit/test_costs_1990.py | 10 +-- tests/unit/test_physics.py | 64 ++++++++++--------- 9 files changed, 99 insertions(+), 95 deletions(-) diff --git a/process/costs.py b/process/costs.py index c90c017b94..0ecdd4f835 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2194,14 +2194,14 @@ def acc2272(self): """ if ife_variables.ife != 1: # Previous calculation, using qfuel in Amps: - # 1.3 should have been physics_variables.afuel*umass/electron_charge*1000*s/day = 2.2 + # 1.3 should have been physics_variables.m_fuel_amu*umass/electron_charge*1000*s/day = 2.2 # wtgpd = burnup * qfuel * 1.3e0 # New calculation: 2 nuclei * reactions/sec * kg/nucleus * g/kg * sec/day physics_variables.wtgpd = ( 2.0e0 * physics_variables.rndfuel - * physics_variables.afuel + * physics_variables.m_fuel_amu * constants.umass * 1000.0e0 * 86400.0e0 diff --git a/process/divertor.py b/process/divertor.py index 8281d5a5e6..92f34e9715 100644 --- a/process/divertor.py +++ b/process/divertor.py @@ -78,7 +78,7 @@ def run(self, output: bool) -> None: delne = dv.prn1 * pv.dene * 1.0e-20 # scrapeoff density by main plasma pwr = pv.pdivt # power flow to divertor (MW) - aionso = pv.afuel # scrape-off layer ion mass + aionso = pv.m_fuel_amu # scrape-off layer ion mass # Divertor Zeff: either scaled or use input value zeffso = (1.0e0 + 0.8e0 * (pv.zeff - 1.0e0)) if dv.divdum == 0 else dv.zeffdiv diff --git a/process/physics.py b/process/physics.py index 1120f4f6dd..048dbaffcf 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2242,7 +2242,7 @@ def physics(self): physics_variables.tauei, physics_variables.powerht, ) = self.pcond( - physics_variables.afuel, + physics_variables.m_fuel_amu, physics_variables.alpha_power_total, physics_variables.aspect, physics_variables.bt, @@ -2823,7 +2823,7 @@ def plasma_composition(): physics_variables.f_alpha_ion = 1.0 - physics_variables.f_alpha_electron # Average atomic masses - physics_variables.afuel = ( + physics_variables.m_fuel_amu = ( 2.0 * physics_variables.f_deuterium + 3.0 * physics_variables.f_tritium + 3.0 * physics_variables.f_helium3 @@ -2835,7 +2835,7 @@ def plasma_composition(): # Density weighted mass physics_variables.aion = ( - physics_variables.afuel * physics_variables.deni + physics_variables.m_fuel_amu * physics_variables.deni + 4.0 * physics_variables.dnalp + physics_variables.dnprot + physics_variables.abeam * physics_variables.dnbeam @@ -5623,7 +5623,7 @@ def igmarcal(self): taueffz, powerhtz, ) = self.pcond( - physics_variables.afuel, + physics_variables.m_fuel_amu, physics_variables.alpha_power_total, physics_variables.aspect, physics_variables.bt, @@ -5963,7 +5963,7 @@ def bootstrap_fraction_sauter(plasma_profile: float) -> float: physics_variables.q0 + (physics_variables.q - physics_variables.q0) * roa**2 ) # Create new array of average mass of fuel portion of ions - amain = np.full_like(inverse_q, physics_variables.afuel) + amain = np.full_like(inverse_q, physics_variables.m_fuel_amu) # Create new array of average main ion charge zmain = np.full_like(inverse_q, 1.0 + physics_variables.f_helium3) @@ -6415,7 +6415,7 @@ def fhz(self, hhh): taueffz, powerhtz, ) = self.pcond( - physics_variables.afuel, + physics_variables.m_fuel_amu, physics_variables.alpha_power_total, physics_variables.aspect, physics_variables.bt, @@ -6473,7 +6473,7 @@ def fhz(self, hhh): @staticmethod def pcond( - afuel, + m_fuel_amu, alpha_power_total, aspect, bt, @@ -6505,7 +6505,7 @@ def pcond( """Routine to calculate the confinement times and the transport power loss terms. author: P J Knight, CCFE, Culham Science Centre - afuel : input real : average mass of fuel (amu) + m_fuel_amu : input real : average mass of fuel (amu) alpha_power_total : input real : alpha particle power (MW) aspect : input real : aspect ratio bt : input real : toroidal field on axis (T) @@ -6636,7 +6636,7 @@ def pcond( * kappa95**0.125e0 * qstar * dnla20 - * np.sqrt(afuel) + * np.sqrt(m_fuel_amu) / np.sqrt(ten / 10.0e0) ) @@ -6648,7 +6648,7 @@ def pcond( * rminor * bt * np.sqrt(kappa95) - * np.sqrt(afuel) + * np.sqrt(m_fuel_amu) ) elif isc == 5: # Kaye-Goldston scaling (L-mode) @@ -6659,7 +6659,7 @@ def pcond( * pcur**1.24e0 * n20**0.26e0 * rmajor**1.65e0 - * np.sqrt(afuel / 1.5e0) + * np.sqrt(m_fuel_amu / 1.5e0) / (bt**0.09e0 * rminor**0.49e0 * powerht**0.58e0) ) @@ -6676,7 +6676,7 @@ def pcond( * np.sqrt(kappa) * dnla20**0.1e0 * bt**0.2e0 - * np.sqrt(afuel) + * np.sqrt(m_fuel_amu) / np.sqrt(powerht) ) @@ -6687,7 +6687,7 @@ def pcond( * rmajor**0.3e0 * rminor**0.8e0 * kappa**0.6e0 - * afuel**0.5e0 + * m_fuel_amu**0.5e0 ) term2 = ( 0.064e0 @@ -6697,7 +6697,7 @@ def pcond( * kappa**0.5e0 * dnla20**0.6e0 * bt**0.35e0 - * afuel**0.2e0 + * m_fuel_amu**0.2e0 / powerht ) tauee = hfact * (term1 + term2) @@ -6707,7 +6707,7 @@ def pcond( tauee = ( hfact * 1.65e0 - * np.sqrt(afuel / 2.0e0) + * np.sqrt(m_fuel_amu / 2.0e0) * ( 1.2e-2 * pcur * rll**1.5e0 / np.sqrt(zeff) + 0.146e0 @@ -6728,7 +6728,7 @@ def pcond( * rmajor**1.75e0 * rminor ** (-0.37e0) * np.sqrt(kappa95) - * np.sqrt(afuel / 1.5e0) + * np.sqrt(m_fuel_amu / 1.5e0) / np.sqrt(powerht) ) @@ -6764,14 +6764,14 @@ def pcond( ** 0.6e0 ) tauee = hfact * ( - 0.085e0 * kappa95 * rminor**2 * np.sqrt(afuel) + 0.085e0 * kappa95 * rminor**2 * np.sqrt(m_fuel_amu) + 0.069e0 * n20**0.6e0 * pcur * bt**0.2e0 * rminor**0.4e0 * rmajor**1.6e0 - * np.sqrt(afuel) + * np.sqrt(m_fuel_amu) * gjaeri * kappa95**0.2e0 / powerht @@ -6787,7 +6787,7 @@ def pcond( * kappa95**0.25e0 * pcur**0.85e0 * n20**0.1e0 - * afuel**0.5e0 + * m_fuel_amu**0.5e0 / powerht**0.5e0 ) @@ -6801,7 +6801,7 @@ def pcond( * kappa**0.35e0 * dnla20**0.09e0 * bt**0.15e0 - * np.sqrt(afuel) + * np.sqrt(m_fuel_amu) / np.sqrt(powerht) ) @@ -6815,7 +6815,7 @@ def pcond( * np.sqrt(kappa) * dnla20**0.1e0 * bt**0.2e0 - * np.sqrt(afuel) + * np.sqrt(m_fuel_amu) / np.sqrt(powerht) ) term1 = ( @@ -6824,7 +6824,7 @@ def pcond( * rmajor**0.3e0 * rminor**0.8e0 * kappa**0.6e0 - * afuel**0.5e0 + * m_fuel_amu**0.5e0 ) term2 = ( 0.064e0 @@ -6834,7 +6834,7 @@ def pcond( * kappa**0.5e0 * dnla20**0.6e0 * bt**0.35e0 - * afuel**0.2e0 + * m_fuel_amu**0.2e0 / powerht ) tauit2 = hfact * (term1 + term2) @@ -6863,7 +6863,7 @@ def pcond( * kappa95**0.73e0 * dnla20**0.41e0 * bt**0.29e0 - / (powerht**0.79e0 * afuel**0.02e0) + / (powerht**0.79e0 * m_fuel_amu**0.02e0) ) elif isc == 17: # Lackner-Gottardi scaling (L-mode) @@ -6891,7 +6891,7 @@ def pcond( * kappa95**0.28e0 * dnla20**0.14e0 * bt**0.04e0 - * np.sqrt(afuel) + * np.sqrt(m_fuel_amu) / powerht**0.59e0 ) @@ -6899,7 +6899,7 @@ def pcond( tauee = ( hfact * 0.1e0 - * np.sqrt(afuel) + * np.sqrt(m_fuel_amu) * pcur**0.884e0 * rmajor**1.24e0 * rminor ** (-0.23e0) @@ -6916,7 +6916,7 @@ def pcond( * 0.082e0 * pcur**1.02e0 * bt**0.15e0 - * np.sqrt(afuel) + * np.sqrt(m_fuel_amu) * rmajor**1.60e0 / (powerht**0.47e0 * kappa**0.19e0) ) @@ -6972,7 +6972,7 @@ def pcond( * pcur**1.06e0 * bt**0.32e0 * powerht ** (-0.67e0) - * afuel**0.41e0 + * m_fuel_amu**0.41e0 * rmajor**1.79e0 * dnla20**0.17e0 * aspect**0.11e0 @@ -6993,7 +6993,7 @@ def pcond( * rmajor**1.92e0 * aspect ** (-0.08e0) * kappa**0.63e0 - * afuel**0.42e0 + * m_fuel_amu**0.42e0 ) elif isc == 27: # ELMy: ITERH-97P(y) @@ -7007,7 +7007,7 @@ def pcond( * rmajor**2.03e0 * aspect ** (-0.19e0) * kappa**0.92e0 - * afuel**0.2e0 + * m_fuel_amu**0.2e0 ) elif isc == 28: # ITER-96P (= ITER-97L) L-mode scaling @@ -7023,7 +7023,7 @@ def pcond( * rmajor**1.83e0 * aspect**0.06e0 * dnla19**0.40e0 - * afuel**0.20e0 + * m_fuel_amu**0.20e0 * powerht ** (-0.73e0) ) @@ -7034,7 +7034,7 @@ def pcond( * pcur**0.9e0 * bt**0.17e0 * dnla19**0.45e0 - * afuel**0.05e0 + * m_fuel_amu**0.05e0 * rmajor**1.316e0 * rminor**0.79e0 * kappa**0.56e0 @@ -7051,7 +7051,7 @@ def pcond( * rmajor**2.01e0 * aspect ** (-0.18e0) * dnla19**0.47e0 - * afuel**0.25e0 + * m_fuel_amu**0.25e0 * powerht ** (-0.73e0) ) @@ -7066,7 +7066,7 @@ def pcond( * rmajor**2 * kappaa**0.75e0 * aspect ** (-0.66e0) - * afuel**0.2e0 + * m_fuel_amu**0.2e0 ) elif isc == 32: # IPB98(y), ELMy H-mode scaling @@ -7082,7 +7082,7 @@ def pcond( * rmajor**1.93e0 * kappa**0.67e0 * aspect ** (-0.23e0) - * afuel**0.2e0 + * m_fuel_amu**0.2e0 ) elif isc == 33: # IPB98(y,1), ELMy H-mode scaling @@ -7098,7 +7098,7 @@ def pcond( * rmajor**2.05e0 * physics_variables.kappaa_ipb**0.72e0 * aspect ** (-0.57e0) - * afuel**0.13e0 + * m_fuel_amu**0.13e0 ) elif isc == 34: # IPB98(y,2), ELMy H-mode scaling @@ -7114,7 +7114,7 @@ def pcond( * rmajor**1.97e0 * physics_variables.kappaa_ipb**0.78e0 * aspect ** (-0.58e0) - * afuel**0.19e0 + * m_fuel_amu**0.19e0 ) elif isc == 35: # IPB98(y,3), ELMy H-mode scaling @@ -7130,7 +7130,7 @@ def pcond( * rmajor**2.15e0 * physics_variables.kappaa_ipb**0.78e0 * aspect ** (-0.64e0) - * afuel**0.20e0 + * m_fuel_amu**0.20e0 ) elif isc == 36: # IPB98(y,4), ELMy H-mode scaling @@ -7146,7 +7146,7 @@ def pcond( * rmajor**2.08e0 * physics_variables.kappaa_ipb**0.76e0 * aspect ** (-0.69e0) - * afuel**0.17e0 + * m_fuel_amu**0.17e0 ) elif isc == 37: # ISS95 stellarator scaling @@ -7192,7 +7192,7 @@ def pcond( * rmajor**2.11e0 * kappa95**0.75e0 * aspect ** (-0.3e0) - * afuel**0.14e0 + * m_fuel_amu**0.14e0 ) elif isc == 40: # "Non-power law" (NPL) Murari energy confinement scaling @@ -7200,7 +7200,7 @@ def pcond( # A new approach to the formulation and validation of scaling expressions for plasma confinement in tokamaks # A. Murari et al 2015 Nucl. Fusion 55 073009, doi:10.1088/0029-5515/55/7/073009 # Table 4. (Issue #311) - # Note that aspect ratio and M (afuel) do not appear, and B (bt) only + # Note that aspect ratio and M (m_fuel_amu) do not appear, and B (bt) only # appears in the "saturation factor" h. h = dnla19**0.448e0 / (1.0e0 + np.exp(-9.403e0 * (bt / dnla19) ** 1.365e0)) tauee = ( @@ -7215,7 +7215,7 @@ def pcond( elif isc == 41: # Beta independent dimensionless confinement scaling # C.C. Petty 2008 Phys. Plasmas 15, 080501, equation 36 - # Note that there is no dependence on the average fuel mass 'afuel' + # Note that there is no dependence on the average fuel mass 'm_fuel_amu' tauee = ( hfact * 0.052e0 @@ -7245,7 +7245,7 @@ def pcond( * rmajor**1.2345e0 * physics_variables.kappaa_ipb**0.37e0 * aspect**2.48205e0 - * afuel**0.2e0 + * m_fuel_amu**0.2e0 * qratio**0.77e0 * aspect ** (-0.9e0 * np.log(aspect)) * nratio ** (-0.22e0 * np.log(nratio)) @@ -7295,7 +7295,7 @@ def pcond( * rmajor**1.97e0 * physics_variables.kappaa_ipb**0.78e0 * aspect ** (-0.58e0) - * afuel**0.19e0 + * m_fuel_amu**0.19e0 ) elif isc == 47: # NSTX-Petty08 Hybrid @@ -7327,7 +7327,7 @@ def pcond( * rmajor**1.97e0 * physics_variables.kappaa_ipb**0.78e0 * aspect ** (-0.58e0) - * afuel**0.19e0 + * m_fuel_amu**0.19e0 ) else: @@ -7350,7 +7350,7 @@ def pcond( * rmajor**1.97e0 * physics_variables.kappaa_ipb**0.78e0 * aspect ** (-0.58e0) - * afuel**0.19e0 + * m_fuel_amu**0.19e0 ) tauee = hfact * ( diff --git a/process/stellarator.py b/process/stellarator.py index d7702a6bcd..4fe46ef86f 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -221,7 +221,7 @@ def stigma(self): physics_variables.taueff, physics_variables.powerht, ) = self.physics.pcond( - physics_variables.afuel, + physics_variables.m_fuel_amu, physics_variables.alpha_power_total, physics_variables.aspect, physics_variables.bt, @@ -894,7 +894,7 @@ def stdiv(self, output: bool): # Sound speed of particles (m/s) - c_s = np.sqrt(e / (physics_variables.afuel * constants.umass)) + c_s = np.sqrt(e / (physics_variables.m_fuel_amu * constants.umass)) # Island size (m) @@ -4408,7 +4408,7 @@ def stphys(self, output): physics_variables.taueff, physics_variables.powerht, ) = self.physics.pcond( - physics_variables.afuel, + physics_variables.m_fuel_amu, physics_variables.alpha_power_total, physics_variables.aspect, physics_variables.bt, @@ -4748,14 +4748,14 @@ def calc_neoclassics(self): * impurity_radiation_module.coreradius ) dmdt_neo_fuel = ( - dndt_neo_fuel * physics_variables.afuel * constants.proton_mass * 1.0e6 + dndt_neo_fuel * physics_variables.m_fuel_amu * constants.proton_mass * 1.0e6 ) # mg dmdt_neo_fuel_from_e = ( 4 * dndt_neo_e * physics_variables.a_plasma_surface * impurity_radiation_module.coreradius - * physics_variables.afuel + * physics_variables.m_fuel_amu * constants.proton_mass * 1.0e6 ) # kg diff --git a/process/vacuum.py b/process/vacuum.py index dcdcd96f75..424f7337e6 100644 --- a/process/vacuum.py +++ b/process/vacuum.py @@ -44,7 +44,7 @@ def run(self, output: bool) -> None: # 2 nuclei * nucleus-pairs/sec * mass/nucleus # MDK Check this!! - gasld = 2.0e0 * pv.qfuel * pv.afuel * constants.umass + gasld = 2.0e0 * pv.qfuel * pv.m_fuel_amu * constants.umass self.vacuum_model = f2py_compatible_to_string(vacv.vacuum_model) diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 28a09efbb3..6a04af8306 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -20,7 +20,7 @@ module physics_variables real(dp) :: abeam !! beam ion mass (amu) - real(dp) :: afuel + real(dp) :: m_fuel_amu !! average mass of fuel portion of ions (amu) real(dp) :: aion @@ -948,7 +948,7 @@ subroutine init_physics_variables implicit none abeam = 0.0D0 - afuel = 0.0D0 + m_fuel_amu = 0.0D0 aion = 0.0D0 alphaj = 1.0D0 alphan = 0.25D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 277dbd7b86..ffd087b08f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -221,7 +221,7 @@ ], "admv": 100000.0, "admvol": 0.0, - "afuel": 0.0, + "m_fuel_amu": 0.0, "afw": 0.006, "afwi": 0.008, "afwo": 0.008, @@ -8794,7 +8794,7 @@ "adj_appr": "", "admv": "administration building volume (m3)", "admvol": "volume of administration buildings (m3)", - "afuel": "average mass of fuel portion of ions (amu)", + "m_fuel_amu": "average mass of fuel portion of ions (amu)", "afw": "radius of first wall cooling channels (m)", "afwi": "inner radius of inboard first wall/blanket coolant channels (stellarator only) (m)", "afwo": "inner radius of outboard first wall/blanket coolant channels (stellarator only) (m)", @@ -19062,7 +19062,7 @@ "physics_variables": [ "ipnlaws", "abeam", - "afuel", + "m_fuel_amu", "aion", "alphaj", "alphan", diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 63a8a47105..292aa77b28 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -183,7 +183,7 @@ def test_acc2272(monkeypatch, costs): :type monkeypatch: object """ monkeypatch.setattr(fortran.physics_variables, "rndfuel", 7.158e20) - monkeypatch.setattr(fortran.physics_variables, "afuel", 2.5) + monkeypatch.setattr(fortran.physics_variables, "m_fuel_amu", 2.5) monkeypatch.setattr(cost_variables, "fkind", 1) monkeypatch.setattr(costs, "c2271", 0) @@ -4275,7 +4275,7 @@ class Acc2272Param(NamedTuple): rndfuel: Any = None - afuel: Any = None + m_fuel_amu: Any = None c227: Any = None @@ -4300,7 +4300,7 @@ class Acc2272Param(NamedTuple): edrive=5000000, wtgpd=0, rndfuel=7.0799717510383796e20, - afuel=2.5, + m_fuel_amu=2.5, c227=0, c2272=0, c22=0, @@ -4316,7 +4316,7 @@ class Acc2272Param(NamedTuple): edrive=5000000, wtgpd=507.88376577416528, rndfuel=7.0777619721108953e20, - afuel=2.5, + m_fuel_amu=2.5, c227=284.96904049038437, c2272=114.02873340990777, c22=3474.7391916096453, @@ -4354,7 +4354,7 @@ def test_acc2272_rut(acc2272param, monkeypatch, costs): monkeypatch.setattr(physics_variables, "rndfuel", acc2272param.rndfuel) - monkeypatch.setattr(physics_variables, "afuel", acc2272param.afuel) + monkeypatch.setattr(physics_variables, "m_fuel_amu", acc2272param.m_fuel_amu) monkeypatch.setattr(costs, "c227", acc2272param.c227) diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 4a8bcce3c6..1696c5d33c 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -317,7 +317,7 @@ class BootstrapFractionSauterParam(NamedTuple): q0: Any = None - afuel: Any = None + m_fuel_amu: Any = None zeff: Any = None @@ -370,7 +370,7 @@ class BootstrapFractionSauterParam(NamedTuple): ti=12.570861186498382, triang=0.5, q0=1, - afuel=2.5, + m_fuel_amu=2.5, zeff=2.5211399464385624, rhopedn=0.9400000000000001, bt=5.326133750416047, @@ -425,7 +425,9 @@ def test_bootstrap_fraction_sauter(bootstrapfractionsauterparam, monkeypatch, ph monkeypatch.setattr(physics_variables, "q0", bootstrapfractionsauterparam.q0) - monkeypatch.setattr(physics_variables, "afuel", bootstrapfractionsauterparam.afuel) + monkeypatch.setattr( + physics_variables, "m_fuel_amu", bootstrapfractionsauterparam.m_fuel_amu + ) monkeypatch.setattr(physics_variables, "zeff", bootstrapfractionsauterparam.zeff) @@ -1137,7 +1139,7 @@ class PlasmaCompositionParam(NamedTuple): f_alpha_electron: Any = None - afuel: Any = None + m_fuel_amu: Any = None f_tritium: Any = None @@ -1223,7 +1225,7 @@ class PlasmaCompositionParam(NamedTuple): expected_f_alpha_electron: Any = None - expected_afuel: Any = None + expected_m_fuel_amu: Any = None expected_deni: Any = None @@ -1293,7 +1295,7 @@ class PlasmaCompositionParam(NamedTuple): alphat=1.45, ignite=0, f_alpha_electron=0, - afuel=0, + m_fuel_amu=0, f_tritium=0.5, deni=0, aion=0, @@ -1351,7 +1353,7 @@ class PlasmaCompositionParam(NamedTuple): 5.0000000000000021e-06, ], expected_f_alpha_electron=0.6845930883190634, - expected_afuel=2.5, + expected_m_fuel_amu=2.5, expected_deni=5.8589175702454272e19, expected_aion=2.7265017998473029, expected_dnitot=6.6125550702454276e19, @@ -1413,7 +1415,7 @@ class PlasmaCompositionParam(NamedTuple): alphat=1.45, ignite=0, f_alpha_electron=0.6845930883190634, - afuel=2.5, + m_fuel_amu=2.5, f_tritium=0.5, deni=5.8589175702454272e19, aion=2.7265017998473029, @@ -1471,7 +1473,7 @@ class PlasmaCompositionParam(NamedTuple): 5.0000000000000021e-06, ), expected_f_alpha_electron=0.73096121787894142, - expected_afuel=2.5, + expected_m_fuel_amu=2.5, expected_deni=5.8576156204039725e19, expected_aion=2.7262064639685937, expected_dnitot=6.6125550702454276e19, @@ -1533,7 +1535,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): physics_variables, "f_alpha_electron", plasmacompositionparam.f_alpha_electron ) - monkeypatch.setattr(physics_variables, "afuel", plasmacompositionparam.afuel) + monkeypatch.setattr( + physics_variables, "m_fuel_amu", plasmacompositionparam.m_fuel_amu + ) monkeypatch.setattr( physics_variables, "f_tritium", plasmacompositionparam.f_tritium @@ -1643,8 +1647,8 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): plasmacompositionparam.expected_f_alpha_electron ) - assert physics_variables.afuel == pytest.approx( - plasmacompositionparam.expected_afuel + assert physics_variables.m_fuel_amu == pytest.approx( + plasmacompositionparam.expected_m_fuel_amu ) assert physics_variables.deni == pytest.approx(plasmacompositionparam.expected_deni) @@ -2156,7 +2160,7 @@ class PcondParam(NamedTuple): ignite: Any = None - afuel: Any = None + m_fuel_amu: Any = None alpha_power_total: Any = None @@ -2236,7 +2240,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=32, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2280,7 +2284,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=33, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2324,7 +2328,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=34, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2368,7 +2372,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=35, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2412,7 +2416,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=36, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2456,7 +2460,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=37, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2500,7 +2504,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=38, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2544,7 +2548,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=39, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2588,7 +2592,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=40, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2632,7 +2636,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=41, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2676,7 +2680,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=42, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2720,7 +2724,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=43, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2764,7 +2768,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=44, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2808,7 +2812,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=45, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2852,7 +2856,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=46, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2896,7 +2900,7 @@ class PcondParam(NamedTuple): iinvqd=1, isc=47, ignite=0, - afuel=2.5, + m_fuel_amu=2.5, alpha_power_total=319.03020327154269, aspect=3, bt=5.2375830857646202, @@ -2963,7 +2967,7 @@ def test_pcond(pcondparam, monkeypatch, physics): iinvqd=pcondparam.iinvqd, isc=pcondparam.isc, ignite=pcondparam.ignite, - afuel=pcondparam.afuel, + m_fuel_amu=pcondparam.m_fuel_amu, alpha_power_total=pcondparam.alpha_power_total, aspect=pcondparam.aspect, bt=pcondparam.bt, From c4dfd3d9f7f32ad49c7d9e5ecaf27ed7add8161a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 7 Jan 2025 16:13:48 +0000 Subject: [PATCH 04/48] =?UTF-8?q?=F0=9F=94=84=20Update=20fuel=20species=20?= =?UTF-8?q?mass=20calculations=20to=20use=20constants=20for=20improved=20a?= =?UTF-8?q?ccuracy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/physics.py | 17 ++++++++++------- source/fortran/constants.f90 | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/process/physics.py b/process/physics.py index 048dbaffcf..9269a601de 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2822,21 +2822,24 @@ def plasma_composition(): ) physics_variables.f_alpha_ion = 1.0 - physics_variables.f_alpha_electron - # Average atomic masses + # Average atomic masses of injected fuel species physics_variables.m_fuel_amu = ( - 2.0 * physics_variables.f_deuterium - + 3.0 * physics_variables.f_tritium - + 3.0 * physics_variables.f_helium3 + (constants.m_deuteron_amu * physics_variables.f_deuterium) + + (constants.m_triton_amu * physics_variables.f_tritium) + + (constants.m_helion_amu * physics_variables.f_helium3) ) + + # Average atomic masses of injected fuel species in the neutral beams + # Only deuterium and tritium in the beams physics_variables.abeam = ( - 2.0 * (1.0 - current_drive_variables.f_tritium_beam) - + 3.0 * current_drive_variables.f_tritium_beam + (constants.m_deuteron_amu * (1.0 - current_drive_variables.f_tritium_beam)) + + (constants.m_triton_amu * current_drive_variables.f_tritium_beam) ) # Density weighted mass physics_variables.aion = ( physics_variables.m_fuel_amu * physics_variables.deni - + 4.0 * physics_variables.dnalp + + (constants.m_alpha_amu * physics_variables.dnalp) + physics_variables.dnprot + physics_variables.abeam * physics_variables.dnbeam ) diff --git a/source/fortran/constants.f90 b/source/fortran/constants.f90 index e057d1231b..28011ab33d 100644 --- a/source/fortran/constants.f90 +++ b/source/fortran/constants.f90 @@ -77,11 +77,21 @@ module constants ! https://physics.nist.gov/cgi-bin/cuu/Value?md|search_for=DEUTERON+MASS real(dp), parameter :: deuteron_mass = 3.3435837768D-27 + ! Deuteron mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/cuu/Value?mdu + real(dp), parameter :: m_deuteron_amu = 2.013553212544 + ! Triton mass [kg] ! Reference: National Institute of Standards and Technology (NIST) ! https://physics.nist.gov/cgi-bin/cuu/Value?mt|search_for=TRITON+MASS real(dp), parameter :: triton_mass = 5.0073567512D-27 + ! Triton mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/cuu/Value?art + real(dp), parameter :: m_triton_amu = 3.01550071597 + ! Neutron mass [kg] ! Reference: National Institute of Standards and Technology (NIST) ! https://physics.nist.gov/cgi-bin/cuu/Value?mn|search_for=NEUTRON+MASS @@ -92,11 +102,21 @@ module constants ! https://physics.nist.gov/cgi-bin/cuu/Value?mal|search_for=alpha+mass real(dp), parameter :: alpha_mass = 6.6446573450D-27 + ! Alpha particle mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/cuu/Value?malu + real(dp), parameter :: m_alpha_amu = 4.001506179129 + ! Helion (3He) mass [kg] ! Reference: National Institute of Standards and Technology (NIST) ! https://physics.nist.gov/cgi-bin/cuu/Value?mh|search_for=HELION real(dp), parameter :: helion_mass = 5.0064127862D-27 + ! Helion (3He) mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/cuu/Value?arh + real(dp), parameter :: m_helion_amu = 3.014932246932 + ! Speed of light in vacuum (c) [m/s] ! Reference: National Institute of Standards and Technology (NIST) ! https://physics.nist.gov/cgi-bin/cuu/Value?c|search_for=light From 7d8422c6e7325b6bd430ab572541fc01b4795705 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 7 Jan 2025 16:34:33 +0000 Subject: [PATCH 05/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20abeam=20variable?= =?UTF-8?q?=20to=20m=5Fbeam=5Famu=20for=20consistency=20across=20documenta?= =?UTF-8?q?tion=20and=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NBI/culham_nb.md | 6 ++-- .../heating_and_current_drive/NBI/iter_nb.md | 2 +- process/current_drive.py | 28 +++++++++---------- process/physics.py | 4 +-- source/fortran/physics_variables.f90 | 4 +-- tests/integration/ref_dicts.json | 6 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md index b3b623455d..ca1ce25326 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md @@ -66,7 +66,7 @@ plus correction terms outlined in Culham Report AEA FUS 172. | Input | Description | | :---------- | :----------------------------------- | -| $\mathtt{abeam}$ | beam ion mass (amu) | +| $\mathtt{m_beam_amu}$ | beam ion mass (amu) | | $\mathtt{alphan}$, $\alpha_n$ | density profile factor | | $\mathtt{alphat}$, $\alpha_T$ | temperature profile factor | | $\mathtt{aspect}$, $A$ | aspect ratio | @@ -108,7 +108,7 @@ Critical energy ($\text{MeV}$) (power to electrons = power to ions) (IPDG89) N.B. ten is in keV $$ -\mathtt{ecrit} = 0.01 \times \mathtt{abeam} \times \mathtt{ten} +\mathtt{ecrit} = 0.01 \times \mathtt{m_beam_amu} \times \mathtt{ten} $$ Beam energy in MeV @@ -128,7 +128,7 @@ $$ $$ $$ -\mathtt{yj} = \frac{0.8 \times Z_{\text{eff}}}{\mathtt{abeam}} +\mathtt{yj} = \frac{0.8 \times Z_{\text{eff}}}{\mathtt{m_beam_amu}} $$ Fitting function J0(x,y) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md index 56cca15733..e6d2ef968d 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md @@ -59,7 +59,7 @@ ITER Documentation Series No.10, IAEA/ITER/DS/10, IAEA, Vienna, 1990 | Input | Description | |---------|-----------------------------------------------------------| -| $\mathtt{abeam}$, $m_{\text{u,ion}}$ | Beam ion mass ($\text{amu}$) | +| $\mathtt{m_beam_amu}$, $m_{\text{u,ion}}$ | Beam ion mass ($\text{amu}$) | | $\mathtt{alphan}$ | Density profile factor | | $\mathtt{alphat}$ | Temperature profile factor | | $\mathtt{aspect}$, $A$ | Aspect ratio | diff --git a/process/current_drive.py b/process/current_drive.py index 29b513ef8e..4ebda40d95 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -1310,7 +1310,7 @@ def iternb(self): # Calculate beam stopping cross-section sigstop = self.sigbeam( - current_drive_variables.beam_energy / physics_variables.abeam, + current_drive_variables.beam_energy / physics_variables.m_beam_amu, physics_variables.te, physics_variables.dene, physics_variables.ralpne, @@ -1332,7 +1332,7 @@ def iternb(self): # Power split to ions / electrons fpion = self.cfnbi( - physics_variables.abeam, + physics_variables.m_beam_amu, current_drive_variables.beam_energy, physics_variables.ten, physics_variables.dene, @@ -1344,7 +1344,7 @@ def iternb(self): # Current drive efficiency effnbss = current_drive_variables.frbeam * self.etanb( - physics_variables.abeam, + physics_variables.m_beam_amu, physics_variables.alphan, physics_variables.alphat, physics_variables.aspect, @@ -1580,7 +1580,7 @@ def culnbi(self): # Calculate beam stopping cross-section sigstop = self.sigbeam( - current_drive_variables.beam_energy / physics_variables.abeam, + current_drive_variables.beam_energy / physics_variables.m_beam_amu, physics_variables.te, physics_variables.dene, physics_variables.ralpne, @@ -1606,7 +1606,7 @@ def culnbi(self): # Power split to ions / electrons fpion = self.cfnbi( - physics_variables.abeam, + physics_variables.m_beam_amu, current_drive_variables.beam_energy, physics_variables.ten, physics_variables.dene, @@ -1619,7 +1619,7 @@ def culnbi(self): # Current drive efficiency effnbss = self.etanb2( - physics_variables.abeam, + physics_variables.m_beam_amu, physics_variables.alphan, physics_variables.alphat, physics_variables.aspect, @@ -1694,7 +1694,7 @@ def lhrad(self): def etanb2( self, - abeam, + m_beam_amu, alphan, alphat, aspect, @@ -1712,7 +1712,7 @@ def etanb2( using the ITER 1990 formulation, plus correction terms outlined in Culham Report AEA FUS 172 author: P J Knight, CCFE, Culham Science Centre - abeam : input real : beam ion mass (amu) + m_beam_amu : input real : beam ion mass (amu) alphan : input real : density profile factor alphat : input real : temperature profile factor aspect : input real : aspect ratio @@ -1747,7 +1747,7 @@ def etanb2( # Critical energy (MeV) (power to electrons = power to ions) (IPDG89) # N.B. ten is in keV - ecrit = 0.01 * abeam * ten + ecrit = 0.01 * m_beam_amu * ten # Beam energy in MeV ebmev = beam_energy / 1e3 @@ -1756,7 +1756,7 @@ def etanb2( xjs = ebmev / (bbd * ecrit) xj = np.sqrt(xjs) - yj = 0.8 * zeff / abeam + yj = 0.8 * zeff / m_beam_amu # Fitting function J0(x,y) j0 = xjs / (4.0 + 3.0 * yj + xjs * (xj + 1.39 + 0.61 * yj**0.7)) @@ -1876,11 +1876,11 @@ def lheval(self, drfind, rratio): return e1 - e2 - def etanb(self, abeam, alphan, alphat, aspect, dene, ebeam, rmajor, ten, zeff): + def etanb(self, m_beam_amu, alphan, alphat, aspect, dene, ebeam, rmajor, ten, zeff): """Routine to find neutral beam current drive efficiency using the ITER 1990 formulation author: P J Knight, CCFE, Culham Science Centre - abeam : input real : beam ion mass (amu) + m_beam_amu : input real : beam ion mass (amu) alphan : input real : density profile factor alphat : input real : temperature profile factor aspect : input real : aspect ratio @@ -1901,10 +1901,10 @@ def etanb(self, abeam, alphan, alphat, aspect, dene, ebeam, rmajor, ten, zeff): dene20 = 1e-20 * dene # Ratio of E_beam/E_crit - xjs = ebeam / (bbd * 10.0 * abeam * ten) + xjs = ebeam / (bbd * 10.0 * m_beam_amu * ten) xj = np.sqrt(xjs) - yj = 0.8 * zeff / abeam + yj = 0.8 * zeff / m_beam_amu rjfunc = xjs / (4.0 + 3.0 * yj + xjs * (xj + 1.39 + 0.61 * yj**0.7)) diff --git a/process/physics.py b/process/physics.py index 9269a601de..c41e987f1b 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2831,7 +2831,7 @@ def plasma_composition(): # Average atomic masses of injected fuel species in the neutral beams # Only deuterium and tritium in the beams - physics_variables.abeam = ( + physics_variables.m_beam_amu = ( (constants.m_deuteron_amu * (1.0 - current_drive_variables.f_tritium_beam)) + (constants.m_triton_amu * current_drive_variables.f_tritium_beam) ) @@ -2841,7 +2841,7 @@ def plasma_composition(): physics_variables.m_fuel_amu * physics_variables.deni + (constants.m_alpha_amu * physics_variables.dnalp) + physics_variables.dnprot - + physics_variables.abeam * physics_variables.dnbeam + + physics_variables.m_beam_amu * physics_variables.dnbeam ) for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 6a04af8306..65eeb37ba2 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -17,7 +17,7 @@ module physics_variables integer, parameter :: ipnlaws = 50 !! number of energy confinement time scaling laws - real(dp) :: abeam + real(dp) :: m_beam_amu !! beam ion mass (amu) real(dp) :: m_fuel_amu @@ -947,7 +947,7 @@ subroutine init_physics_variables !! Initialise module variables implicit none - abeam = 0.0D0 + m_beam_amu = 0.0D0 m_fuel_amu = 0.0D0 aion = 0.0D0 alphaj = 1.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index ffd087b08f..27336300a0 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -106,7 +106,7 @@ "a_site_service_bldg": 8300.0, "a_tf_ins": 0.0, "a_tf_steel": 0.0, - "abeam": 0.0, + "m_beam_amu": 0.0, "abktflnc": 5.0, "abserr_sol": 0.0001, "absroutine": null, @@ -8777,7 +8777,7 @@ "a_site_service_bldg": "Floor area of site service building in m^2", "a_tf_ins": "Inboard coil insulation cross-section per coil [m2]", "a_tf_steel": "Inboard coil steel coil cross-sectional area [m2]", - "abeam": "beam ion mass (amu)", + "m_beam_amu": "beam ion mass (amu)", "abktflnc": "allowable first wall/blanket neutron fluence (MW-yr/m2) (`blktmodel=0`)", "abserr_sol": "Absolute contribution to the error tolerance in the Kallenbach divertor model", "absroutine": "", @@ -19061,7 +19061,7 @@ ], "physics_variables": [ "ipnlaws", - "abeam", + "m_beam_amu", "m_fuel_amu", "aion", "alphaj", From 11bfe6c12fdb1a4f2f2cc14e6a223f46c7237e28 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 7 Jan 2025 16:36:47 +0000 Subject: [PATCH 06/48] :white_check_mark: Update unit tests failing due to using proper fuel species atomic masses --- tests/unit/test_fw.py | 2 +- tests/unit/test_physics.py | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/unit/test_fw.py b/tests/unit/test_fw.py index 4f949f37d4..c302c7b2eb 100644 --- a/tests/unit/test_fw.py +++ b/tests/unit/test_fw.py @@ -179,7 +179,7 @@ def test_heat_transfer(fw): cf=5184.9330299967578, viscf=4.0416219836935569e-05, kf=0.3211653052986152, - ) == pytest.approx(1929.2210192752084) + ) == pytest.approx(1929.221015448999) def test_fw_thermal_conductivity(monkeypatch, fw): diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 1696c5d33c..2508c6bb7f 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1175,7 +1175,7 @@ class PlasmaCompositionParam(NamedTuple): rnfene: Any = None - abeam: Any = None + m_beam_amu: Any = None dlamie: Any = None @@ -1243,7 +1243,7 @@ class PlasmaCompositionParam(NamedTuple): expected_dnz: Any = None - expected_abeam: Any = None + expected_m_beam_amu: Any = None expected_dlamie: Any = None @@ -1313,7 +1313,7 @@ class PlasmaCompositionParam(NamedTuple): pcoef=0, alpha_rate_density_total=0, rnfene=0, - abeam=0, + m_beam_amu=0, dlamie=0, te=12, proton_rate_density=0, @@ -1353,16 +1353,16 @@ class PlasmaCompositionParam(NamedTuple): 5.0000000000000021e-06, ], expected_f_alpha_electron=0.6845930883190634, - expected_m_fuel_amu=2.5, + expected_m_fuel_amu=2.5145269632339478, expected_deni=5.8589175702454272e19, - expected_aion=2.7265017998473029, + expected_aion=2.7395439636787726, expected_dnitot=6.6125550702454276e19, expected_zeffai=0.43248858851447464, expected_f_alpha_ion=0.3154069116809366, expected_dlamee=17.510652035055571, expected_zeff=2.0909945616489103, expected_dnz=28875000000000004, - expected_abeam=2.0000010000000001, + expected_m_beam_amu=2.01355414, expected_dlamie=17.810652035055568, expected_dnalp=7.5e18, expected_dnprot=7500000000000000, @@ -1418,7 +1418,7 @@ class PlasmaCompositionParam(NamedTuple): m_fuel_amu=2.5, f_tritium=0.5, deni=5.8589175702454272e19, - aion=2.7265017998473029, + aion=2.7395439636787726, dnitot=6.6125550702454276e19, protium=0, zeffai=0.43248858851447464, @@ -1433,7 +1433,7 @@ class PlasmaCompositionParam(NamedTuple): pcoef=1.0521775929921553, alpha_rate_density_total=1.973996644759543e17, rnfene=0, - abeam=2.0000010000000001, + m_beam_amu=2.01355414, dlamie=17.810652035055568, te=12, proton_rate_density=540072280299564.38, @@ -1473,16 +1473,16 @@ class PlasmaCompositionParam(NamedTuple): 5.0000000000000021e-06, ), expected_f_alpha_electron=0.73096121787894142, - expected_m_fuel_amu=2.5, + expected_m_fuel_amu=2.5145269632339478, expected_deni=5.8576156204039725e19, - expected_aion=2.7262064639685937, + expected_aion=2.739245767577763, expected_dnitot=6.6125550702454276e19, expected_zeffai=0.43258985127992111, expected_f_alpha_ion=0.26903878212105858, expected_dlamee=17.510652035055571, expected_zeff=2.0909945616489103, expected_dnz=28875000000000004, - expected_abeam=2.0000010000000001, + expected_m_beam_amu=2.01355414, expected_dlamie=17.810652035055568, expected_dnalp=7.5e18, expected_dnprot=20519498414548412, @@ -1581,7 +1581,7 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): monkeypatch.setattr(physics_variables, "rnfene", plasmacompositionparam.rnfene) - monkeypatch.setattr(physics_variables, "abeam", plasmacompositionparam.abeam) + monkeypatch.setattr(physics_variables, "m_beam_amu", plasmacompositionparam.m_beam_amu) monkeypatch.setattr(physics_variables, "dlamie", plasmacompositionparam.dlamie) @@ -1675,8 +1675,8 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): assert physics_variables.dnz == pytest.approx(plasmacompositionparam.expected_dnz) - assert physics_variables.abeam == pytest.approx( - plasmacompositionparam.expected_abeam + assert physics_variables.m_beam_amu == pytest.approx( + plasmacompositionparam.expected_m_beam_amu ) assert physics_variables.dlamie == pytest.approx( From f110d6fa85d9f0c34538b8a1260243928a6f09a1 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 08:58:29 +0000 Subject: [PATCH 07/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20dnalp=20variable?= =?UTF-8?q?=20to=20nd=5Falphas=20for=20consistency=20across=20the=20codeba?= =?UTF-8?q?se?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++----- process/physics.py | 33 +++++++++---------- process/stellarator.py | 8 ++--- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++++++--------- tests/integration/data/scan_MFILE.DAT | 18 +++++----- tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_neoclassics.py | 6 ++-- tests/unit/test_physics.py | 32 ++++++++++-------- 20 files changed, 90 insertions(+), 87 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index e1dd43cb7a..6805147096 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -372,7 +372,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2127E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5392E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6024E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.6709E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6709E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8502E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4748E+19 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 17f0a398cf..40e3fde776 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -373,7 +373,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.7723E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 623d382a90..0d7165fcac 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -373,7 +373,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.7723E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index c62ec1efeb..b94a467e0f 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -373,7 +373,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.7723E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 2f46985883..04186a94db 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -373,7 +373,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.7723E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 653413b08b..3793276fce 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -228,7 +228,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -1223,7 +1223,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -2218,7 +2218,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -3213,7 +3213,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -4208,7 +4208,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -5203,7 +5203,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -6198,7 +6198,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -7193,7 +7193,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -8188,7 +8188,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP diff --git a/process/physics.py b/process/physics.py index c41e987f1b..9d59606734 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2322,7 +2322,7 @@ def physics(self): physics_variables.alpha_rate_density_total, physics_variables.plasma_current, sbar, - physics_variables.dnalp, + physics_variables.nd_alphas, physics_variables.taueff, physics_variables.vol_plasma, ) @@ -2665,7 +2665,7 @@ def plasma_composition(): and is used in conjunction with the new impurity radiation model """ # Alpha ash portion - physics_variables.dnalp = physics_variables.dene * physics_variables.ralpne + physics_variables.nd_alphas = physics_variables.dene * physics_variables.ralpne # Protons # This calculation will be wrong on the first call as the particle @@ -2675,12 +2675,12 @@ def plasma_composition(): if physics_variables.alpha_rate_density_total < 1.0e-6: # not calculated yet... physics_variables.dnprot = max( physics_variables.protium * physics_variables.dene, - physics_variables.dnalp * (physics_variables.f_helium3 + 1.0e-3), + physics_variables.nd_alphas * (physics_variables.f_helium3 + 1.0e-3), ) # rough estimate else: physics_variables.dnprot = max( physics_variables.protium * physics_variables.dene, - physics_variables.dnalp + physics_variables.nd_alphas * physics_variables.proton_rate_density / physics_variables.alpha_rate_density_total, ) @@ -2707,7 +2707,7 @@ def plasma_composition(): # znfuel is the sum of Zi.ni for the three fuel ions znfuel = ( physics_variables.dene - - 2.0 * physics_variables.dnalp + - 2.0 * physics_variables.nd_alphas - physics_variables.dnprot - physics_variables.dnbeam - znimp @@ -2750,7 +2750,7 @@ def plasma_composition(): # Total ion density physics_variables.dnitot = ( physics_variables.deni - + physics_variables.dnalp + + physics_variables.nd_alphas + physics_variables.dnprot + physics_variables.dnbeam + physics_variables.dnz @@ -2832,14 +2832,13 @@ def plasma_composition(): # Average atomic masses of injected fuel species in the neutral beams # Only deuterium and tritium in the beams physics_variables.m_beam_amu = ( - (constants.m_deuteron_amu * (1.0 - current_drive_variables.f_tritium_beam)) - + (constants.m_triton_amu * current_drive_variables.f_tritium_beam) - ) + constants.m_deuteron_amu * (1.0 - current_drive_variables.f_tritium_beam) + ) + (constants.m_triton_amu * current_drive_variables.f_tritium_beam) # Density weighted mass physics_variables.aion = ( physics_variables.m_fuel_amu * physics_variables.deni - + (constants.m_alpha_amu * physics_variables.dnalp) + + (constants.m_alpha_amu * physics_variables.nd_alphas) + physics_variables.dnprot + physics_variables.m_beam_amu * physics_variables.dnbeam ) @@ -2858,7 +2857,7 @@ def plasma_composition(): physics_variables.f_deuterium * physics_variables.deni / 2.0 + physics_variables.f_tritium * physics_variables.deni / 3.0 + 4.0 * physics_variables.f_helium3 * physics_variables.deni / 3.0 - + physics_variables.dnalp + + physics_variables.nd_alphas + physics_variables.dnprot + (1.0 - current_drive_variables.f_tritium_beam) * physics_variables.dnbeam @@ -2885,7 +2884,7 @@ def phyaux( alpha_rate_density_total, plasma_current, sbar, - dnalp, + nd_alphas, taueff, vol_plasma, ): @@ -2894,7 +2893,7 @@ def phyaux( aspect : input real : plasma aspect ratio dene : input real : electron density (/m3) deni : input real : fuel ion density (/m3) - dnalp : input real : alpha ash density (/m3) + nd_alphas : input real : alpha ash density (/m3) fusion_rate_density_total : input real : fusion reaction rate from plasma and beams (/m3/s) alpha_rate_density_total : input real : alpha particle production rate (/m3/s) plasma_current: input real : plasma current (A) @@ -2924,7 +2923,7 @@ def phyaux( # Number of alphas / alpha production rate if alpha_rate_density_total != 0.0: - taup = dnalp / alpha_rate_density_total + taup = nd_alphas / alpha_rate_density_total else: # only likely if DD is only active fusion reaction taup = 0.0 @@ -2941,7 +2940,7 @@ def phyaux( # initial fuel ion-pairs/m3 = burnt fuel ion-pairs/m3 + unburnt fuel-ion pairs/m3 # Remember that unburnt fuel-ion pairs/m3 = 0.5 * unburnt fuel-ions/m3 if physics_variables.burnup_in <= 1.0e-9: - burnup = dnalp / (dnalp + 0.5 * deni) / physics_variables.tauratio + burnup = nd_alphas / (nd_alphas + 0.5 * deni) / physics_variables.tauratio else: burnup = physics_variables.burnup_in # Fuel burnup rate (reactions/second) (previously Amps) @@ -3954,8 +3953,8 @@ def outplas(self): po.ovarre( self.outfile, "Helium ion density (thermalised ions only) (/m3)", - "(dnalp)", - physics_variables.dnalp, + "(nd_alphas)", + physics_variables.nd_alphas, "OP ", ) po.ovarre( diff --git a/process/stellarator.py b/process/stellarator.py index 4fe46ef86f..785f4f4268 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4469,7 +4469,7 @@ def stphys(self, output): physics_variables.alpha_rate_density_total, physics_variables.plasma_current, sbar, - physics_variables.dnalp, + physics_variables.nd_alphas, physics_variables.taueff, physics_variables.vol_plasma, ) @@ -5155,7 +5155,7 @@ def init_profile_values_from_PROCESS(self, rho): * (1 - rho**2) ** physics_variables.alphan ) densa = ( - physics_variables.dnalp + physics_variables.nd_alphas * (1 + physics_variables.alphan) * (1 - rho**2) ** physics_variables.alphan ) @@ -5236,7 +5236,7 @@ def init_profile_values_from_PROCESS(self, rho): * 1.0 / physics_variables.rminor * rho - * physics_variables.dnalp + * physics_variables.nd_alphas * (1 + physics_variables.alphan) * (1.0 - rho**2) ** (physics_variables.alphan - 1.0) * physics_variables.alphan @@ -5365,7 +5365,7 @@ def neoclassics_calc_nu_star_fromT(self, iota): physics_variables.dene, physics_variables.deni * physics_variables.f_deuterium, physics_variables.deni * (1 - physics_variables.f_deuterium), - physics_variables.dnalp, + physics_variables.nd_alphas, ]) mass = np.array([ diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 65eeb37ba2..6b9feefb59 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -147,7 +147,7 @@ module physics_variables real(dp), dimension(8) :: dlimit !! density limit (/m3) as calculated using various models - real(dp) :: dnalp + real(dp) :: nd_alphas !! thermal alpha density (/m3) real(dp) :: dnbeam @@ -990,7 +990,7 @@ subroutine init_physics_variables dlamee = 0.0D0 dlamie = 0.0D0 dlimit = 0.0D0 - dnalp = 0.0D0 + nd_alphas = 0.0D0 dnbeam = 0.0D0 beam_density_out = 0.0D0 beta_norm_max = 3.5D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 443aa0dc3d..1977feaf16 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -372,7 +372,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.7723E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index b03f73eba2..9d60605744 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -373,7 +373,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.7723E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 0536e43984..a0a49bd76c 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -373,7 +373,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.7723E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 769426d472..ceaea0466e 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -373,7 +373,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.7723E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index a407b53233..bb6af464a3 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -369,7 +369,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1228E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4478E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6305E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.6846E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8769E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3950E+19 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index a29b8f3a53..7dc7de28c4 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -374,7 +374,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2224E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6171E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5133E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 5.9913E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9913E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6531E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4167E+19 OP @@ -1537,7 +1537,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2520E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6475E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5610E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 5.9829E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9829E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6508E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4453E+19 OP @@ -2700,7 +2700,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2702E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6635E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6426E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.0041E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0041E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6567E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4676E+19 OP @@ -3863,7 +3863,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2309E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6217E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6633E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.0286E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0286E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6696E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4348E+19 OP @@ -5026,7 +5026,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2331E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6270E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6208E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 5.9989E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9989E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6614E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4323E+19 OP @@ -6189,7 +6189,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2154E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6165E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5724E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 5.9271E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9271E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6415E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4072E+19 OP @@ -7352,7 +7352,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1782E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5769E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6030E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 5.9503E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9503E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6542E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3766E+19 OP @@ -8515,7 +8515,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1834E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5815E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6582E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 5.9558E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9558E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6557E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3843E+19 OP @@ -9678,7 +9678,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1695E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5692E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6882E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 5.9402E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9402E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6513E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3714E+19 OP @@ -10841,7 +10841,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1513E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5453E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7315E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 5.9956E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9956E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6731E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3618E+19 OP @@ -12004,7 +12004,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1736E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5647E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7253E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.0256E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0256E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6815E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3850E+19 OP @@ -13167,7 +13167,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1709E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5634E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6792E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.0110E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0110E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6774E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3790E+19 OP @@ -14330,7 +14330,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1493E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5369E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7179E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.0597E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0597E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6975E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3655E+19 OP @@ -15493,7 +15493,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1714E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5540E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7754E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.1093E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1093E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.7114E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3931E+19 OP @@ -16656,7 +16656,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1948E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5721E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.8337E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.1614E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1614E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.7260E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4220E+19 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 10b5d6dae7..0db55ef673 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -228,7 +228,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -1223,7 +1223,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -2218,7 +2218,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -3213,7 +3213,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -4208,7 +4208,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -5203,7 +5203,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -6198,7 +6198,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -7193,7 +7193,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP @@ -8188,7 +8188,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 4.8649E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 27336300a0..dd04468320 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1667,7 +1667,7 @@ 0.0 ], "dlscal": 0.0, - "dnalp": 0.0, + "nd_alphas": 0.0, "dnbeam": 0.0, "beam_density_out": 0.0, "beta_norm_max": 3.5, @@ -9314,7 +9314,7 @@ "dlamie": "ion-electron coulomb logarithm", "dlimit": "density limit (/m3) as calculated using various models", "dlscal": "vacuum system duct length scaling", - "dnalp": "thermal alpha density (/m3)", + "nd_alphas": "thermal alpha density (/m3)", "dnbeam": "hot beam ion density, variable (/m3)", "beam_density_out": "hot beam ion density from calculation (/m3)", "beta_norm_max": "Troyon-like coefficient for beta scaling calculated\n as 4*rli if `iprofile=1` (see also gtscale option)", @@ -19093,7 +19093,7 @@ "dlamee", "dlamie", "dlimit", - "dnalp", + "nd_alphas", "dnbeam", "beam_density_out", "beta_norm_max", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 64f64c92e5..29455521b4 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -369,7 +369,7 @@ Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1228E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4478E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6305E+16 OP - Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (dnalp)_______________________ 6.6846E+18 OP + Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8769E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3950E+19 OP diff --git a/tests/unit/test_neoclassics.py b/tests/unit/test_neoclassics.py index e3efce7f2f..18266a99bf 100644 --- a/tests/unit/test_neoclassics.py +++ b/tests/unit/test_neoclassics.py @@ -25,7 +25,7 @@ class InitNeoclassicsParam(NamedTuple): ti0: Any = None ni0: Any = None f_deuterium: Any = None - dnalp: Any = None + nd_alphas: Any = None rminor: Any = None rmajor: Any = None bt: Any = None @@ -74,7 +74,7 @@ class InitNeoclassicsParam(NamedTuple): ti0=12.579710000000002, ni0=2.3930858160000005e20, f_deuterium=0.5, - dnalp=2.9820384000000004e19, + nd_alphas=2.9820384000000004e19, rminor=1.7993820274145451, rmajor=22.16, bt=5.2400000000000002, @@ -982,7 +982,7 @@ def test_init_neoclassics(initneoclassicsparam, monkeypatch, neoclassics): monkeypatch.setattr( physics_variables, "f_deuterium", initneoclassicsparam.f_deuterium ) - monkeypatch.setattr(physics_variables, "dnalp", initneoclassicsparam.dnalp) + monkeypatch.setattr(physics_variables, "nd_alphas", initneoclassicsparam.nd_alphas) monkeypatch.setattr(physics_variables, "rminor", initneoclassicsparam.rminor) monkeypatch.setattr(physics_variables, "rmajor", initneoclassicsparam.rmajor) monkeypatch.setattr(physics_variables, "bt", initneoclassicsparam.bt) diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 2508c6bb7f..0cec2ebdf7 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1191,7 +1191,7 @@ class PlasmaCompositionParam(NamedTuple): f_helium3: Any = None - dnalp: Any = None + nd_alphas: Any = None dene: Any = None @@ -1247,7 +1247,7 @@ class PlasmaCompositionParam(NamedTuple): expected_dlamie: Any = None - expected_dnalp: Any = None + expected_nd_alphas: Any = None expected_dnprot: Any = None @@ -1321,7 +1321,7 @@ class PlasmaCompositionParam(NamedTuple): alphan=1, dnbeam=0, f_helium3=0, - dnalp=0, + nd_alphas=0, dene=7.5e19, dnprot=0, iscz=0, @@ -1364,7 +1364,7 @@ class PlasmaCompositionParam(NamedTuple): expected_dnz=28875000000000004, expected_m_beam_amu=2.01355414, expected_dlamie=17.810652035055568, - expected_dnalp=7.5e18, + expected_nd_alphas=7.5e18, expected_dnprot=7500000000000000, expected_first_call=0, ), @@ -1441,7 +1441,7 @@ class PlasmaCompositionParam(NamedTuple): alphan=1, dnbeam=0, f_helium3=0, - dnalp=7.5e18, + nd_alphas=7.5e18, dene=7.5e19, dnprot=7500000000000000, iscz=0, @@ -1484,7 +1484,7 @@ class PlasmaCompositionParam(NamedTuple): expected_dnz=28875000000000004, expected_m_beam_amu=2.01355414, expected_dlamie=17.810652035055568, - expected_dnalp=7.5e18, + expected_nd_alphas=7.5e18, expected_dnprot=20519498414548412, expected_first_call=0, ), @@ -1581,7 +1581,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): monkeypatch.setattr(physics_variables, "rnfene", plasmacompositionparam.rnfene) - monkeypatch.setattr(physics_variables, "m_beam_amu", plasmacompositionparam.m_beam_amu) + monkeypatch.setattr( + physics_variables, "m_beam_amu", plasmacompositionparam.m_beam_amu + ) monkeypatch.setattr(physics_variables, "dlamie", plasmacompositionparam.dlamie) @@ -1605,7 +1607,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): physics_variables, "f_helium3", plasmacompositionparam.f_helium3 ) - monkeypatch.setattr(physics_variables, "dnalp", plasmacompositionparam.dnalp) + monkeypatch.setattr( + physics_variables, "nd_alphas", plasmacompositionparam.nd_alphas + ) monkeypatch.setattr(physics_variables, "dene", plasmacompositionparam.dene) @@ -1683,8 +1687,8 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): plasmacompositionparam.expected_dlamie ) - assert physics_variables.dnalp == pytest.approx( - plasmacompositionparam.expected_dnalp + assert physics_variables.nd_alphas == pytest.approx( + plasmacompositionparam.expected_nd_alphas ) assert physics_variables.dnprot == pytest.approx( @@ -1824,7 +1828,7 @@ class PhyauxParam(NamedTuple): deni: Any = None - dnalp: Any = None + nd_alphas: Any = None fusion_rate_density_total: Any = None @@ -1862,7 +1866,7 @@ class PhyauxParam(NamedTuple): aspect=3, dene=7.5e19, deni=5.8589175702454272e19, - dnalp=7.5e18, + nd_alphas=7.5e18, fusion_rate_density_total=1.9852091609123786e17, alpha_rate_density_total=1.973996644759543e17, plasma_current=18398455.678867526, @@ -1883,7 +1887,7 @@ class PhyauxParam(NamedTuple): aspect=3, dene=7.5e19, deni=5.8576156204039725e19, - dnalp=7.5e18, + nd_alphas=7.5e18, fusion_rate_density_total=1.9843269653375773e17, alpha_rate_density_total=1.9731194318497056e17, plasma_current=18398455.678867526, @@ -1921,7 +1925,7 @@ def test_phyaux(phyauxparam, monkeypatch, physics): aspect=phyauxparam.aspect, dene=phyauxparam.dene, deni=phyauxparam.deni, - dnalp=phyauxparam.dnalp, + nd_alphas=phyauxparam.nd_alphas, fusion_rate_density_total=phyauxparam.fusion_rate_density_total, alpha_rate_density_total=phyauxparam.alpha_rate_density_total, plasma_current=phyauxparam.plasma_current, From bab654d5928cf6a972560e907e418141d3fa70ed Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 09:19:24 +0000 Subject: [PATCH 08/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20dnprot=20variable?= =?UTF-8?q?=20to=20nd=5Fprotons=20for=20consistency=20across=20the=20codeb?= =?UTF-8?q?ase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/physics.py | 18 +++++------ source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 20 +++++++------ 18 files changed, 69 insertions(+), 67 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 6805147096..e0e1c0d4e9 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -373,7 +373,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5392E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6024E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6709E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8502E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8502E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4748E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4748E+19 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 40e3fde776..101b12f3e4 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -374,7 +374,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 0d7165fcac..65fcdf6933 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -374,7 +374,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index b94a467e0f..ba28e7b04a 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -374,7 +374,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protonstons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 04186a94db..905f72eba4 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -374,7 +374,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 3793276fce..2eaa8de372 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -229,7 +229,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -1224,7 +1224,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -2219,7 +2219,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -3214,7 +3214,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -4209,7 +4209,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -5204,7 +5204,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -6199,7 +6199,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -7194,7 +7194,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -8189,7 +8189,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP diff --git a/process/physics.py b/process/physics.py index 9d59606734..c6900e1241 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2673,12 +2673,12 @@ def plasma_composition(): # Issue #557 Allow protium impurity to be specified: 'protium' # This will override the calculated value which is a minimum. if physics_variables.alpha_rate_density_total < 1.0e-6: # not calculated yet... - physics_variables.dnprot = max( + physics_variables.nd_protons = max( physics_variables.protium * physics_variables.dene, physics_variables.nd_alphas * (physics_variables.f_helium3 + 1.0e-3), ) # rough estimate else: - physics_variables.dnprot = max( + physics_variables.nd_protons = max( physics_variables.protium * physics_variables.dene, physics_variables.nd_alphas * physics_variables.proton_rate_density @@ -2708,7 +2708,7 @@ def plasma_composition(): znfuel = ( physics_variables.dene - 2.0 * physics_variables.nd_alphas - - physics_variables.dnprot + - physics_variables.nd_protons - physics_variables.dnbeam - znimp ) @@ -2723,7 +2723,7 @@ def plasma_composition(): impurity_radiation_module.impurity_arr_frac[ impurity_radiation.element2index("H_") ] = ( - physics_variables.dnprot + physics_variables.nd_protons + (physics_variables.f_deuterium + physics_variables.f_tritium) * physics_variables.deni + physics_variables.dnbeam @@ -2751,7 +2751,7 @@ def plasma_composition(): physics_variables.dnitot = ( physics_variables.deni + physics_variables.nd_alphas - + physics_variables.dnprot + + physics_variables.nd_protons + physics_variables.dnbeam + physics_variables.dnz ) @@ -2839,7 +2839,7 @@ def plasma_composition(): physics_variables.aion = ( physics_variables.m_fuel_amu * physics_variables.deni + (constants.m_alpha_amu * physics_variables.nd_alphas) - + physics_variables.dnprot + + physics_variables.nd_protons + physics_variables.m_beam_amu * physics_variables.dnbeam ) for imp in range(impurity_radiation_module.n_impurities): @@ -2858,7 +2858,7 @@ def plasma_composition(): + physics_variables.f_tritium * physics_variables.deni / 3.0 + 4.0 * physics_variables.f_helium3 * physics_variables.deni / 3.0 + physics_variables.nd_alphas - + physics_variables.dnprot + + physics_variables.nd_protons + (1.0 - current_drive_variables.f_tritium_beam) * physics_variables.dnbeam / 2.0 @@ -3960,8 +3960,8 @@ def outplas(self): po.ovarre( self.outfile, "Proton density (/m3)", - "(dnprot)", - physics_variables.dnprot, + "(nd_protons)", + physics_variables.nd_protons, "OP ", ) if physics_variables.protium > 1.0e-10: diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 6b9feefb59..49b1597c12 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -168,7 +168,7 @@ module physics_variables real(dp) :: dnla !! line averaged electron density (/m3) - real(dp) :: dnprot + real(dp) :: nd_protons !! proton ash density (/m3) real(dp) :: dntau @@ -997,7 +997,7 @@ subroutine init_physics_variables dnelimt = 0.0D0 dnitot = 0.0D0 dnla = 0.0D0 - dnprot = 0.0D0 + nd_protons = 0.0D0 dntau = 0.0D0 dnz = 0.0D0 beta_poloidal_eps_max = 1.38D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 1977feaf16..d3ba378e9e 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -373,7 +373,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 9d60605744..56c2de9ca3 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -374,7 +374,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index a0a49bd76c..0df51221cc 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -374,7 +374,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index ceaea0466e..cdf405126a 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -374,7 +374,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8963E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index bb6af464a3..741b5e8f04 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -370,7 +370,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4478E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6305E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8769E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8769E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3950E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3950E+19 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 7dc7de28c4..0425cfccb1 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -375,7 +375,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6171E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5133E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9913E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6531E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6531E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4167E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4167E+19 OP @@ -1538,7 +1538,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6475E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5610E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9829E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6508E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6508E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4453E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4453E+19 OP @@ -2701,7 +2701,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6635E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6426E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0041E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6567E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6567E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4676E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4676E+19 OP @@ -3864,7 +3864,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6217E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6633E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0286E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6696E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6696E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4348E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4348E+19 OP @@ -5027,7 +5027,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6270E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6208E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9989E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6614E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6614E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4323E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4323E+19 OP @@ -6190,7 +6190,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6165E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5724E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9271E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6415E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6415E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4072E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4072E+19 OP @@ -7353,7 +7353,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5769E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6030E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9503E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6542E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6542E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3766E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3766E+19 OP @@ -8516,7 +8516,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5815E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6582E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9558E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6557E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6557E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3843E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3843E+19 OP @@ -9679,7 +9679,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5692E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6882E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9402E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6513E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6513E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3714E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3714E+19 OP @@ -10842,7 +10842,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5453E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7315E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9956E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6731E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6731E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3618E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3618E+19 OP @@ -12005,7 +12005,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5647E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7253E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0256E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6815E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6815E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3850E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3850E+19 OP @@ -13168,7 +13168,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5634E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6792E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0110E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6774E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6774E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3790E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3790E+19 OP @@ -14331,7 +14331,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5369E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7179E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0597E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.6975E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6975E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3655E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3655E+19 OP @@ -15494,7 +15494,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5540E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7754E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1093E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.7114E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.7114E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3931E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3931E+19 OP @@ -16657,7 +16657,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5721E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.8337E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1614E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.7260E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.7260E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4220E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4220E+19 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 0db55ef673..84acc7a709 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -229,7 +229,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -1224,7 +1224,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -2219,7 +2219,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -3214,7 +3214,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -4209,7 +4209,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -5204,7 +5204,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -6199,7 +6199,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -7194,7 +7194,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP @@ -8189,7 +8189,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.4050E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index dd04468320..99add37da2 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1675,7 +1675,7 @@ "dnelimt": 0.0, "dnitot": 0.0, "dnla": 0.0, - "dnprot": 0.0, + "nd_protons": 0.0, "dntau": 0.0, "dnz": 0.0, "double": "selected_real_kind(15, 300)", @@ -9322,7 +9322,7 @@ "dnelimt": "density limit (/m3)", "dnitot": "total ion density (/m3)", "dnla": "line averaged electron density (/m3)", - "dnprot": "proton ash density (/m3)", + "nd_protons": "proton ash density (/m3)", "dntau": "plasma average \"n-tau\" (seconds/m3)", "dnz": "high Z ion density (/m3)", "double": "", @@ -19100,7 +19100,7 @@ "dnelimt", "dnitot", "dnla", - "dnprot", + "nd_protons", "dntau", "dnz", "dndrho_max", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 29455521b4..a2c6216c16 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -370,7 +370,7 @@ Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4478E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6305E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP - Proton_density_(/m3)____________________________________________________ (dnprot)______________________ 1.8769E+16 OP + Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8769E+16 OP Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3950E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3950E+19 OP diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 0cec2ebdf7..d8bd6d6525 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1195,7 +1195,7 @@ class PlasmaCompositionParam(NamedTuple): dene: Any = None - dnprot: Any = None + nd_protons: Any = None iscz: Any = None @@ -1249,7 +1249,7 @@ class PlasmaCompositionParam(NamedTuple): expected_nd_alphas: Any = None - expected_dnprot: Any = None + expected_nd_protons: Any = None expected_first_call: Any = None @@ -1323,7 +1323,7 @@ class PlasmaCompositionParam(NamedTuple): f_helium3=0, nd_alphas=0, dene=7.5e19, - dnprot=0, + nd_protons=0, iscz=0, err242=0, err243=0, @@ -1365,7 +1365,7 @@ class PlasmaCompositionParam(NamedTuple): expected_m_beam_amu=2.01355414, expected_dlamie=17.810652035055568, expected_nd_alphas=7.5e18, - expected_dnprot=7500000000000000, + expected_nd_protons=7500000000000000, expected_first_call=0, ), PlasmaCompositionParam( @@ -1443,7 +1443,7 @@ class PlasmaCompositionParam(NamedTuple): f_helium3=0, nd_alphas=7.5e18, dene=7.5e19, - dnprot=7500000000000000, + nd_protons=7500000000000000, iscz=0, err242=0, err243=0, @@ -1485,7 +1485,7 @@ class PlasmaCompositionParam(NamedTuple): expected_m_beam_amu=2.01355414, expected_dlamie=17.810652035055568, expected_nd_alphas=7.5e18, - expected_dnprot=20519498414548412, + expected_nd_protons=20519498414548412, expected_first_call=0, ), ), @@ -1613,7 +1613,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): monkeypatch.setattr(physics_variables, "dene", plasmacompositionparam.dene) - monkeypatch.setattr(physics_variables, "dnprot", plasmacompositionparam.dnprot) + monkeypatch.setattr( + physics_variables, "nd_protons", plasmacompositionparam.nd_protons + ) monkeypatch.setattr(physics_module, "iscz", plasmacompositionparam.iscz) @@ -1691,8 +1693,8 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): plasmacompositionparam.expected_nd_alphas ) - assert physics_variables.dnprot == pytest.approx( - plasmacompositionparam.expected_dnprot + assert physics_variables.nd_protons == pytest.approx( + plasmacompositionparam.expected_nd_protons ) assert physics_module.first_call == pytest.approx( From ea55e80bda57f78f4572c52c0440f77eab9ebf7d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 09:22:50 +0000 Subject: [PATCH 09/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20protium=20variabl?= =?UTF-8?q?e=20to=20f=5Fnd=5Fprotium=5Felectrons=20for=20consistency=20acr?= =?UTF-8?q?oss=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/physics.py | 14 +++++++------- source/fortran/input.f90 | 6 +++--- source/fortran/physics_variables.f90 | 6 +++--- tests/integration/ref_dicts.json | 10 +++++----- tests/regression/input_files/st_regression.IN.DAT | 6 +++--- tests/unit/test_physics.py | 12 ++++++++---- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/process/physics.py b/process/physics.py index c6900e1241..c64d88be4e 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2670,16 +2670,16 @@ def plasma_composition(): # Protons # This calculation will be wrong on the first call as the particle # production rates are evaluated later in the calling sequence - # Issue #557 Allow protium impurity to be specified: 'protium' + # Issue #557 Allow f_nd_protium_electrons impurity to be specified: 'f_nd_protium_electrons' # This will override the calculated value which is a minimum. if physics_variables.alpha_rate_density_total < 1.0e-6: # not calculated yet... physics_variables.nd_protons = max( - physics_variables.protium * physics_variables.dene, + physics_variables.f_nd_protium_electrons * physics_variables.dene, physics_variables.nd_alphas * (physics_variables.f_helium3 + 1.0e-3), ) # rough estimate else: physics_variables.nd_protons = max( - physics_variables.protium * physics_variables.dene, + physics_variables.f_nd_protium_electrons * physics_variables.dene, physics_variables.nd_alphas * physics_variables.proton_rate_density / physics_variables.alpha_rate_density_total, @@ -3964,12 +3964,12 @@ def outplas(self): physics_variables.nd_protons, "OP ", ) - if physics_variables.protium > 1.0e-10: + if physics_variables.f_nd_protium_electrons > 1.0e-10: po.ovarre( self.outfile, - "Seeded protium density / electron density", - "(protium)", - physics_variables.protium, + "Seeded f_nd_protium_electrons density / electron density", + "(f_nd_protium_electrons)", + physics_variables.f_nd_protium_electrons, ) po.ovarre( diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index f7ca26e3ea..1ec4155e4c 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -309,7 +309,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) ftar, plasma_res_factor, ssync, rnbeam, beta, neped, hfact, beta_norm_max, & fgwsep, rhopedn, tratio, q0, i_plasma_geometry, i_plasma_shape, fne0, ignite, f_tritium, & i_beta_fast_alpha, tauee_in, alphaj, alphat, i_plasma_current, q, ti, tesep, rli, triang, & - itart, ralpne, iprofile, triang95, rad_fraction_sol, betbm0, protium, & + itart, ralpne, iprofile, triang95, rad_fraction_sol, betbm0, f_nd_protium_electrons, & teped, f_helium3, iwalld, gamma, f_alpha_plasma, fgwped, tbeta, i_bootstrap_current, & iradloss, te, alphan, rmajor, plasma_square, kappa, iinvqd, fkzohm, beamfus0, & tauratio, i_density_limit, bt, i_plasma_wall_gap, ipnlaws, beta_max, beta_min, & @@ -717,8 +717,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('ralpne') call parse_real_variable('ralpne', ralpne, 1.0D-12, 1.0D0, & 'Thermal alpha density / electron density') - case ('protium') - call parse_real_variable('protium', protium, 0.0D0, 1.0D0, & + case ('f_nd_protium_electrons') + call parse_real_variable('f_nd_protium_electrons', f_nd_protium_electrons, 0.0D0, 1.0D0, & 'Protium density / electron density') case ('rhopedn') diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 49b1597c12..2e3a83d780 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -812,8 +812,8 @@ module physics_variables real(dp) :: ralpne !! thermal alpha density/electron density (`iteration variable 109`) - real(dp) :: protium - !! Seeded protium density / electron density. + real(dp) :: f_nd_protium_electrons + !! Seeded f_nd_protium_electrons density / electron density. real(dp) :: rli !! plasma normalised internal inductance (calculated from alphaj if `iprofile=1`) @@ -1129,7 +1129,7 @@ subroutine init_physics_variables rad_fraction_sol = 0.8D0 rad_fraction_total = 0.0D0 ralpne = 0.10D0 - protium = 0.0D0 + f_nd_protium_electrons = 0.0D0 rli = 0.9D0 rlp = 0.0D0 rmajor = 8.14D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 99add37da2..f8c3ce2f34 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3625,7 +3625,7 @@ "primary_pumping": 2.0, "prn1": 0.285, "profcalc": null, - "protium": 0.0, + "f_nd_protium_electrons": 0.0, "proton_rate_density": 0.0, "pscalingmw": 0.0, "pscf_scene": 0.0, @@ -10380,7 +10380,7 @@ "primary_pumping": "Switch for pumping power for primary coolant (mechanical power only and peak first wall\n temperature is only calculated if `primary_pumping=2`):\n
        \n
      • =0 User sets pump power directly (htpmw_blkt, htpmw_fw, htpmw_div, htpmw_shld)
        • \n
      • =1 User sets pump power as a fraction of thermal power (fpumpblkt, fpumpfw, fpumpdiv, fpumpshld)
        • \n
      • =2 Mechanical pumping power is calculated
        • \n
      • =3 Mechanical pumping power is calculated using specified pressure drop
        • \n
      ", "prn1": "n-scrape-off / n-average plasma; (input for `ipedestal=0`, = nesep/dene if `ipedestal>=1`)", "profcalc": "", - "protium": "Seeded protium density / electron density.", + "f_nd_protium_electrons": "Seeded f_nd_protium_electrons density / electron density.", "proton_rate_density": "proton production rate (particles/m3/sec)", "pscalingmw": "Total transport power from scaling law (MW)", "pscf_scene": "Pfirsch-Schl\u00fcter current fraction, SCENE fit", @@ -13983,7 +13983,7 @@ "lb": 0.0, "ub": 1.0 }, - "protium": { + "f_nd_protium_electrons": { "lb": 0.0, "ub": 1.0 }, @@ -19236,7 +19236,7 @@ "rad_fraction_sol", "rad_fraction_total", "ralpne", - "protium", + "f_nd_protium_electrons", "rli", "rlp", "rmajor", @@ -20637,7 +20637,7 @@ "prdiv": "real_variable", "primary_pumping": "int_variable", "prn1": "real_variable", - "protium": "real_variable", + "f_nd_protium_electrons": "real_variable", "psepbqarmax": "real_variable", "pseprmax": "real_variable", "ptargf": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index cd70b4a03f..c8e314c48e 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -622,9 +622,9 @@ boundu(28) = 1.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -*protium = -* DESCRIPTION: Seeded protium density / electron density (default = 0.0) -* JUSTIFICATION: Not used, no protium seeding. +*f_nd_protium_electrons = +* DESCRIPTION: Seeded f_nd_protium_electrons density / electron density (default = 0.0) +* JUSTIFICATION: Not used, no f_nd_protium_electrons seeding. *f_deuterium = * DESCRIPTION: Deuterium fuel fraction diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index d8bd6d6525..c62161d054 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1149,7 +1149,7 @@ class PlasmaCompositionParam(NamedTuple): dnitot: Any = None - protium: Any = None + f_nd_protium_electrons: Any = None zeffai: Any = None @@ -1300,7 +1300,7 @@ class PlasmaCompositionParam(NamedTuple): deni=0, aion=0, dnitot=0, - protium=0, + f_nd_protium_electrons=0, zeffai=0, rncne=0, rnone=0, @@ -1420,7 +1420,7 @@ class PlasmaCompositionParam(NamedTuple): deni=5.8589175702454272e19, aion=2.7395439636787726, dnitot=6.6125550702454276e19, - protium=0, + f_nd_protium_electrons=0, zeffai=0.43248858851447464, rncne=0, rnone=0, @@ -1549,7 +1549,11 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): monkeypatch.setattr(physics_variables, "dnitot", plasmacompositionparam.dnitot) - monkeypatch.setattr(physics_variables, "protium", plasmacompositionparam.protium) + monkeypatch.setattr( + physics_variables, + "f_nd_protium_electrons", + plasmacompositionparam.f_nd_protium_electrons, + ) monkeypatch.setattr(physics_variables, "zeffai", plasmacompositionparam.zeffai) From 715e05d42d815286f47aed2f5c471bbccc97f5e6 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 09:26:30 +0000 Subject: [PATCH 10/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20dnbeam=20variable?= =?UTF-8?q?=20to=20nd=5Fbeam=5Fions=20for=20consistency=20across=20the=20c?= =?UTF-8?q?odebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/physics.py | 24 ++++++++------- source/fortran/constraint_equations.f90 | 10 +++---- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 10 ++++--- 20 files changed, 75 insertions(+), 69 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index e0e1c0d4e9..ab108ad06f 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -374,7 +374,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6024E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6709E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8502E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4748E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4748E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.2363E-02 ITV diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 101b12f3e4..2fc3833d10 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -375,7 +375,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 65fcdf6933..8fbc41357a 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -375,7 +375,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index ba28e7b04a..351634e0e3 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -375,7 +375,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protonstons)______________________ 1.8963E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 905f72eba4..0bc8e08373 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -375,7 +375,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 2eaa8de372..401322b733 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -230,7 +230,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -1225,7 +1225,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -2220,7 +2220,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -3215,7 +3215,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -4210,7 +4210,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -5205,7 +5205,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -6200,7 +6200,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -7195,7 +7195,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -8190,7 +8190,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV diff --git a/process/physics.py b/process/physics.py index c64d88be4e..248c2fe780 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2688,9 +2688,11 @@ def plasma_composition(): # Beam hot ion component # If ignited, prevent beam fusion effects if physics_variables.ignite == 0: - physics_variables.dnbeam = physics_variables.dene * physics_variables.rnbeam + physics_variables.nd_beam_ions = ( + physics_variables.dene * physics_variables.rnbeam + ) else: - physics_variables.dnbeam = 0.0 + physics_variables.nd_beam_ions = 0.0 # Sum of Zi.ni for all impurity ions (those with charge > helium) znimp = 0.0 @@ -2709,7 +2711,7 @@ def plasma_composition(): physics_variables.dene - 2.0 * physics_variables.nd_alphas - physics_variables.nd_protons - - physics_variables.dnbeam + - physics_variables.nd_beam_ions - znimp ) @@ -2726,7 +2728,7 @@ def plasma_composition(): physics_variables.nd_protons + (physics_variables.f_deuterium + physics_variables.f_tritium) * physics_variables.deni - + physics_variables.dnbeam + + physics_variables.nd_beam_ions ) / physics_variables.dene impurity_radiation_module.impurity_arr_frac[ @@ -2752,7 +2754,7 @@ def plasma_composition(): physics_variables.deni + physics_variables.nd_alphas + physics_variables.nd_protons - + physics_variables.dnbeam + + physics_variables.nd_beam_ions + physics_variables.dnz ) @@ -2840,7 +2842,7 @@ def plasma_composition(): physics_variables.m_fuel_amu * physics_variables.deni + (constants.m_alpha_amu * physics_variables.nd_alphas) + physics_variables.nd_protons - + physics_variables.m_beam_amu * physics_variables.dnbeam + + physics_variables.m_beam_amu * physics_variables.nd_beam_ions ) for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: @@ -2860,9 +2862,11 @@ def plasma_composition(): + physics_variables.nd_alphas + physics_variables.nd_protons + (1.0 - current_drive_variables.f_tritium_beam) - * physics_variables.dnbeam + * physics_variables.nd_beam_ions / 2.0 - + current_drive_variables.f_tritium_beam * physics_variables.dnbeam / 3.0 + + current_drive_variables.f_tritium_beam + * physics_variables.nd_beam_ions + / 3.0 ) / physics_variables.dene for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: @@ -3975,8 +3979,8 @@ def outplas(self): po.ovarre( self.outfile, "Hot beam density (/m3)", - "(dnbeam)", - physics_variables.dnbeam, + "(nd_beam_ions)", + physics_variables.nd_beam_ions, "OP ", ) po.ovarre( diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 22e5bf3d35..18a25a2769 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -712,8 +712,8 @@ subroutine constraint_eqn_007(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! during plasma start-up, and is excluded from all steady-state !! power balance calculations. !! beam_density_out : input real : hot beam ion density from calculation (/m3) - !! dnbeam : input real : hot beam ion density, variable (/m3) - use physics_variables, only: ignite, beam_density_out, dnbeam + !! nd_beam_ions : input real : hot beam ion density, variable (/m3) + use physics_variables, only: ignite, beam_density_out, nd_beam_ions implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -723,9 +723,9 @@ subroutine constraint_eqn_007(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) ! Do not assume plasma ignition: if (ignite == 0) then - tmp_cc = 1.0D0 - beam_density_out/dnbeam - tmp_con = dnbeam * (1.0D0 - tmp_cc) - tmp_err = dnbeam * tmp_cc + tmp_cc = 1.0D0 - beam_density_out/nd_beam_ions + tmp_con = nd_beam_ions * (1.0D0 - tmp_cc) + tmp_err = nd_beam_ions * tmp_cc tmp_symbol = '=' tmp_units = '/m3' else diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 2e3a83d780..6cdd842038 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -150,7 +150,7 @@ module physics_variables real(dp) :: nd_alphas !! thermal alpha density (/m3) - real(dp) :: dnbeam + real(dp) :: nd_beam_ions !! hot beam ion density, variable (/m3) real(dp) :: beam_density_out @@ -991,7 +991,7 @@ subroutine init_physics_variables dlamie = 0.0D0 dlimit = 0.0D0 nd_alphas = 0.0D0 - dnbeam = 0.0D0 + nd_beam_ions = 0.0D0 beam_density_out = 0.0D0 beta_norm_max = 3.5D0 dnelimt = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index d3ba378e9e..54d6657549 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -374,7 +374,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 56c2de9ca3..c4376e3261 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -375,7 +375,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 0df51221cc..ae3ec15f1c 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -375,7 +375,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index cdf405126a..d25a684078 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -375,7 +375,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 741b5e8f04..2a31d1eb40 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -371,7 +371,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6305E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8769E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3950E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3950E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3422E-02 ITV diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 0425cfccb1..79c48bf627 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -376,7 +376,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5133E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9913E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6531E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4167E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4167E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4551E-02 ITV @@ -1539,7 +1539,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5610E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9829E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6508E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4453E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4453E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4161E-02 ITV @@ -2702,7 +2702,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6426E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0041E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6567E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4676E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4676E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4201E-02 ITV @@ -3865,7 +3865,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6633E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0286E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6696E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4348E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4348E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4833E-02 ITV @@ -5028,7 +5028,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6208E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9989E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6614E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4323E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4323E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4490E-02 ITV @@ -6191,7 +6191,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5724E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9271E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6415E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4072E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4072E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.3847E-02 ITV @@ -7354,7 +7354,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6030E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9503E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6542E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3766E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3766E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4443E-02 ITV @@ -8517,7 +8517,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6582E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9558E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6557E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3843E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3843E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4434E-02 ITV @@ -9680,7 +9680,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6882E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9402E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6513E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3714E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3714E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4369E-02 ITV @@ -10843,7 +10843,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7315E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9956E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6731E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3618E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3618E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.5160E-02 ITV @@ -12006,7 +12006,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7253E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0256E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6815E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3850E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3850E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.5300E-02 ITV @@ -13169,7 +13169,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6792E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0110E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6774E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3790E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3790E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.5178E-02 ITV @@ -14332,7 +14332,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7179E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0597E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6975E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3655E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3655E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.5926E-02 ITV @@ -15495,7 +15495,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7754E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1093E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.7114E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3931E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3931E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.6262E-02 ITV @@ -16658,7 +16658,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.8337E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1614E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.7260E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4220E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4220E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.6613E-02 ITV diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 84acc7a709..b05acb5dee 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -230,7 +230,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -1225,7 +1225,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -2220,7 +2220,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -3215,7 +3215,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -4210,7 +4210,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -5205,7 +5205,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -6200,7 +6200,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -7195,7 +7195,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV @@ -8190,7 +8190,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f8c3ce2f34..0c15373010 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1668,7 +1668,7 @@ ], "dlscal": 0.0, "nd_alphas": 0.0, - "dnbeam": 0.0, + "nd_beam_ions": 0.0, "beam_density_out": 0.0, "beta_norm_max": 3.5, "dndrho_max": null, @@ -9315,7 +9315,7 @@ "dlimit": "density limit (/m3) as calculated using various models", "dlscal": "vacuum system duct length scaling", "nd_alphas": "thermal alpha density (/m3)", - "dnbeam": "hot beam ion density, variable (/m3)", + "nd_beam_ions": "hot beam ion density, variable (/m3)", "beam_density_out": "hot beam ion density from calculation (/m3)", "beta_norm_max": "Troyon-like coefficient for beta scaling calculated\n as 4*rli if `iprofile=1` (see also gtscale option)", "dndrho_max": "Maximum density gradient wrt to normalized r (rho) (/m3)", @@ -19094,7 +19094,7 @@ "dlamie", "dlimit", "nd_alphas", - "dnbeam", + "nd_beam_ions", "beam_density_out", "beta_norm_max", "dnelimt", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index c8e314c48e..48b32248e8 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2848,7 +2848,7 @@ feffcd = 1.0 *icc = 7 * DESCRIPTION: Equation for hot ion beam density (NBI) * JUSTIFICATION: Turned off, not using NBI -* VARIABLES: ignite,dnbeam Rest calculated in-situ +* VARIABLES: ignite,nd_beam_ions Rest calculated in-situ *ixc = 7 *rnbeam = diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index a2c6216c16..7c33fae172 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -371,7 +371,7 @@ Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6305E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8769E+16 OP - Hot_beam_density_(/m3)__________________________________________________ (dnbeam)______________________ 0.0000E+00 OP + Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3950E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3950E+19 OP Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3422E-02 ITV diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index c62161d054..3cb1e4ea2d 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1187,7 +1187,7 @@ class PlasmaCompositionParam(NamedTuple): alphan: Any = None - dnbeam: Any = None + nd_beam_ions: Any = None f_helium3: Any = None @@ -1319,7 +1319,7 @@ class PlasmaCompositionParam(NamedTuple): proton_rate_density=0, f_deuterium=0.5, alphan=1, - dnbeam=0, + nd_beam_ions=0, f_helium3=0, nd_alphas=0, dene=7.5e19, @@ -1439,7 +1439,7 @@ class PlasmaCompositionParam(NamedTuple): proton_rate_density=540072280299564.38, f_deuterium=0.5, alphan=1, - dnbeam=0, + nd_beam_ions=0, f_helium3=0, nd_alphas=7.5e18, dene=7.5e19, @@ -1605,7 +1605,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): monkeypatch.setattr(physics_variables, "alphan", plasmacompositionparam.alphan) - monkeypatch.setattr(physics_variables, "dnbeam", plasmacompositionparam.dnbeam) + monkeypatch.setattr( + physics_variables, "nd_beam_ions", plasmacompositionparam.nd_beam_ions + ) monkeypatch.setattr( physics_variables, "f_helium3", plasmacompositionparam.f_helium3 From 46f9f7aa18bb6e2b61500b7faafb550ac7ccf3dd Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 09:33:08 +0000 Subject: [PATCH 11/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20dnitot=20variable?= =?UTF-8?q?=20to=20nd=5Fions=5Ftotal=20for=20consistency=20across=20the=20?= =?UTF-8?q?codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/development/standards.md | 4 +- .../profiles/plasma_density_profile.md | 2 +- .../profiles/plasma_profiles.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++--- process/physics.py | 28 +++++---- process/physics_functions.py | 6 +- process/plasma_profiles.py | 2 +- process/profiles.py | 4 +- process/stellarator.py | 8 +-- source/fortran/constraint_equations.f90 | 8 +-- source/fortran/physics_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++----- tests/integration/data/scan_MFILE.DAT | 18 +++--- tests/integration/ref_dicts.json | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 62 ++++++++++--------- tests/unit/test_physics_functions.py | 2 +- tests/unit/test_plasma_profiles.py | 10 +-- tracking/tracking_data.py | 2 +- 29 files changed, 123 insertions(+), 115 deletions(-) diff --git a/documentation/proc-pages/development/standards.md b/documentation/proc-pages/development/standards.md index ee210a62b9..8659e51518 100644 --- a/documentation/proc-pages/development/standards.md +++ b/documentation/proc-pages/development/standards.md @@ -533,7 +533,7 @@ subroutine constraint_eqn_001(args) !! - \( T_i \) -- density weighted average ion temperature [keV] !! - \( B_{tot} \) -- total toroidal + poloidal field [T] - use physics_variables, only: beta_fast_alpha, beta_beam, dene, ten, dnitot, tin, btot, beta + use physics_variables, only: beta_fast_alpha, beta_beam, dene, ten, nd_ions_total, tin, btot, beta use constants, only: electron_charge,rmu0 implicit none @@ -542,7 +542,7 @@ subroutine constraint_eqn_001(args) !! constraint derived type args%cc = 1.0D0 - (beta_fast_alpha + beta_beam + & - 2.0D3*rmu0*electron_charge * (dene*ten + dnitot*tin)/btot**2 )/beta + 2.0D3*rmu0*electron_charge * (dene*ten + nd_ions_total*tin)/btot**2 )/beta args%con = beta * (1.0D0 - args%cc) args%err = beta * args%cc args%symbol = '=' diff --git a/documentation/proc-pages/physics-models/profiles/plasma_density_profile.md b/documentation/proc-pages/physics-models/profiles/plasma_density_profile.md index 975c31cc19..41c904211a 100644 --- a/documentation/proc-pages/physics-models/profiles/plasma_density_profile.md +++ b/documentation/proc-pages/physics-models/profiles/plasma_density_profile.md @@ -14,7 +14,7 @@ The desnity profile class is organised around a central runner function that is ### Calculate core values | `set_physics_variables()` The core electron density is calculated using the [`ncore`](plasma_density_profile.md#electron-core-density-of-a-pedestalised-profile--ncore) method. - The core ion density is then set from $n_{\text{i}}$ (`dnitot`) which is the total ion density such as: + The core ion density is then set from $n_{\text{i}}$ (`nd_ions_total`) which is the total ion density such as: $$ n_{\text{i0}} = \left(\frac{n_\text{i}}{n_\text{e}}\right)n_{\text{e0}} diff --git a/documentation/proc-pages/physics-models/profiles/plasma_profiles.md b/documentation/proc-pages/physics-models/profiles/plasma_profiles.md index 4fc53ad733..0ddddbd112 100644 --- a/documentation/proc-pages/physics-models/profiles/plasma_profiles.md +++ b/documentation/proc-pages/physics-models/profiles/plasma_profiles.md @@ -390,7 +390,7 @@ $$\begin{aligned} $$\begin{aligned} \mathtt{ne0} = n_{\text{e}} \times (\alpha_n+1) \\ -\mathtt{ni0} = \mathtt{dnitot} \times (\alpha_n+1) +\mathtt{ni0} = \mathtt{nd_ions_total} \times (\alpha_n+1) \end{aligned}$$ ----- diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index ab108ad06f..c671185190 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -369,7 +369,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0654E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9697E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2127E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2127E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5392E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6024E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6709E+18 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 2fc3833d10..7e78906d87 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -370,7 +370,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0610E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 8fbc41357a..e0a47af38c 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -370,7 +370,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0610E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 351634e0e3..a888f5f2cc 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -370,7 +370,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0610E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 0bc8e08373..e67f4e3768 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -370,7 +370,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0610E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 401322b733..2af2d86439 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -225,7 +225,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -1220,7 +1220,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -2215,7 +2215,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -3210,7 +3210,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -4205,7 +4205,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -5200,7 +5200,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -6195,7 +6195,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -7190,7 +7190,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -8185,7 +8185,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP diff --git a/process/physics.py b/process/physics.py index 248c2fe780..29a2de26e0 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2073,7 +2073,7 @@ def physics(self): physics_variables.bt, physics_variables.dene, physics_variables.deni, - physics_variables.dnitot, + physics_variables.nd_ions_total, physics_variables.ten, physics_variables.tin, physics_variables.alpha_power_density_total, @@ -2246,7 +2246,7 @@ def physics(self): physics_variables.alpha_power_total, physics_variables.aspect, physics_variables.bt, - physics_variables.dnitot, + physics_variables.nd_ions_total, physics_variables.dene, physics_variables.dnla, physics_variables.eps, @@ -2750,7 +2750,7 @@ def plasma_composition(): ) # Total ion density - physics_variables.dnitot = ( + physics_variables.nd_ions_total = ( physics_variables.deni + physics_variables.nd_alphas + physics_variables.nd_protons @@ -2852,7 +2852,9 @@ def plasma_composition(): * impurity_radiation_module.impurity_arr_amass[imp] ) - physics_variables.aion = physics_variables.aion / physics_variables.dnitot + physics_variables.aion = ( + physics_variables.aion / physics_variables.nd_ions_total + ) # Mass weighted plasma effective charge physics_variables.zeffai = ( @@ -3940,8 +3942,8 @@ def outplas(self): po.ovarre( self.outfile, "Ion density (/m3)", - "(dnitot)", - physics_variables.dnitot, + "(nd_ions_total)", + physics_variables.nd_ions_total, "OP ", ) po.ovarre( @@ -5633,7 +5635,7 @@ def igmarcal(self): physics_variables.alpha_power_total, physics_variables.aspect, physics_variables.bt, - physics_variables.dnitot, + physics_variables.nd_ions_total, physics_variables.dene, physics_variables.dnla, physics_variables.eps, @@ -5953,7 +5955,7 @@ def bootstrap_fraction_sauter(plasma_profile: float) -> float: # Calculate electron and ion density profiles ne = plasma_profile.neprofile.profile_y * 1e-19 - ni = (physics_variables.dnitot / physics_variables.dene) * ne + ni = (physics_variables.nd_ions_total / physics_variables.dene) * ne # Calculate electron and ion temperature profiles tempe = plasma_profile.teprofile.profile_y @@ -6425,7 +6427,7 @@ def fhz(self, hhh): physics_variables.alpha_power_total, physics_variables.aspect, physics_variables.bt, - physics_variables.dnitot, + physics_variables.nd_ions_total, physics_variables.dene, physics_variables.dnla, physics_variables.eps, @@ -6483,7 +6485,7 @@ def pcond( alpha_power_total, aspect, bt, - dnitot, + nd_ions_total, dene, dnla, eps, @@ -6516,7 +6518,7 @@ def pcond( aspect : input real : aspect ratio bt : input real : toroidal field on axis (T) dene : input real : volume averaged electron density (/m3) - dnitot : input real : total ion density (/m3) + nd_ions_total : input real : total ion density (/m3) dnla : input real : line-averaged electron density (/m3) eps : input real : inverse aspect ratio hfact : input real : H factor on energy confinement scalings @@ -7425,10 +7427,10 @@ def pcond( # Transport losses in Watts/m3 are 3/2 * n.e.T / tau , with T in eV # (here, tin and ten are in keV, and ptrepv and ptripv are in MW/m3) - ptripv = 2.403e-22 * dnitot * tin / tauei + ptripv = 2.403e-22 * nd_ions_total * tin / tauei ptrepv = 2.403e-22 * dene * ten / tauee - ratio = dnitot / dene * tin / ten + ratio = nd_ions_total / dene * tin / ten # Global energy confinement time diff --git a/process/physics_functions.py b/process/physics_functions.py index 65c1b70355..9f836e3fa4 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -921,7 +921,7 @@ def fast_alpha_beta( bt: float, dene: float, deni: float, - dnitot: float, + nd_ions_total: float, ten: float, tin: float, alpha_power_density_total: float, @@ -938,7 +938,7 @@ def fast_alpha_beta( bt (float): Toroidal field on axis (T). dene (float): Electron density (m^-3). deni (float): Fuel ion density (m^-3). - dnitot (float): Total ion density (m^-3). + nd_ions_total (float): Total ion density (m^-3). ten (float): Density-weighted electron temperature (keV). tin (float): Density-weighted ion temperature (keV). alpha_power_density_total (float): Alpha power per unit volume, from beams and plasma (MW/m^3). @@ -968,7 +968,7 @@ def fast_alpha_beta( 2.0 * constants.rmu0 * constants.kiloelectron_volt - * (dene * ten + dnitot * tin) + * (dene * ten + nd_ions_total * tin) / (bt**2 + bp**2) ) diff --git a/process/plasma_profiles.py b/process/plasma_profiles.py index 34ae3e3cdd..a298c9f31d 100644 --- a/process/plasma_profiles.py +++ b/process/plasma_profiles.py @@ -170,7 +170,7 @@ def parabolic_paramterisation(self) -> None: physics_variables.ne0 = physics_variables.dene * ( 1.0 + physics_variables.alphan ) - physics_variables.ni0 = physics_variables.dnitot * ( + physics_variables.ni0 = physics_variables.nd_ions_total * ( 1.0 + physics_variables.alphan ) diff --git a/process/profiles.py b/process/profiles.py index 6806ee255b..7e6813d5fe 100644 --- a/process/profiles.py +++ b/process/profiles.py @@ -231,7 +231,9 @@ def set_physics_variables(self) -> None: physics_variables.alphan, ) physics_variables.ni0 = ( - physics_variables.dnitot / physics_variables.dene * physics_variables.ne0 + physics_variables.nd_ions_total + / physics_variables.dene + * physics_variables.ne0 ) diff --git a/process/stellarator.py b/process/stellarator.py index 785f4f4268..50b8e290bf 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -225,7 +225,7 @@ def stigma(self): physics_variables.alpha_power_total, physics_variables.aspect, physics_variables.bt, - physics_variables.dnitot, + physics_variables.nd_ions_total, physics_variables.dene, physics_variables.dnla, physics_variables.eps, @@ -4097,7 +4097,7 @@ def stphys(self, output): * constants.electron_charge * ( physics_variables.dene * physics_variables.ten - + physics_variables.dnitot * physics_variables.tin + + physics_variables.nd_ions_total * physics_variables.tin ) / physics_variables.btot**2 ) @@ -4244,7 +4244,7 @@ def stphys(self, output): physics_variables.bt, physics_variables.dene, physics_variables.deni, - physics_variables.dnitot, + physics_variables.nd_ions_total, physics_variables.ten, physics_variables.tin, physics_variables.alpha_power_density_total, @@ -4412,7 +4412,7 @@ def stphys(self, output): physics_variables.alpha_power_total, physics_variables.aspect, physics_variables.bt, - physics_variables.dnitot, + physics_variables.nd_ions_total, physics_variables.dene, physics_variables.dnla, physics_variables.eps, diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 18a25a2769..cea8174036 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -342,12 +342,12 @@ end subroutine constraint_eqns subroutine constraint_err_001() !! Error in: Relationship between beta, temperature (keV) and density (consistency equation) !! author: P B Lloyd, CCFE, Culham Science Centre - use physics_variables, only: beta_fast_alpha, beta_beam, dene, ten, dnitot, tin, btot, beta + use physics_variables, only: beta_fast_alpha, beta_beam, dene, ten, nd_ions_total, tin, btot, beta write(*,*) 'beta_fast_alpha = ', beta_fast_alpha write(*,*) 'beta_beam = ', beta_beam write(*,*) 'dene = ', dene write(*,*) 'ten = ', ten - write(*,*) 'dnitot = ', dnitot + write(*,*) 'nd_ions_total = ', nd_ions_total write(*,*) 'tin = ', tin write(*,*) 'btot = ',btot write(*,*) 'beta = ', beta @@ -408,7 +408,7 @@ subroutine constraint_eqn_001(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! - \( T_i \) -- density weighted average ion temperature [keV] !! - \( B_{tot} \) -- total toroidal + poloidal field [T] - use physics_variables, only: beta_fast_alpha, beta_beam, dene, ten, dnitot, tin, btot, beta + use physics_variables, only: beta_fast_alpha, beta_beam, dene, ten, nd_ions_total, tin, btot, beta use constants, only: electron_charge,rmu0 implicit none @@ -423,7 +423,7 @@ subroutine constraint_eqn_001(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! constraint derived type tmp_cc = 1.0D0 - (beta_fast_alpha + beta_beam + & - 2.0D3*rmu0*electron_charge * (dene*ten + dnitot*tin)/btot**2 )/beta + 2.0D3*rmu0*electron_charge * (dene*ten + nd_ions_total*tin)/btot**2 )/beta tmp_con = beta * (1.0D0 - tmp_cc) tmp_err = beta * tmp_cc tmp_symbol = '=' diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 6cdd842038..a1e2b8796f 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -162,7 +162,7 @@ module physics_variables real(dp) :: dnelimt !! density limit (/m3) - real(dp) :: dnitot + real(dp) :: nd_ions_total !! total ion density (/m3) real(dp) :: dnla @@ -995,7 +995,7 @@ subroutine init_physics_variables beam_density_out = 0.0D0 beta_norm_max = 3.5D0 dnelimt = 0.0D0 - dnitot = 0.0D0 + nd_ions_total = 0.0D0 dnla = 0.0D0 nd_protons = 0.0D0 dntau = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 54d6657549..c82adb2cff 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -369,7 +369,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0610E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index c4376e3261..582759ef07 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -370,7 +370,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0610E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ae3ec15f1c..155ce0138a 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -370,7 +370,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0610E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d25a684078..d7166271d0 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -370,7 +370,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0610E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1669E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 2a31d1eb40..514ac4e07b 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -366,7 +366,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0540E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8740E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1228E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1228E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4478E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6305E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 79c48bf627..c210d20239 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -371,7 +371,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0571E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9000E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2224E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2224E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6171E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5133E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9913E+18 OP @@ -1534,7 +1534,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0612E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9344E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2520E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2520E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6475E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5610E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9829E+18 OP @@ -2697,7 +2697,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0643E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9611E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2702E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2702E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6635E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6426E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0041E+18 OP @@ -3860,7 +3860,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0597E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9217E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2309E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2309E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6217E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6633E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0286E+18 OP @@ -5023,7 +5023,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0593E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9187E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2331E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2331E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6270E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6208E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9989E+18 OP @@ -6186,7 +6186,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0557E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8886E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.2154E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2154E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6165E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5724E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9271E+18 OP @@ -7349,7 +7349,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0514E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8519E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1782E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1782E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5769E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6030E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9503E+18 OP @@ -8512,7 +8512,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0525E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8612E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1834E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1834E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5815E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6582E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9558E+18 OP @@ -9675,7 +9675,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0506E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8457E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1695E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1695E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5692E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6882E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9402E+18 OP @@ -10838,7 +10838,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0493E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8342E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1513E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1513E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5453E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7315E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9956E+18 OP @@ -12001,7 +12001,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0526E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8619E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1736E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1736E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5647E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7253E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0256E+18 OP @@ -13164,7 +13164,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0517E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8548E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1709E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1709E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5634E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6792E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0110E+18 OP @@ -14327,7 +14327,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0498E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8386E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1493E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1493E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5369E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7179E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0597E+18 OP @@ -15490,7 +15490,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0537E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8717E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1714E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1714E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5540E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7754E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1093E+18 OP @@ -16653,7 +16653,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0578E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9064E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1948E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1948E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5721E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.8337E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1614E+18 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index b05acb5dee..7420390e5f 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -225,7 +225,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -1220,7 +1220,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -2215,7 +2215,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -3210,7 +3210,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -4205,7 +4205,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -5200,7 +5200,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -6195,7 +6195,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -7190,7 +7190,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP @@ -8185,7 +8185,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 9.3569E+19 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 6.4863E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 0c15373010..fbc08a266d 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1673,7 +1673,7 @@ "beta_norm_max": 3.5, "dndrho_max": null, "dnelimt": 0.0, - "dnitot": 0.0, + "nd_ions_total": 0.0, "dnla": 0.0, "nd_protons": 0.0, "dntau": 0.0, @@ -9320,7 +9320,7 @@ "beta_norm_max": "Troyon-like coefficient for beta scaling calculated\n as 4*rli if `iprofile=1` (see also gtscale option)", "dndrho_max": "Maximum density gradient wrt to normalized r (rho) (/m3)", "dnelimt": "density limit (/m3)", - "dnitot": "total ion density (/m3)", + "nd_ions_total": "total ion density (/m3)", "dnla": "line averaged electron density (/m3)", "nd_protons": "proton ash density (/m3)", "dntau": "plasma average \"n-tau\" (seconds/m3)", @@ -19098,7 +19098,7 @@ "beam_density_out", "beta_norm_max", "dnelimt", - "dnitot", + "nd_ions_total", "dnla", "nd_protons", "dntau", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 7c33fae172..0eb703a167 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -366,7 +366,7 @@ Electron_density_on_axis_(/m3)__________________________________________ (ne0)_________________________ 1.0540E+20 OP Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8740E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP - Ion_density_(/m3)_______________________________________________________ (dnitot)______________________ 7.1228E+19 OP + Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1228E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4478E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6305E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 3cb1e4ea2d..3544d6fd2b 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -305,7 +305,7 @@ def test_bootstrap_fraction_wilson(bootstrapfractionwilsonparam, physics): class BootstrapFractionSauterParam(NamedTuple): - dnitot: Any = None + nd_ions_total: Any = None rminor: Any = None @@ -364,7 +364,7 @@ class BootstrapFractionSauterParam(NamedTuple): "bootstrapfractionsauterparam", ( BootstrapFractionSauterParam( - dnitot=7.1297522422781575e19, + nd_ions_total=7.1297522422781575e19, rminor=2.6666666666666665, tesep=0.10000000000000001, ti=12.570861186498382, @@ -408,7 +408,7 @@ def test_bootstrap_fraction_sauter(bootstrapfractionsauterparam, monkeypatch, ph """ monkeypatch.setattr( - physics_variables, "dnitot", bootstrapfractionsauterparam.dnitot + physics_variables, "nd_ions_total", bootstrapfractionsauterparam.nd_ions_total ) monkeypatch.setattr( @@ -1147,7 +1147,7 @@ class PlasmaCompositionParam(NamedTuple): aion: Any = None - dnitot: Any = None + nd_ions_total: Any = None f_nd_protium_electrons: Any = None @@ -1231,7 +1231,7 @@ class PlasmaCompositionParam(NamedTuple): expected_aion: Any = None - expected_dnitot: Any = None + expected_nd_ions_total: Any = None expected_zeffai: Any = None @@ -1299,7 +1299,7 @@ class PlasmaCompositionParam(NamedTuple): f_tritium=0.5, deni=0, aion=0, - dnitot=0, + nd_ions_total=0, f_nd_protium_electrons=0, zeffai=0, rncne=0, @@ -1356,7 +1356,7 @@ class PlasmaCompositionParam(NamedTuple): expected_m_fuel_amu=2.5145269632339478, expected_deni=5.8589175702454272e19, expected_aion=2.7395439636787726, - expected_dnitot=6.6125550702454276e19, + expected_nd_ions_total=6.6125550702454276e19, expected_zeffai=0.43248858851447464, expected_f_alpha_ion=0.3154069116809366, expected_dlamee=17.510652035055571, @@ -1419,7 +1419,7 @@ class PlasmaCompositionParam(NamedTuple): f_tritium=0.5, deni=5.8589175702454272e19, aion=2.7395439636787726, - dnitot=6.6125550702454276e19, + nd_ions_total=6.6125550702454276e19, f_nd_protium_electrons=0, zeffai=0.43248858851447464, rncne=0, @@ -1476,7 +1476,7 @@ class PlasmaCompositionParam(NamedTuple): expected_m_fuel_amu=2.5145269632339478, expected_deni=5.8576156204039725e19, expected_aion=2.739245767577763, - expected_dnitot=6.6125550702454276e19, + expected_nd_ions_total=6.6125550702454276e19, expected_zeffai=0.43258985127992111, expected_f_alpha_ion=0.26903878212105858, expected_dlamee=17.510652035055571, @@ -1547,7 +1547,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): monkeypatch.setattr(physics_variables, "aion", plasmacompositionparam.aion) - monkeypatch.setattr(physics_variables, "dnitot", plasmacompositionparam.dnitot) + monkeypatch.setattr( + physics_variables, "nd_ions_total", plasmacompositionparam.nd_ions_total + ) monkeypatch.setattr( physics_variables, @@ -1667,8 +1669,8 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): assert physics_variables.aion == pytest.approx(plasmacompositionparam.expected_aion) - assert physics_variables.dnitot == pytest.approx( - plasmacompositionparam.expected_dnitot + assert physics_variables.nd_ions_total == pytest.approx( + plasmacompositionparam.expected_nd_ions_total ) assert physics_variables.zeffai == pytest.approx( @@ -2182,7 +2184,7 @@ class PcondParam(NamedTuple): dene: Any = None - dnitot: Any = None + nd_ions_total: Any = None dnla: Any = None @@ -2257,7 +2259,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=6.1946504123280199, @@ -2301,7 +2303,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=0.96163409847948844, @@ -2345,7 +2347,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=1.1960655150953154, @@ -2389,7 +2391,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=0.78453691772934719, @@ -2433,7 +2435,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=1.1619079679077555, @@ -2477,7 +2479,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=1.7340642483550435, @@ -2521,7 +2523,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=1.1117392853827024, @@ -2565,7 +2567,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=0.84477227311274361, @@ -2609,7 +2611,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=1.6096667103064701, @@ -2653,7 +2655,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=0.67053301699102119, @@ -2697,7 +2699,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=2.1212580310552207, @@ -2741,7 +2743,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=50.095480115636271, @@ -2785,7 +2787,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=87.869318916638761, @@ -2829,7 +2831,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=28.562137619592285, @@ -2873,7 +2875,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=0.50082256309019457, @@ -2917,7 +2919,7 @@ class PcondParam(NamedTuple): aspect=3, bt=5.2375830857646202, dene=8.0593948787884524e19, - dnitot=7.1529510234203251e19, + nd_ions_total=7.1529510234203251e19, dnla=8.925359201116491e19, eps=0.33333333333333331, hfact=0.77961193402355955, @@ -2984,7 +2986,7 @@ def test_pcond(pcondparam, monkeypatch, physics): aspect=pcondparam.aspect, bt=pcondparam.bt, dene=pcondparam.dene, - dnitot=pcondparam.dnitot, + nd_ions_total=pcondparam.nd_ions_total, dnla=pcondparam.dnla, eps=pcondparam.eps, hfact=pcondparam.hfact, diff --git a/tests/unit/test_physics_functions.py b/tests/unit/test_physics_functions.py index fc5ac4c358..08b305ee16 100644 --- a/tests/unit/test_physics_functions.py +++ b/tests/unit/test_physics_functions.py @@ -25,7 +25,7 @@ class SetFusionPowersParam(NamedTuple): deni: Any = None - dnitot: Any = None + nd_ions_total: Any = None f_alpha_electron: Any = None diff --git a/tests/unit/test_plasma_profiles.py b/tests/unit/test_plasma_profiles.py index 085b06bb25..4d3ab9f291 100644 --- a/tests/unit/test_plasma_profiles.py +++ b/tests/unit/test_plasma_profiles.py @@ -161,7 +161,7 @@ class PlasmaProfilesParam(NamedTuple): alphat: float = 0.0 - dnitot: float = 0.0 + nd_ions_total: float = 0.0 neped: float = 0.0 @@ -234,7 +234,7 @@ class PlasmaProfilesParam(NamedTuple): tratio=1, dnla=0.0, alphat=1.45, - dnitot=6.9461125748017857e19, + nd_ions_total=6.9461125748017857e19, neped=6.1916268627398164e19, ti=12.9, rhopedn=0.94000000000000006, @@ -279,7 +279,7 @@ class PlasmaProfilesParam(NamedTuple): tratio=1, dnla=8.8687354645836431e19, alphat=1.45, - dnitot=6.9461125748017857e19, + nd_ions_total=6.9461125748017857e19, neped=6.1916268627398164e19, ti=13.07, rhopedn=0.94000000000000006, @@ -357,7 +357,9 @@ def test_plasma_profiles(plasmaprofilesparam, monkeypatch): monkeypatch.setattr(physics_variables, "alphat", plasmaprofilesparam.alphat) - monkeypatch.setattr(physics_variables, "dnitot", plasmaprofilesparam.dnitot) + monkeypatch.setattr( + physics_variables, "nd_ions_total", plasmaprofilesparam.nd_ions_total + ) monkeypatch.setattr(physics_variables, "neped", plasmaprofilesparam.neped) diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index 4edd6dccd0..458894ab0b 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -154,7 +154,7 @@ class ProcessTracker: "n_tf", "bmaxtf", "vstot", - "dnitot", + "nd_ions_total", "t_burn", "divlife", "CostModel2.step20", From 642b58e202e7fbb30b9e7db423e87bc55299c9fc Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 09:44:18 +0000 Subject: [PATCH 12/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20dnz=20variable=20?= =?UTF-8?q?to=20nd=5Fimpurities=20for=20consistency=20across=20the=20codeb?= =?UTF-8?q?ase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/mfile_comparison.py | 2 +- process/io/plot_proc.py | 6 ++-- process/physics.py | 10 +++---- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 20 ++++++++----- tracking/tracking_data.py | 2 +- 21 files changed, 72 insertions(+), 66 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index c671185190..99abdb14b3 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -371,7 +371,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2127E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5392E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6024E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6024E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6709E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8502E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 7e78906d87..756a9c4aad 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -372,7 +372,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index e0a47af38c..95fa2bff7e 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -372,7 +372,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index a888f5f2cc..48293700f3 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -372,7 +372,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protonstons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index e67f4e3768..b973217b66 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -372,7 +372,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 2af2d86439..ebd9833282 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -227,7 +227,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -1222,7 +1222,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -2217,7 +2217,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -3212,7 +3212,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -4207,7 +4207,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -5202,7 +5202,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -6197,7 +6197,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -7192,7 +7192,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -8187,7 +8187,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 17c90456ca..4edf6ca0e3 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -129,7 +129,7 @@ "teped", "neped", "zeff", - "dnz", + "nd_impurities", "taueff", "hfact", "tauelaw", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index df8236006a..a820a68e08 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2392,7 +2392,9 @@ def plot_physics_info(axis, mfile_data, scan): "dlimit(7)" ].get_scan(scan) - dnz = mfile_data.data["dnz"].get_scan(scan) / mfile_data.data["dene"].get_scan(scan) + nd_impurities = mfile_data.data["nd_impurities"].get_scan(scan) / mfile_data.data[ + "dene" + ].get_scan(scan) tepeak = mfile_data.data["te0"].get_scan(scan) / mfile_data.data["te"].get_scan( scan @@ -2425,7 +2427,7 @@ def plot_physics_info(axis, mfile_data, scan): (tepeak, r"$T_{e0} \ / \ \langle T_e \rangle$", ""), (nepeak, r"$n_{e0} \ / \ \langle n_{\mathrm{e, vol}} \rangle$", ""), ("zeff", r"$Z_{\mathrm{eff}}$", ""), - (dnz, r"$n_Z \ / \ \langle n_{\mathrm{e, vol}} \rangle$", ""), + (nd_impurities, r"$n_Z \ / \ \langle n_{\mathrm{e, vol}} \rangle$", ""), ("taueff", r"$\tau_e$", "s"), ("hfact", "H-factor", ""), (pthresh, "H-mode threshold", "MW"), diff --git a/process/physics.py b/process/physics.py index 29a2de26e0..c3f68e801e 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2741,10 +2741,10 @@ def plasma_composition(): ) # Total impurity density - physics_variables.dnz = 0.0 + physics_variables.nd_impurities = 0.0 for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: - physics_variables.dnz += ( + physics_variables.nd_impurities += ( impurity_radiation_module.impurity_arr_frac[imp] * physics_variables.dene ) @@ -2755,7 +2755,7 @@ def plasma_composition(): + physics_variables.nd_alphas + physics_variables.nd_protons + physics_variables.nd_beam_ions - + physics_variables.dnz + + physics_variables.nd_impurities ) # Set some (obsolescent) impurity fraction variables @@ -3952,8 +3952,8 @@ def outplas(self): po.ovarre( self.outfile, "Total impurity density with Z > 2 (no He) (/m3)", - "(dnz)", - physics_variables.dnz, + "(nd_impurities)", + physics_variables.nd_impurities, "OP ", ) po.ovarre( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index a1e2b8796f..7bd17eb67a 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -174,7 +174,7 @@ module physics_variables real(dp) :: dntau !! plasma average "n-tau" (seconds/m3) - real(dp) :: dnz + real(dp) :: nd_impurities !! high Z ion density (/m3) real(dp) :: gradient_length_ne @@ -999,7 +999,7 @@ subroutine init_physics_variables dnla = 0.0D0 nd_protons = 0.0D0 dntau = 0.0D0 - dnz = 0.0D0 + nd_impurities = 0.0D0 beta_poloidal_eps_max = 1.38D0 eps = 0.34399724802D0 aux_current_fraction = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index c82adb2cff..1cfa8cbaf2 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -371,7 +371,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 582759ef07..1ab2ed8036 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -372,7 +372,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 155ce0138a..57b01ae8db 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -372,7 +372,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d7166271d0..1922d025e7 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -372,7 +372,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6503E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 514ac4e07b..286c24ad39 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -368,7 +368,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1228E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4478E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6305E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6305E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8769E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index c210d20239..07a2fcb6d9 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -373,7 +373,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2224E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6171E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5133E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.5133E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9913E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6531E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -1536,7 +1536,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2520E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6475E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5610E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.5610E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9829E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6508E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -2699,7 +2699,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2702E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6635E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6426E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6426E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0041E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6567E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -3862,7 +3862,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2309E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6217E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6633E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6633E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0286E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6696E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -5025,7 +5025,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2331E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6270E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6208E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6208E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9989E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6614E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -6188,7 +6188,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2154E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6165E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.5724E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.5724E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9271E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6415E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -7351,7 +7351,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1782E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5769E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6030E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6030E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9503E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6542E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -8514,7 +8514,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1834E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5815E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6582E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6582E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9558E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6557E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -9677,7 +9677,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1695E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5692E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6882E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6882E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9402E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6513E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -10840,7 +10840,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1513E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5453E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7315E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.7315E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9956E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6731E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -12003,7 +12003,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1736E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5647E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7253E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.7253E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0256E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6815E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -13166,7 +13166,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1709E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5634E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6792E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6792E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0110E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6774E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -14329,7 +14329,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1493E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5369E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7179E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.7179E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0597E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6975E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -15492,7 +15492,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1714E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5540E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.7754E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.7754E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1093E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.7114E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -16655,7 +16655,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1948E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5721E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.8337E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.8337E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1614E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.7260E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 7420390e5f..89c5140962 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -227,7 +227,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -1222,7 +1222,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -2217,7 +2217,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -3212,7 +3212,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -4207,7 +4207,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -5202,7 +5202,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -6197,7 +6197,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -7192,7 +7192,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP @@ -8187,7 +8187,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 2.8906E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index fbc08a266d..b6ccbc76cb 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1677,7 +1677,7 @@ "dnla": 0.0, "nd_protons": 0.0, "dntau": 0.0, - "dnz": 0.0, + "nd_impurities": 0.0, "double": "selected_real_kind(15, 300)", "dp_": 8.0, "dp_bb_ib": 0.0, @@ -9324,7 +9324,7 @@ "dnla": "line averaged electron density (/m3)", "nd_protons": "proton ash density (/m3)", "dntau": "plasma average \"n-tau\" (seconds/m3)", - "dnz": "high Z ion density (/m3)", + "nd_impurities": "high Z ion density (/m3)", "double": "", "dp_": "", "dp_bb_ib": "", @@ -19102,7 +19102,7 @@ "dnla", "nd_protons", "dntau", - "dnz", + "nd_impurities", "dndrho_max", "dtdrho_max", "beta_poloidal_eps_max", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 0eb703a167..a3e7d77bdf 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -368,7 +368,7 @@ Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1228E+19 OP Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4478E+19 OP - Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (dnz)_________________________ 4.6305E+16 OP + Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6305E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8769E+16 OP Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 3544d6fd2b..09d93e9467 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1167,7 +1167,7 @@ class PlasmaCompositionParam(NamedTuple): zeff: Any = None - dnz: Any = None + nd_impurities: Any = None pcoef: Any = None @@ -1241,7 +1241,7 @@ class PlasmaCompositionParam(NamedTuple): expected_zeff: Any = None - expected_dnz: Any = None + expected_nd_impurities: Any = None expected_m_beam_amu: Any = None @@ -1309,7 +1309,7 @@ class PlasmaCompositionParam(NamedTuple): dlamee=0, rnbeam=0, zeff=0, - dnz=0, + nd_impurities=0, pcoef=0, alpha_rate_density_total=0, rnfene=0, @@ -1361,7 +1361,7 @@ class PlasmaCompositionParam(NamedTuple): expected_f_alpha_ion=0.3154069116809366, expected_dlamee=17.510652035055571, expected_zeff=2.0909945616489103, - expected_dnz=28875000000000004, + expected_nd_impurities=28875000000000004, expected_m_beam_amu=2.01355414, expected_dlamie=17.810652035055568, expected_nd_alphas=7.5e18, @@ -1429,7 +1429,7 @@ class PlasmaCompositionParam(NamedTuple): dlamee=17.510652035055571, rnbeam=0, zeff=2.0909945616489103, - dnz=28875000000000004, + nd_impurities=28875000000000004, pcoef=1.0521775929921553, alpha_rate_density_total=1.973996644759543e17, rnfene=0, @@ -1481,7 +1481,7 @@ class PlasmaCompositionParam(NamedTuple): expected_f_alpha_ion=0.26903878212105858, expected_dlamee=17.510652035055571, expected_zeff=2.0909945616489103, - expected_dnz=28875000000000004, + expected_nd_impurities=28875000000000004, expected_m_beam_amu=2.01355414, expected_dlamie=17.810652035055568, expected_nd_alphas=7.5e18, @@ -1575,7 +1575,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): monkeypatch.setattr(physics_variables, "zeff", plasmacompositionparam.zeff) - monkeypatch.setattr(physics_variables, "dnz", plasmacompositionparam.dnz) + monkeypatch.setattr( + physics_variables, "nd_impurities", plasmacompositionparam.nd_impurities + ) monkeypatch.setattr(physics_variables, "pcoef", plasmacompositionparam.pcoef) @@ -1687,7 +1689,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): assert physics_variables.zeff == pytest.approx(plasmacompositionparam.expected_zeff) - assert physics_variables.dnz == pytest.approx(plasmacompositionparam.expected_dnz) + assert physics_variables.nd_impurities == pytest.approx( + plasmacompositionparam.expected_nd_impurities + ) assert physics_variables.m_beam_amu == pytest.approx( plasmacompositionparam.expected_m_beam_amu diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index 458894ab0b..ff35d3b54c 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -140,7 +140,7 @@ class ProcessTracker: "pradmw", "ne0", "aux_current_fraction", - "dnz", + "nd_impurities", "taueff", "te0", "pdivt", From 69da8c6080cbf14b0bec1e479c25edbccdcbe683 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 10:27:26 +0000 Subject: [PATCH 13/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20aion=20variable?= =?UTF-8?q?=20to=20m=5Fions=5Ftotal=5Famu=20for=20consistency=20across=20t?= =?UTF-8?q?he=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +-- process/divertor.py | 34 +++--- process/physics.py | 105 +++++++++++++----- process/stellarator.py | 2 +- source/fortran/physics_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++--- tests/integration/data/scan_MFILE.DAT | 18 +-- tests/integration/ref_dicts.json | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_divertor.py | 12 +- tests/unit/test_physics.py | 20 ++-- 21 files changed, 164 insertions(+), 107 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 99abdb14b3..93e101d2f6 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -392,7 +392,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.6323E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7208E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7208E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.4867E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 756a9c4aad..738c582c27 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -393,7 +393,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7149E-04 ITV W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7252E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7252E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5164E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 95fa2bff7e..9c1e4fbf57 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -393,7 +393,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7149E-04 ITV W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7252E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7252E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5164E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 48293700f3..905980d743 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -393,7 +393,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7149E-04 ITV W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7252E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7252E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5164E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index b973217b66..e220c4daad 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -393,7 +393,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7149E-04 ITV W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7252E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7252E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5164E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index ebd9833282..c129127e7a 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -248,7 +248,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -1243,7 +1243,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -2238,7 +2238,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -3233,7 +3233,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -4228,7 +4228,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -5223,7 +5223,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -6218,7 +6218,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -7213,7 +7213,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -8208,7 +8208,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/process/divertor.py b/process/divertor.py index 92f34e9715..3f273ce2e3 100644 --- a/process/divertor.py +++ b/process/divertor.py @@ -189,7 +189,7 @@ def run(self, output: bool) -> None: def divert( self, adas, - aion, + m_ions_total_amu, anginc, delne, c1div, @@ -225,8 +225,8 @@ def divert( :param adas: divertor flux area / main plasma area (long separatrix) :type adas: float - :param aion: ion mass (assumes fuel only) (AMU) - :type aion: float + :param m_ions_total_amu: ion mass (assumes fuel only) (AMU) + :type m_ions_total_amu: float :param anginc: pol. angle of incidence of field line on plate (rad) @@ -341,7 +341,7 @@ def divert( delty = tdiv * epsilon f1 = self.ftpts( - aion, + m_ions_total_amu, coefl, delne, fififi, @@ -355,7 +355,7 @@ def divert( tdiv, ) f2 = self.ftdiv( - aion, + m_ions_total_amu, coefl, delne, fififi, @@ -371,7 +371,7 @@ def divert( f1dx = ( self.ftpts( - aion, + m_ions_total_amu, coefl, delne, fififi, @@ -388,7 +388,7 @@ def divert( ) / deltx f1dy = ( self.ftpts( - aion, + m_ions_total_amu, coefl, delne, fififi, @@ -405,7 +405,7 @@ def divert( ) / delty f2dx = ( self.ftdiv( - aion, + m_ions_total_amu, coefl, delne, fififi, @@ -422,7 +422,7 @@ def divert( ) / deltx f2dy = ( self.ftdiv( - aion, + m_ions_total_amu, coefl, delne, fififi, @@ -553,7 +553,7 @@ def erprcy(self, tdiv: float, ndiv: float) -> float: def ftdiv( self, - aion: float, + m_ions_total_amu: float, coefl: float, delne: float, fififi: float, @@ -573,8 +573,8 @@ def ftdiv( This function calculates an estimate for the divertor temperature (eV). Report ITER-IL-PH-13-9-e12 - :param aion: ion mass (assumes fuel only) (AMU) - :type aion: float + :param m_ions_total_amu: ion mass (assumes fuel only) (AMU) + :type m_ions_total_amu: float :param coefl: little 'l' in Harrison model :type coefl: float @@ -624,7 +624,7 @@ def ftdiv( eier = self.erprcy(yys, dendiv) ff = ( 20.16e0 - * aion + * m_ions_total_amu * ( (qdiv) ** 10 * (c27 * xpara) ** 4 @@ -641,7 +641,7 @@ def ftdiv( def ftpts( self, - aion: float, + m_ions_total_amu: float, coefl: float, delne: float, fififi: float, @@ -661,8 +661,8 @@ def ftpts( This function updates the divertor model temperature ratio solution. Report ITER-IL-PH-13-9-e12 - :param aion: ion mass (assumes fuel only) (AMU) - :type aion: float + :param m_ions_total_amu: ion mass (assumes fuel only) (AMU) + :type m_ions_total_amu: float :param coefl: little 'l' in Harrison model :type coefl: float @@ -712,7 +712,7 @@ def ftpts( ff = ( xxs**3.5e0 + 9.66e0 - * (xxs / aion) ** 0.9e0 + * (xxs / m_ions_total_amu) ** 0.9e0 * (xperp / (qdiv) ** 2) ** 0.8e0 * coefl / (2.0e0 * xpara / 7.0e0) diff --git a/process/physics.py b/process/physics.py index c3f68e801e..5ca8d5fbed 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2161,7 +2161,7 @@ def physics(self): physics_variables.rminor, physics_variables.kappa, physics_variables.a_plasma_surface, - physics_variables.aion, + physics_variables.m_ions_total_amu, physics_variables.aspect, physics_variables.plasma_current, ) @@ -2655,15 +2655,36 @@ def calculate_density_limit( return dlimit, dlimit[i_density_limit - 1] @staticmethod - def plasma_composition(): - """Calculates various plasma component fractional makeups - author: P J Knight, CCFE, Culham Science Centre + def plasma_composition() -> None: + """ + Calculates various plasma component fractional makeups. + + Author: P J Knight, CCFE, Culham Science Centre + + This subroutine determines the various plasma component fractional makeups. + It is the replacement for the original routine betcom(), and is used in conjunction + with the new impurity radiation model. + + This function performs the following calculations: + - Determines the alpha ash portion. + - Calculates the proton density. + - Calculates the beam hot ion component. + - Sums the ion densities for all impurity ions with charge greater than helium. + - Ensures charge neutrality by adjusting the fuel portion. + - Calculates the total ion density. + - Sets impurity fractions for radiation calculations. + - Calculates the effective charge. + - Defines the Coulomb logarithm for ion-electron and electron-electron collisions. + - Calculates the fraction of alpha energy to ions and electrons. + - Calculates the average atomic masses of injected fuel species and neutral beams. + - Calculates the density weighted mass and mass weighted plasma effective charge. + + Notes: + - This subroutine determines the various plasma component - fractional makeups. It is the replacement for the original - It is the replacement for the original routine betcom, - and is used in conjunction with the new impurity radiation model + References: """ + # Alpha ash portion physics_variables.nd_alphas = physics_variables.dene * physics_variables.ralpne @@ -2838,7 +2859,7 @@ def plasma_composition(): ) + (constants.m_triton_amu * current_drive_variables.f_tritium_beam) # Density weighted mass - physics_variables.aion = ( + physics_variables.m_ions_total_amu = ( physics_variables.m_fuel_amu * physics_variables.deni + (constants.m_alpha_amu * physics_variables.nd_alphas) + physics_variables.nd_protons @@ -2846,14 +2867,14 @@ def plasma_composition(): ) for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: - physics_variables.aion += ( + physics_variables.m_ions_total_amu += ( physics_variables.dene * impurity_radiation_module.impurity_arr_frac[imp] * impurity_radiation_module.impurity_arr_amass[imp] ) - physics_variables.aion = ( - physics_variables.aion / physics_variables.nd_ions_total + physics_variables.m_ions_total_amu = ( + physics_variables.m_ions_total_amu / physics_variables.nd_ions_total ) # Mass weighted plasma effective charge @@ -3297,7 +3318,7 @@ def outplas(self): physics_module.rho_star = np.sqrt( 2.0e0 * constants.proton_mass - * physics_variables.aion + * physics_variables.m_ions_total_amu * physics_module.e_plasma_beta / (3.0e0 * physics_variables.vol_plasma * physics_variables.dnla) ) / ( @@ -4036,8 +4057,8 @@ def outplas(self): po.ovarre( self.outfile, "Average mass of all ions (amu)", - "(aion)", - physics_variables.aion, + "(m_ions_total_amu)", + physics_variables.m_ions_total_amu, "OP ", ) # MDK Say which impurity is varied, if iteration variable fimpvar (102) is turned on @@ -7395,7 +7416,7 @@ def pcond( # (with V (m3) the plasma volume inside the LCFS), # inverse aspect ratio epsilon = a/Rgeo # effective atomic mass Meff of the plasma - NOT defined, but I have taken it equal to - # aion = average mass of all ions (amu). + # m_ions_total_amu = average mass of all ions (amu). # energy confinement time is given by τE,th = Wth/Pl,th, where Wth is the thermal stored energy. # The latter is derived from the total stored energy Wtot by subtracting the energy # content associated to fast particles originating from plasma heating. @@ -7411,7 +7432,7 @@ def pcond( * (1 + physics_variables.triang) ** 0.36 * physics_variables.kappaa_ipb**0.8 * eps**0.35 - * physics_variables.aion**0.2 + * physics_variables.m_ions_total_amu**0.2 ) else: @@ -7468,16 +7489,27 @@ def res_diff_time(rmajor, res_plasma, kappa95): def pthresh( + dene, + dnla, + bt, + rmajor, + rminor, + kappa, + a_plasma_surface, - aion, + + m_ions_total_amu, + aspect, + plasma_current, +, ): """L-mode to H-mode power threshold calculation @@ -7499,7 +7531,7 @@ def pthresh( :param rminor: plasma minor radius (m) :param kappa: plasma elongation :param a_plasma_surface: plasma surface area (m2) - :param aion: average mass of all ions (amu) + :param m_ions_total_amu: average mass of all ions (amu) :param aspect: aspect ratio :param plasma_current: plasma current (A) @@ -7528,7 +7560,13 @@ def pthresh( # Martin et al (2008) for recent ITER scaling, with mass correction # and 95% confidence limits - martin = 0.0488 * dnla20**0.717 * bt**0.803 * a_plasma_surface**0.941 * (2.0 / aion) + martin = ( + 0.0488 + * dnla20**0.717 + * bt**0.803 + * a_plasma_surface**0.941 + * (2.0 / m_ions_total_amu) + ) martin_error = ( np.sqrt( 0.057**2 @@ -7543,20 +7581,35 @@ def pthresh( # Snipes et al (2000) scaling with mass correction # Nominal, upper and lower - snipes_2000 = 1.42 * dnla20**0.58 * bt**0.82 * rmajor * rminor**0.81 * (2.0 / aion) + snipes_2000 = 1.42 + * dnla20**0.58 + * bt**0.82 + * rmajor + * rminor**0.81 + * (2.0 / m_ions_total_amu) snipes_2000_ub = ( - 1.547 * dnla20**0.615 * bt**0.851 * rmajor**1.089 * rminor**0.876 * (2.0 / aion) + 1.547 * dnla20**0.615 * bt**0.851 * rmajor**1.089 * rminor**0.876 * (2.0 / m_ions_total_amu) ) snipes_2000_lb = ( - 1.293 * dnla20**0.545 * bt**0.789 * rmajor**0.911 * rminor**0.744 * (2.0 / aion) + 1.293 * dnla20**0.545 * bt**0.789 * rmajor**0.911 * rminor**0.744 * (2.0 / m_ions_total_amu) ) # Snipes et al (2000) scaling (closed divertor) with mass correction # Nominal, upper and lower - snipes_2000_cd = 0.8 * dnla20**0.5 * bt**0.53 * rmajor**1.51 * (2.0 / aion) - snipes_2000_cd_ub = 0.867 * dnla20**0.561 * bt**0.588 * rmajor**1.587 * (2.0 / aion) - snipes_2000_cd_lb = 0.733 * dnla20**0.439 * bt**0.472 * rmajor**1.433 * (2.0 / aion) + snipes_2000_cd = ( + 0.8 * dnla20**0.5 * bt**0.53 * rmajor**1.51 * (2.0 / m_ions_total_amu) + ) + snipes_2000_cd_ub = 0.867 + * dnla20**0.561 + * bt**0.588 + * rmajor**1.587 + * (2.0 / m_ions_total_amu) + snipes_2000_cd_lb = 0.733 + * dnla20**0.439 + * bt**0.472 + * rmajor**1.433 + * (2.0 / m_ions_total_amu) # Hubbard et al. 2012 L-I threshold scaling hubbard_2012 = 2.11 * (plasma_current / 1e6) ** 0.94 * dnla20**0.65 diff --git a/process/stellarator.py b/process/stellarator.py index 50b8e290bf..44610ab5e2 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4113,7 +4113,7 @@ def stphys(self, output): physics_module.rho_star = np.sqrt( 2.0e0 * constants.proton_mass - * physics_variables.aion + * physics_variables.m_ions_total_amu * physics_module.e_plasma_beta / (3.0e0 * physics_variables.vol_plasma * physics_variables.dnla) ) / ( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 7bd17eb67a..9ec8a32e9d 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -23,7 +23,7 @@ module physics_variables real(dp) :: m_fuel_amu !! average mass of fuel portion of ions (amu) - real(dp) :: aion + real(dp) :: m_ions_total_amu !! average mass of all ions (amu) real(dp) :: alphaj @@ -949,7 +949,7 @@ subroutine init_physics_variables m_beam_amu = 0.0D0 m_fuel_amu = 0.0D0 - aion = 0.0D0 + m_ions_total_amu = 0.0D0 alphaj = 1.0D0 alphan = 0.25D0 alphap = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 1cfa8cbaf2..b2853cbd2d 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -392,7 +392,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7149E-04 ITV W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7252E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7252E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5164E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 1ab2ed8036..6f1714d737 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -393,7 +393,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7149E-04 ITV W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7252E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7252E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5164E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 57b01ae8db..b90867a389 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -393,7 +393,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7149E-04 ITV W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7252E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7252E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5164E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 1922d025e7..f469094e8d 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -393,7 +393,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7149E-04 ITV W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7252E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7252E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5164E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 286c24ad39..dee92c5c16 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -389,7 +389,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7287E-04 ITV W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7244E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7244E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5206E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 07a2fcb6d9..34a2d00fb5 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -394,7 +394,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.5660E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7049E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7049E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.4502E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -1557,7 +1557,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.6035E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7047E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7047E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.4581E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -2720,7 +2720,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.6875E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7061E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7061E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.4776E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -3883,7 +3883,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7385E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7081E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7081E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.4941E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -5046,7 +5046,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.6877E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7066E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7066E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.4817E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -6209,7 +6209,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.6468E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7048E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7048E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.4709E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -7372,7 +7372,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7087E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7069E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7069E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.4899E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -8535,7 +8535,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7717E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7078E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7078E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5045E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -9698,7 +9698,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.8195E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7085E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7085E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5155E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -10861,7 +10861,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.8813E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7109E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7109E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5350E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -12024,7 +12024,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.8551E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7108E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7108E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5291E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -13187,7 +13187,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.8022E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7097E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7097E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5166E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -14350,7 +14350,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.8614E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7121E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7121E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5348E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -15513,7 +15513,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.9111E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7135E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7135E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5471E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -16676,7 +16676,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.9603E-04 W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7149E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7149E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5593E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 89c5140962..bf1a869f6c 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -248,7 +248,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -1243,7 +1243,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -2238,7 +2238,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -3233,7 +3233,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -4228,7 +4228,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -5223,7 +5223,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -6218,7 +6218,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -7213,7 +7213,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 @@ -8208,7 +8208,7 @@ Kr_concentration________________________________________________________ (fimp(12)_____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13)_____________________ 3.5634E-04 W__concentration________________________________________________________ (fimp(14)_____________________ 5.0000E-05 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.6725E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.6725E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.1247E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b6ccbc76cb..c002ce50ab 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -226,7 +226,7 @@ "afwi": 0.008, "afwo": 0.008, "aintmass": 0.0, - "aion": 0.0, + "m_ions_total_amu": 0.0, "airtemp": 15.0, "aiwp": 0.0, "alam": null, @@ -8799,7 +8799,7 @@ "afwi": "inner radius of inboard first wall/blanket coolant channels (stellarator only) (m)", "afwo": "inner radius of outboard first wall/blanket coolant channels (stellarator only) (m)", "aintmass": "intercoil structure mass (kg)", - "aion": "average mass of all ions (amu)", + "m_ions_total_amu": "average mass of all ions (amu)", "airtemp": "ambient air temperature (degrees Celsius)", "aiwp": "winding pack turn insulation area per coil (m2)", "alam": "", @@ -19063,7 +19063,7 @@ "ipnlaws", "m_beam_amu", "m_fuel_amu", - "aion", + "m_ions_total_amu", "alphaj", "alphan", "alphap", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index a3e7d77bdf..20b8186906 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -389,7 +389,7 @@ Kr_concentration________________________________________________________ (fimp(12))____________________ 0.0000E+00 Xe_concentration________________________________________________________ (fimp(13))____________________ 5.7287E-04 ITV W__concentration________________________________________________________ (fimp(14))____________________ 5.0000E-06 - Average_mass_of_all_ions_(amu)__________________________________________ (aion)________________________ 2.7244E+00 OP + Average_mass_of_all_ions_(amu)__________________________________________ (m_ions_total_amu)________________________ 2.7244E+00 OP Effective_charge________________________________________________________ (zeff)________________________ 2.5206E+00 Density_profile_factor__________________________________________________ (alphan)______________________ 1.0000E+00 Plasma_profile_model____________________________________________________ (ipedestal)___________________ 1 diff --git a/tests/unit/test_divertor.py b/tests/unit/test_divertor.py index 4b5dff2299..fddc597351 100644 --- a/tests/unit/test_divertor.py +++ b/tests/unit/test_divertor.py @@ -27,7 +27,7 @@ def test_divert(self, divertor): :type divertor: tests.unit.test_divertor.divertor (functional fixture) """ adas = 0.052617908173833536 - aion = 2.5 + m_ions_total_amu = 2.5 anginc = 0.262 c1div = 0.45 c2div = -7 @@ -80,7 +80,7 @@ def test_divert(self, divertor): tsep, ) = divertor.divert( adas, - aion, + m_ions_total_amu, anginc, delne, c1div, @@ -219,7 +219,7 @@ def test_ftdiv(self, divertor): :param divertor: fixture containing an initialised `Divertor` object :type divertor: tests.unit.test_divertor.divertor (functional fixture) """ - aion = 2.5 + m_ions_total_amu = 2.5 coefl = 1.3854518853592164 delne = 0.34294618459618942 fififi = 0.0040000000000000001 @@ -235,7 +235,7 @@ def test_ftdiv(self, divertor): expected_ftdiv = 140.7905577701393 ftdiv = divertor.ftdiv( - aion, + m_ions_total_amu, coefl, delne, fififi, @@ -259,7 +259,7 @@ def test_ftpts(self, divertor): :param divertor: fixture containing an initialised `Divertor` object :type divertor: tests.unit.test_divertor.divertor (functional fixture) """ - aion = 2.5 + m_ions_total_amu = 2.5 coefl = 1.3854518853592164 delne = 0.34294618459618942 fififi = 0.0040000000000000001 @@ -275,7 +275,7 @@ def test_ftpts(self, divertor): expected_ftpts = -7.962899353691732 ftpts = divertor.ftpts( - aion, + m_ions_total_amu, coefl, delne, fififi, diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 09d93e9467..f732b1875d 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1145,7 +1145,7 @@ class PlasmaCompositionParam(NamedTuple): deni: Any = None - aion: Any = None + m_ions_total_amu: Any = None nd_ions_total: Any = None @@ -1229,7 +1229,7 @@ class PlasmaCompositionParam(NamedTuple): expected_deni: Any = None - expected_aion: Any = None + expected_m_ions_total_amu: Any = None expected_nd_ions_total: Any = None @@ -1298,7 +1298,7 @@ class PlasmaCompositionParam(NamedTuple): m_fuel_amu=0, f_tritium=0.5, deni=0, - aion=0, + m_ions_total_amu=0, nd_ions_total=0, f_nd_protium_electrons=0, zeffai=0, @@ -1355,7 +1355,7 @@ class PlasmaCompositionParam(NamedTuple): expected_f_alpha_electron=0.6845930883190634, expected_m_fuel_amu=2.5145269632339478, expected_deni=5.8589175702454272e19, - expected_aion=2.7395439636787726, + expected_m_ions_total_amu=2.7395439636787726, expected_nd_ions_total=6.6125550702454276e19, expected_zeffai=0.43248858851447464, expected_f_alpha_ion=0.3154069116809366, @@ -1418,7 +1418,7 @@ class PlasmaCompositionParam(NamedTuple): m_fuel_amu=2.5, f_tritium=0.5, deni=5.8589175702454272e19, - aion=2.7395439636787726, + m_ions_total_amu=2.7395439636787726, nd_ions_total=6.6125550702454276e19, f_nd_protium_electrons=0, zeffai=0.43248858851447464, @@ -1475,7 +1475,7 @@ class PlasmaCompositionParam(NamedTuple): expected_f_alpha_electron=0.73096121787894142, expected_m_fuel_amu=2.5145269632339478, expected_deni=5.8576156204039725e19, - expected_aion=2.739245767577763, + expected_m_ions_total_amu=2.739245767577763, expected_nd_ions_total=6.6125550702454276e19, expected_zeffai=0.43258985127992111, expected_f_alpha_ion=0.26903878212105858, @@ -1545,7 +1545,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): monkeypatch.setattr(physics_variables, "deni", plasmacompositionparam.deni) - monkeypatch.setattr(physics_variables, "aion", plasmacompositionparam.aion) + monkeypatch.setattr( + physics_variables, "m_ions_total_amu", plasmacompositionparam.m_ions_total_amu + ) monkeypatch.setattr( physics_variables, "nd_ions_total", plasmacompositionparam.nd_ions_total @@ -1669,7 +1671,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): assert physics_variables.deni == pytest.approx(plasmacompositionparam.expected_deni) - assert physics_variables.aion == pytest.approx(plasmacompositionparam.expected_aion) + assert physics_variables.m_ions_total_amu == pytest.approx( + plasmacompositionparam.expected_m_ions_total_amu + ) assert physics_variables.nd_ions_total == pytest.approx( plasmacompositionparam.expected_nd_ions_total From c8e047029b667c4b93724d1e85caac54fea39902 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 11:14:29 +0000 Subject: [PATCH 14/48] =?UTF-8?q?=F0=9F=94=84=20Add=20atomic=20mass=20cons?= =?UTF-8?q?tants=20for=20various=20elements=20to=20improve=20code=20clarit?= =?UTF-8?q?y=20and=20maintainability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/impurity_radiation.py | 29 ++++++++------- source/fortran/constants.f90 | 70 +++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 14 deletions(-) diff --git a/process/impurity_radiation.py b/process/impurity_radiation.py index 826b575c32..5eed4eb0da 100644 --- a/process/impurity_radiation.py +++ b/process/impurity_radiation.py @@ -6,6 +6,7 @@ import numpy as np from scipy import integrate +from process.fortran import constants from process.fortran import error_handling, impurity_radiation_module @@ -32,7 +33,7 @@ def initialise_imprad(): no=1, label=impurity_radiation_module.imp_label[0], z=1, - amass=1.01e0, + amass=constants.m_protium_amu, # 1.00782503223 1H frac=frac, len_tab=table_length, error=errorflag, @@ -45,7 +46,7 @@ def initialise_imprad(): 2, impurity_radiation_module.imp_label[1], 2, - 4.003e0, + constants.m_helium_amu, # 4.002602 (3He,4He) Average mass frac, table_length, errorflag, @@ -56,7 +57,7 @@ def initialise_imprad(): 3, impurity_radiation_module.imp_label[2], 4, - 9.01e0, + constants.m_beryllium_amu, # 9.0121831 9Be frac, table_length, errorflag, @@ -67,7 +68,7 @@ def initialise_imprad(): 4, impurity_radiation_module.imp_label[3], 6, - 12.01e0, + constants.m_carbon_amu, # 12.0096, (12C,13C,14C) Average mass frac, table_length, errorflag, @@ -78,7 +79,7 @@ def initialise_imprad(): 5, impurity_radiation_module.imp_label[4], 7, - 14.01e0, + constants.m_nitrogen_amu, # 14.00643, (14N,15N) Average mass frac, table_length, errorflag, @@ -89,7 +90,7 @@ def initialise_imprad(): 6, impurity_radiation_module.imp_label[5], 8, - 15.999e0, + constants.m_oxygen_amu, # 15.99903, (16O,17O,18O) Average mass frac, table_length, errorflag, @@ -100,7 +101,7 @@ def initialise_imprad(): 7, impurity_radiation_module.imp_label[6], 10, - 20.18e0, + constants.m_neon_amu, # 20.1797 (20Ne,21Ne,22Ne) Average mass frac, table_length, errorflag, @@ -111,7 +112,7 @@ def initialise_imprad(): 8, impurity_radiation_module.imp_label[7], 14, - 28.09e0, + constants.m_silicon_amu, # 28.084 (28Si,29Si,30Si) Average mass frac, table_length, errorflag, @@ -122,7 +123,7 @@ def initialise_imprad(): 9, impurity_radiation_module.imp_label[8], 18, - 39.95e0, + constants.m_argon_amu, # 39.948 (40Ar,36Ar,38Ar) Average mass frac, table_length, errorflag, @@ -133,7 +134,7 @@ def initialise_imprad(): 10, impurity_radiation_module.imp_label[9], 26, - 55.85e0, + constants.m_iron_amu, # 55.845 (56Fe,54Fe,57Fe,58Fe) Average mass frac, table_length, errorflag, @@ -144,7 +145,7 @@ def initialise_imprad(): 11, impurity_radiation_module.imp_label[10], 28, - 58.70e0, + constants.m_nickel_amu, # 58.6934 (58Ni,60Ni,61Ni,62Ni,64Ni) Average mass frac, table_length, errorflag, @@ -155,7 +156,7 @@ def initialise_imprad(): 12, impurity_radiation_module.imp_label[11], 36, - 83.80e0, + constants.m_krypton_amu, # 83.798 (84Kr,86Kr,82Kr,80Kr,78Kr) Average mass frac, table_length, errorflag, @@ -166,7 +167,7 @@ def initialise_imprad(): 13, impurity_radiation_module.imp_label[12], 54, - 131.30e0, + constants.m_xenon_amu, # 131.293 (132Xe,129Xe,131Xe,134Xe,136Xe) Average mass frac, table_length, errorflag, @@ -177,7 +178,7 @@ def initialise_imprad(): 14, impurity_radiation_module.imp_label[13], 74, - 183.85e0, + constants.m_tungsten_amu, # 183.84 (184W,186W,182W,183W,180W) Average mass frac, table_length, errorflag, diff --git a/source/fortran/constants.f90 b/source/fortran/constants.f90 index 28011ab33d..324191fdae 100644 --- a/source/fortran/constants.f90 +++ b/source/fortran/constants.f90 @@ -72,6 +72,11 @@ module constants ! https://physics.nist.gov/cgi-bin/cuu/Value?mp|search_for=PROTON+MASS real(dp), parameter :: proton_mass = 1.67262192595D-27 + ! Protium atomic mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=1 + real(dp), parameter :: m_protium_amu = 1.00782503223 + ! Deuteron mass [kg] ! Reference: National Institute of Standards and Technology (NIST) ! https://physics.nist.gov/cgi-bin/cuu/Value?md|search_for=DEUTERON+MASS @@ -107,6 +112,11 @@ module constants ! https://physics.nist.gov/cgi-bin/cuu/Value?malu real(dp), parameter :: m_alpha_amu = 4.001506179129 + ! Average Helium atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=He + real(dp), parameter :: m_helium_amu = 4.002602 + ! Helion (3He) mass [kg] ! Reference: National Institute of Standards and Technology (NIST) ! https://physics.nist.gov/cgi-bin/cuu/Value?mh|search_for=HELION @@ -117,6 +127,66 @@ module constants ! https://physics.nist.gov/cgi-bin/cuu/Value?arh real(dp), parameter :: m_helion_amu = 3.014932246932 + ! Beryllium atom (4Be) mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=Be + real(dp), parameter :: m_beryllium_amu = 9.0121831 + + ! Average Carbon atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=C + real(dp), parameter :: m_carbon_amu = 12.0096 + + ! Average Nitrogen atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=N + real(dp), parameter :: m_nitrogen_amu = 14.00643 + + ! Average Oxygen atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=O + real(dp), parameter :: m_oxygen_amu = 15.99903 + + ! Average Neon atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=Ne + real(dp), parameter :: m_neon_amu = 20.1797 + + ! Average Silicon atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=Si + real(dp), parameter :: m_silicon_amu = 28.084 + + ! Average Argon atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=Ar + real(dp), parameter :: m_argon_amu = 39.948 + + ! Average Iron atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=Fe + real(dp), parameter :: m_iron_amu = 55.845 + + ! Average Nickel atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=Ni + real(dp), parameter :: m_nickel_amu = 58.6934 + + ! Average Krypton atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=Kr + real(dp), parameter :: m_krypton_amu = 83.798 + + ! Average Xenon atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=Xe + real(dp), parameter :: m_xenon_amu = 131.293 + + ! Average Tungsten atom mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=W + real(dp), parameter :: m_tungsten_amu = 183.84 + ! Speed of light in vacuum (c) [m/s] ! Reference: National Institute of Standards and Technology (NIST) ! https://physics.nist.gov/cgi-bin/cuu/Value?c|search_for=light From 4c1dca155c8a39c41f9120ee0177bca0087f0b16 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 13:01:06 +0000 Subject: [PATCH 15/48] :memo: Update documentation to reflect changes in plasma composition and impurities section --- .../fusion_reactions/plasma_reactions.md | 2 +- .../physics-models/plasma_composition.md | 270 +++++++++++++++++- 2 files changed, 268 insertions(+), 4 deletions(-) diff --git a/documentation/proc-pages/physics-models/fusion_reactions/plasma_reactions.md b/documentation/proc-pages/physics-models/fusion_reactions/plasma_reactions.md index 993183e9b5..2c2349d118 100644 --- a/documentation/proc-pages/physics-models/fusion_reactions/plasma_reactions.md +++ b/documentation/proc-pages/physics-models/fusion_reactions/plasma_reactions.md @@ -56,7 +56,7 @@ profiles The fractional composition of the 'fuel' ions ($\text{D}$, $\text{T}$ and $^3\text{He}$) is controlled using the three variables `f_deuterium`, `f_tritium` and `f_helium3`, respectively. -More information about setting seeded impurities and simulating first wall sputtering can be found in the [impurities and radiation section](../plasma_radiation_impurities.md) +More information about setting seeded impurities and simulating first wall sputtering can be found in the [composition and impurities section](../plasma_composition.md) !!! note "Reactions not calculated" diff --git a/documentation/proc-pages/physics-models/plasma_composition.md b/documentation/proc-pages/physics-models/plasma_composition.md index 0cf679cfc6..459c3072ad 100644 --- a/documentation/proc-pages/physics-models/plasma_composition.md +++ b/documentation/proc-pages/physics-models/plasma_composition.md @@ -1,7 +1,271 @@ -# Impurities and Radiation +# Plasma composition and impurities. -The impurity radiation model in PROCESS uses a multi-impurity model which -integrates the radiation contributions over an arbitrary choice of density and +## Plasma Composition Calculation | `plasma_composition()` + +This function sets the fractional makeups and determines the relative density and charges of different plasma species. + +All of the plasma composites are normally given as a fraction of the volume averaged plasma electron density. + +1. **Alpha Ash Portion Calculation** + + - Calculate the number density of alpha particles (`nd_alphas`) using the electron density (`dene`) and the alpha particle to electron ratio (`ralpne`). + + `ralpne` can be set as an iteration variable (ixc = 109) or set directly. + +2. **Protons Calculation** + - The calculation of proton density (`nd_protons`) depends on whether the alpha rate density has been calculated. This should only happen in the first function call as the rates are calculated later on in the code. + ```python + if physics_variables.alpha_rate_density_total < 1.0e-6: + physics_variables.nd_protons = max( + physics_variables.f_nd_protium_electrons * physics_variables.dene, + physics_variables.nd_alphas * (physics_variables.f_helium3 + 1.0e-3), + ) + else: + physics_variables.nd_protons = max( + physics_variables.f_nd_protium_electrons * physics_variables.dene, + physics_variables.nd_alphas + * physics_variables.proton_rate_density + / physics_variables.alpha_rate_density_total, + ) + ``` + - If the alpha rate density is not yet calculated, use a rough estimate. + - Otherwise, use the calculated proton rate density. + +3. **Beam Hot Ion Component** + ```python + if physics_variables.ignite == 0: + physics_variables.nd_beam_ions = ( + physics_variables.dene * physics_variables.rnbeam + ) + else: + physics_variables.nd_beam_ions = 0.0 + ``` + - Calculate the number density of beam ions (`nd_beam_ions`). If the plasma is ignited, set it to zero. + +4. **Sum of Zi.ni for All Impurity Ions** + ```python + znimp = 0.0 + for imp in range(impurity_radiation_module.n_impurities): + if impurity_radiation_module.impurity_arr_z[imp] > 2: + znimp += impurity_radiation.zav_of_te( + imp, np.array([physics_variables.te]) + ).squeeze() * ( + impurity_radiation_module.impurity_arr_frac[imp] + * physics_variables.dene + ) + ``` + - Sum the product of charge number (`Zi`) and number density (`ni`) for all impurity ions with charge greater than helium. + +5. **Fuel Portion - Conserve Charge Neutrality** + ```python + znfuel = ( + physics_variables.dene + - 2.0 * physics_variables.nd_alphas + - physics_variables.nd_protons + - physics_variables.nd_beam_ions + - znimp + ) + ``` + - Calculate the fuel portion (`znfuel`) by conserving charge neutrality. + +6. **Fuel Ion Density Calculation** + ```python + physics_variables.deni = znfuel / (1.0 + physics_variables.f_helium3) + ``` + - Calculate the fuel ion density (`deni`). + +7. **Set Hydrogen and Helium Impurity Fractions** + ```python + impurity_radiation_module.impurity_arr_frac[ + impurity_radiation.element2index("H_") + ] = ( + physics_variables.nd_protons + + (physics_variables.f_deuterium + physics_variables.f_tritium) + * physics_variables.deni + + physics_variables.nd_beam_ions + ) / physics_variables.dene + + impurity_radiation_module.impurity_arr_frac[ + impurity_radiation.element2index("He") + ] = ( + physics_variables.f_helium3 + * physics_variables.deni + / physics_variables.dene + + physics_variables.ralpne + ) + ``` + - Set the impurity fractions for hydrogen and helium. + +8. **Total Impurity Density Calculation** + ```python + physics_variables.nd_impurities = 0.0 + for imp in range(impurity_radiation_module.n_impurities): + if impurity_radiation_module.impurity_arr_z[imp] > 2: + physics_variables.nd_impurities += ( + impurity_radiation_module.impurity_arr_frac[imp] + * physics_variables.dene + ) + ``` + - Calculate the total impurity density (`nd_impurities`). + +9. **Total Ion Density Calculation** + ```python + physics_variables.nd_ions_total = ( + physics_variables.deni + + physics_variables.nd_alphas + + physics_variables.nd_protons + + physics_variables.nd_beam_ions + + physics_variables.nd_impurities + ) + ``` + - Calculate the total ion density (`nd_ions_total`). + +10. **Set Obsolescent Impurity Fraction Variables** + ```python + physics_variables.rncne = impurity_radiation_module.impurity_arr_frac[ + impurity_radiation.element2index("C_") + ] + physics_variables.rnone = impurity_radiation_module.impurity_arr_frac[ + impurity_radiation.element2index("O_") + ] + physics_variables.rnfene = ( + impurity_radiation_module.impurity_arr_frac[ + impurity_radiation.element2index("Fe") + ] + + impurity_radiation_module.impurity_arr_frac[ + impurity_radiation.element2index("Ar") + ] + ) + ``` + - Set some obsolescent impurity fraction variables for other routines. + +11. **Effective Charge Calculation** + ```python + physics_variables.zeff = 0.0 + for imp in range(impurity_radiation_module.n_impurities): + physics_variables.zeff += ( + impurity_radiation_module.impurity_arr_frac[imp] + * impurity_radiation.zav_of_te( + imp, np.array([physics_variables.te]) + ).squeeze() + ** 2 + ) + ``` + - Calculate the effective charge (`zeff`). + +12. **Define Coulomb Logarithm** + ```python + physics_variables.dlamee = ( + 31.0 + - (np.log(physics_variables.dene) / 2.0) + + np.log(physics_variables.te * 1000.0) + ) + physics_variables.dlamie = ( + 31.3 + - (np.log(physics_variables.dene) / 2.0) + + np.log(physics_variables.te * 1000.0) + ) + ``` + - Define the Coulomb logarithm for ion-electron and electron-electron collisions. + +13. **Fraction of Alpha Energy to Ions and Electrons** + ```python + if physics_module.first_call == 1: + pc = ( + (1.0 + physics_variables.alphan) + * (1.0 + physics_variables.alphat) + / (1.0 + physics_variables.alphan + physics_variables.alphat) + ) + physics_module.first_call = 0 + else: + pc = physics_variables.pcoef + + physics_variables.f_alpha_electron = 0.88155 * np.exp( + -physics_variables.te * pc / 67.4036 + ) + physics_variables.f_alpha_ion = 1.0 - physics_variables.f_alpha_electron + ``` + - Calculate the fraction of alpha energy going to electrons and ions. + +14. **Average Atomic Masses of Injected Fuel Species** + ```python + physics_variables.m_fuel_amu = ( + (constants.m_deuteron_amu * physics_variables.f_deuterium) + + (constants.m_triton_amu * physics_variables.f_tritium) + + (constants.m_helion_amu * physics_variables.f_helium3) + ) + ``` + - Calculate the average atomic masses of injected fuel species. + +15. **Average Atomic Masses of Injected Fuel Species in Neutral Beams** + ```python + physics_variables.m_beam_amu = ( + constants.m_deuteron_amu * (1.0 - current_drive_variables.f_tritium_beam) + ) + (constants.m_triton_amu * current_drive_variables.f_tritium_beam) + ``` + - Calculate the average atomic masses of injected fuel species in the neutral beams. + +16. **Density Weighted Mass Calculation** + ```python + physics_variables.m_ions_total_amu = ( + physics_variables.m_fuel_amu * physics_variables.deni + + (constants.m_alpha_amu * physics_variables.nd_alphas) + + physics_variables.nd_protons + + physics_variables.m_beam_amu * physics_variables.nd_beam_ions + ) + for imp in range(impurity_radiation_module.n_impurities): + if impurity_radiation_module.impurity_arr_z[imp] > 2: + physics_variables.m_ions_total_amu += ( + physics_variables.dene + * impurity_radiation_module.impurity_arr_frac[imp] + * impurity_radiation_module.impurity_arr_amass[imp] + ) + + physics_variables.m_ions_total_amu = ( + physics_variables.m_ions_total_amu / physics_variables.nd_ions_total + ) + ``` + - Calculate the density-weighted mass of ions. + +17. **Mass Weighted Plasma Effective Charge** + ```python + physics_variables.zeffai = ( + physics_variables.f_deuterium * physics_variables.deni / 2.0 + + physics_variables.f_tritium * physics_variables.deni / 3.0 + + 4.0 * physics_variables.f_helium3 * physics_variables.deni / 3.0 + + physics_variables.nd_alphas + + physics_variables.nd_protons + + (1.0 - current_drive_variables.f_tritium_beam) + * physics_variables.nd_beam_ions + / 2.0 + + current_drive_variables.f_tritium_beam + * physics_variables.nd_beam_ions + / 3.0 + ) / physics_variables.dene + for imp in range(impurity_radiation_module.n_impurities): + if impurity_radiation_module.impurity_arr_z[imp] > 2: + physics_variables.zeffai += ( + impurity_radiation_module.impurity_arr_frac[imp] + * impurity_radiation.zav_of_te( + imp, np.array([physics_variables.te]) + ).squeeze() + ** 2 + / impurity_radiation_module.impurity_arr_amass[imp] + ) + ``` + - Calculate the mass-weighted plasma effective charge (`zeffai`). + + + + + + + + +--------------- + +The impurity radiation model in PROCESS uses a multi-impurity model which +integrates the radiation contributions over an arbitrary choice of density and temperature profiles[^1] The impurity number density fractions relative to the electron density are constant and are set From ebf3bddf6e15df0bc19281ba77c329a9e3356816 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 13:23:48 +0000 Subject: [PATCH 16/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20pradmw=20variable?= =?UTF-8?q?=20to=20p=5Fplasma=5Frad=5Fmw=20for=20consistency=20across=20th?= =?UTF-8?q?e=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++---- process/dcll.py | 14 ++++-- process/hcpb.py | 12 +++-- process/io/mfile_comparison.py | 6 +-- process/io/plot_proc.py | 2 +- process/io/sankey_funcs.py | 26 ++++++---- process/io/variable_metadata.py | 2 +- process/physics.py | 18 +++---- process/power.py | 6 +-- process/stellarator.py | 50 +++++++++++-------- source/fortran/physics_variables.f90 | 4 +- source/fortran/scan.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++------ tests/integration/data/scan_MFILE.DAT | 18 +++---- tests/integration/ref_dicts.json | 6 +-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 10 ++-- tests/unit/test_dcll.py | 12 +++-- tests/unit/test_power.py | 10 ++-- tracking/tracking_data.py | 2 +- 30 files changed, 153 insertions(+), 119 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 93e101d2f6..de12de2c76 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -433,7 +433,7 @@ Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.9376E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3480E+02 OP SOL_radiation_power_as_imposed_by_f_rad_(MW)____________________________ (psolradmw)___________________ 0.0000E+00 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2417E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2417E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.9094E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7570E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 738c582c27..fe8d0608a8 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -433,7 +433,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2647E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 9c1e4fbf57..425a89218c 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -433,7 +433,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2647E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 905980d743..036fdeaf6b 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -433,7 +433,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2647E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index e220c4daad..c180fa337d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -433,7 +433,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2647E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index c129127e7a..078bb219de 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -288,7 +288,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -1283,7 +1283,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -2278,7 +2278,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -3273,7 +3273,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -4268,7 +4268,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -5263,7 +5263,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -6258,7 +6258,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -7253,7 +7253,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -8248,7 +8248,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP diff --git a/process/dcll.py b/process/dcll.py index ff3ae72526..7352f853ff 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -161,7 +161,9 @@ def dcll_neutronics_and_power(self, output: bool): physics_variables.neutron_power_total * 2 * fwbs_variables.fdiv ) # Radiation power incident on divertor (MW) - fwbs_variables.praddiv = physics_variables.pradmw * 2 * fwbs_variables.fdiv + fwbs_variables.praddiv = ( + physics_variables.p_plasma_rad_mw * 2 * fwbs_variables.fdiv + ) else: # Single null configuration # Nuclear heating in the divertor (MW), neutron power times fdiv @@ -169,20 +171,24 @@ def dcll_neutronics_and_power(self, output: bool): physics_variables.neutron_power_total * fwbs_variables.fdiv ) # Radiation power incident on divertor (MW) - fwbs_variables.praddiv = physics_variables.pradmw * fwbs_variables.fdiv + fwbs_variables.praddiv = ( + physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv + ) # HCD Apperatus # No nuclear heating of the H & CD fwbs_variables.pnuchcd = 0 # Radiation power incident on HCD apparatus (MW) - fwbs_variables.pradhcd = physics_variables.pradmw * fwbs_variables.fhcd + fwbs_variables.pradhcd = physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd # FW # Radiation power incident on first wall (MW) fwbs_variables.pradfw = ( - physics_variables.pradmw - fwbs_variables.praddiv - fwbs_variables.pradhcd + physics_variables.p_plasma_rad_mw + - fwbs_variables.praddiv + - fwbs_variables.pradhcd ) # Surface heat flux on first wall (MW) diff --git a/process/hcpb.py b/process/hcpb.py index 943822f2cc..e790f6cf2f 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -633,18 +633,22 @@ def powerflow_calc(self, output: bool): if physics_variables.idivrt == 2: # Double null configuration fwbs_variables.praddiv = ( - physics_variables.pradmw * 2.0 * fwbs_variables.fdiv + physics_variables.p_plasma_rad_mw * 2.0 * fwbs_variables.fdiv ) else: # single null configuration - fwbs_variables.praddiv = physics_variables.pradmw * fwbs_variables.fdiv + fwbs_variables.praddiv = ( + physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv + ) # Radiation power incident on HCD apparatus (MW) - fwbs_variables.pradhcd = physics_variables.pradmw * fwbs_variables.fhcd + fwbs_variables.pradhcd = physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd # Radiation power incident on first wall (MW) fwbs_variables.pradfw = ( - physics_variables.pradmw - fwbs_variables.praddiv - fwbs_variables.pradhcd + physics_variables.p_plasma_rad_mw + - fwbs_variables.praddiv + - fwbs_variables.pradhcd ) # If we have chosen pressurised water as the blanket coolant, set the diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 4edf6ca0e3..63f8759c29 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -80,7 +80,7 @@ "wallmw", "ralpne", "pinnerzoneradmw", - "pradmw", + "p_plasma_rad_mw", "pnucblkt", "pnucshld", "pdivt", @@ -137,7 +137,7 @@ "wallmw", "pinnerzoneradmw", "psyncpv*vol_plasma", - "pradmw", + "p_plasma_rad_mw", "pnucblkt", "pnucshld", "pdivt", @@ -229,7 +229,7 @@ "photon_wall", "ralpne", "pinnerzoneradmw", - "pradmw", + "p_plasma_rad_mw", "bootstrap_current_fraction", "pdivmax_over_rmajor", "fimp(14", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index a820a68e08..5ea8877e2b 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2633,7 +2633,7 @@ def plot_power_info(axis, mfile_data, scan): ped_height, ped_pos, ("pinnerzoneradmw", "Inner zone radiation", "MW"), - ("pradmw", "Total radiation in LCFS", "MW"), + ("p_plasma_rad_mw", "Total radiation in LCFS", "MW"), ("pnucblkt", "Nuclear heating in blanket", "MW"), ("pnucshld", "Nuclear heating in shield", "MW"), (crypmw, "TF cryogenic power", "MW"), diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index 10100800b6..976e4e0257 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -74,16 +74,18 @@ def plot_full_sankey( palpfwmw = alpha_power_total * ( 1 - f_alpha_plasma ) # Alpha particles hitting first wall (MW) - pradmw = m_file.data["pradmw"].get_scan(-1) # Total radiation Power (MW) + p_plasma_rad_mw = m_file.data["p_plasma_rad_mw"].get_scan( + -1 + ) # Total radiation Power (MW) # Used in [RADIATION] - praddiv = pradmw * m_file.data["fdiv"].get_scan( + praddiv = p_plasma_rad_mw * m_file.data["fdiv"].get_scan( -1 ) # Radiation deposited on the divertor (MW) - pradhcd = pradmw * m_file.data["fhcd"].get_scan( + pradhcd = p_plasma_rad_mw * m_file.data["fhcd"].get_scan( -1 ) # Radiation deposited on HCD (MW) - pradfw = pradmw - praddiv - pradhcd # Radiation deposited in the FW (MW) + pradfw = p_plasma_rad_mw - praddiv - pradhcd # Radiation deposited in the FW (MW) # Used in [DIVERTOR] htpmw_div = m_file.data["htpmw_div"].get_scan(-1) # Divertor coolant pumping power @@ -191,7 +193,7 @@ def plot_full_sankey( # --------------------------------- CHARGED PARTICLES - 2 --------------------------------- # Charge P.+Ohmic, Alpha+Injected, -Divertor, -1st Wall, -Photons - chargedp = [pcharohmmw, palpinjmw, -pdivt, -palpfwmw, -pradmw] + chargedp = [pcharohmmw, palpinjmw, -pdivt, -palpfwmw, -p_plasma_rad_mw] sankey.add( flows=chargedp, # down(in), down(in), up(out), up(out), right(out) @@ -224,7 +226,7 @@ def plot_full_sankey( # ------------------------------------- RADIATION - 3 ------------------------------------- # Photons, -1st Wall, -Divertor, -H&CD - radiation = [pradmw, -pradfw, -praddiv, -pradhcd] + radiation = [p_plasma_rad_mw, -pradfw, -praddiv, -pradhcd] sankey.add( flows=radiation, # right(in), up(out), up(out), up(out) @@ -485,7 +487,9 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia ) # Total Power in plasma (MW) # Used in [DEPOSITION] - pradmw = m_file.data["pradmw"].get_scan(-1) # Total radiation Power (MW) + p_plasma_rad_mw = m_file.data["p_plasma_rad_mw"].get_scan( + -1 + ) # Total radiation Power (MW) fdiv = m_file.data["fdiv"].get_scan(-1) # Area fraction taken up by divertor fdiv_2 = m_file.data["2*fdiv"].get_scan( -1 @@ -494,12 +498,14 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia fdiv_2 > 0 ): # Takes into account old MFILE representation of double null divertor fdiv = fdiv_2 - praddiv = pradmw * fdiv # Radiation deposited on the divertor (MW) + praddiv = p_plasma_rad_mw * fdiv # Radiation deposited on the divertor (MW) fhcd = m_file.data["fhcd"].get_scan( -1 ) # Area fraction covered by HCD and diagnostics - pradhcd = pradmw * fhcd # Radiation deposited on HCD and diagnostics (MW) - pradfw = pradmw - praddiv - pradhcd # Radiation deposited in the blanket (MW) + pradhcd = p_plasma_rad_mw * fhcd # Radiation deposited on HCD and diagnostics (MW) + pradfw = ( + p_plasma_rad_mw - praddiv - pradhcd + ) # Radiation deposited in the blanket (MW) pdivt = m_file.data["pdivt"].get_scan( -1 ) # power to conducted to the divertor region (MW) diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 6d1f6943c0..6d02a7624a 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -242,7 +242,7 @@ class VariableMetadata: "pdivt": VariableMetadata( latex=r"$P_{\mathrm{sep}}$ [$MW$]", description="Power to divertor", units="MW" ), - "pradmw": VariableMetadata( + "p_plasma_rad_mw": VariableMetadata( latex=r"$P_{\mathrm{rad}}$ [$MW$]", description="Radiation power", units="MW" ), "pdivtbt_over_qar": VariableMetadata( diff --git a/process/physics.py b/process/physics.py index 5ca8d5fbed..81cf91cb38 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2131,7 +2131,7 @@ def physics(self): physics_variables.pouterzoneradmw = ( physics_variables.pedgeradpv * physics_variables.vol_plasma ) - physics_variables.pradmw = ( + physics_variables.p_plasma_rad_mw = ( physics_variables.pradpv * physics_variables.vol_plasma ) @@ -2181,7 +2181,7 @@ def physics(self): + physics_variables.non_alpha_charged_power + pinj + physics_variables.p_plasma_ohmic_mw - - physics_variables.pradmw + - physics_variables.p_plasma_rad_mw ) # The following line is unphysical, but prevents -ve sqrt argument @@ -2383,7 +2383,7 @@ def physics(self): if physics_variables.iwalld == 1: physics_variables.photon_wall = ( physics_variables.ffwal - * physics_variables.pradmw + * physics_variables.p_plasma_rad_mw / physics_variables.a_plasma_surface ) else: @@ -2391,7 +2391,7 @@ def physics(self): # Double Null configuration in - including SoL radiation physics_variables.photon_wall = ( 1.0e0 - fwbs_variables.fhcd - 2.0e0 * fwbs_variables.fdiv - ) * physics_variables.pradmw / build_variables.fwarea + ( + ) * physics_variables.p_plasma_rad_mw / build_variables.fwarea + ( 1.0e0 - fwbs_variables.fhcd - 2.0e0 * fwbs_variables.fdiv ) * physics_variables.rad_fraction_sol * physics_variables.pdivt / ( build_variables.fwarea @@ -2400,7 +2400,7 @@ def physics(self): # Single null configuration - including SoL radaition physics_variables.photon_wall = ( (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) - * physics_variables.pradmw + * physics_variables.p_plasma_rad_mw / build_variables.fwarea + (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) * physics_variables.rad_fraction_sol @@ -2478,7 +2478,7 @@ def physics(self): + current_drive_variables.pinjmw ) physics_module.rad_fraction_lcfs = ( - 1.0e6 * physics_variables.pradmw / physics_module.total_loss_power + 1.0e6 * physics_variables.p_plasma_rad_mw / physics_module.total_loss_power ) physics_variables.rad_fraction_total = ( physics_module.rad_fraction_lcfs @@ -4532,8 +4532,8 @@ def outplas(self): po.ovarre( self.outfile, "Total radiation power from inside LCFS (MW)", - "(pradmw)", - physics_variables.pradmw, + "(p_plasma_rad_mw)", + physics_variables.p_plasma_rad_mw, "OP ", ) po.ovarre( @@ -5141,7 +5141,7 @@ def outplas(self): self.outfile, "Radiation power subtracted from plasma power balance (MW)", "", - physics_variables.pradmw, + physics_variables.p_plasma_rad_mw, "OP ", ) po.ocmmnt(self.outfile, " (Radiation correction is total radiation power)") diff --git a/process/power.py b/process/power.py index 1cb9ba2c42..6f2b36a876 100644 --- a/process/power.py +++ b/process/power.py @@ -1569,11 +1569,11 @@ def power2(self, output: bool): po.ovarrf( self.outfile, "Total net radiation power (MW)", - "(pradmw)", - physics_variables.pradmw, + "(p_plasma_rad_mw)", + physics_variables.p_plasma_rad_mw, "OP ", ) - total = physics_variables.pscalingmw + physics_variables.pradmw + total = physics_variables.pscalingmw + physics_variables.p_plasma_rad_mw po.ovarrf(self.outfile, "Total (MW)", "", total, "OP ") elif physics_variables.iradloss == 1: po.ocmmnt( diff --git a/process/stellarator.py b/process/stellarator.py index 44610ab5e2..483d0f08db 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1239,12 +1239,16 @@ def stfwbs(self, output: bool): ) fwbs_variables.pradloss = ( - physics_variables.pradmw * fwbs_variables.fhole + physics_variables.p_plasma_rad_mw * fwbs_variables.fhole + ) + fwbs_variables.praddiv = ( + physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv + ) + fwbs_variables.pradhcd = ( + physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd ) - fwbs_variables.praddiv = physics_variables.pradmw * fwbs_variables.fdiv - fwbs_variables.pradhcd = physics_variables.pradmw * fwbs_variables.fhcd fwbs_variables.pradfw = ( - physics_variables.pradmw + physics_variables.p_plasma_rad_mw - fwbs_variables.praddiv - fwbs_variables.pradloss - fwbs_variables.pradhcd @@ -1359,22 +1363,26 @@ def stfwbs(self, output: bool): # Radiation power incident on divertor (MW) - fwbs_variables.praddiv = physics_variables.pradmw * fwbs_variables.fdiv + fwbs_variables.praddiv = ( + physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv + ) # Radiation power incident on HCD apparatus (MW) - fwbs_variables.pradhcd = physics_variables.pradmw * fwbs_variables.fhcd + fwbs_variables.pradhcd = ( + physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd + ) # Radiation power lost through holes (eventually hits shield) (MW) fwbs_variables.pradloss = ( - physics_variables.pradmw * fwbs_variables.fhole + physics_variables.p_plasma_rad_mw * fwbs_variables.fhole ) # Radiation power incident on first wall (MW) fwbs_variables.pradfw = ( - physics_variables.pradmw + physics_variables.p_plasma_rad_mw - fwbs_variables.praddiv - fwbs_variables.pradloss - fwbs_variables.pradhcd @@ -4308,13 +4316,13 @@ def stphys(self, output): physics_variables.pedgeradpv * physics_variables.vol_plasma ) - physics_variables.pradmw = ( + physics_variables.p_plasma_rad_mw = ( physics_variables.pradpv * physics_variables.vol_plasma ) # Heating power to plasma (= Psol in divertor model) # Ohmic power is zero in a stellarator - # physics_variables.pradmw here is core + edge (no SOL) + # physics_variables.p_plasma_rad_mw here is core + edge (no SOL) powht = ( physics_variables.f_alpha_plasma * physics_variables.alpha_power_total @@ -4331,21 +4339,23 @@ def stphys(self, output): powht + current_drive_variables.pinjmw ) # if not ignited add the auxiliary power - # Here the implementation sometimes leaves the accessible regime when pradmw> powht which is unphysical and + # Here the implementation sometimes leaves the accessible regime when p_plasma_rad_mw> powht which is unphysical and # is not taken care of by the rad module. We restrict the radiation power here by the heating power: - physics_variables.pradmw = max(0.0e0, physics_variables.pradmw) + physics_variables.p_plasma_rad_mw = max( + 0.0e0, physics_variables.p_plasma_rad_mw + ) # Power to divertor, = (1-stellarator_variables.f_rad)*Psol - # The SOL radiation needs to be smaller than the physics_variables.pradmw + # The SOL radiation needs to be smaller than the physics_variables.p_plasma_rad_mw physics_variables.psolradmw = stellarator_variables.f_rad * powht physics_variables.pdivt = powht - physics_variables.psolradmw # Add SOL Radiation to total - physics_variables.pradmw = ( - physics_variables.pradmw + physics_variables.psolradmw + physics_variables.p_plasma_rad_mw = ( + physics_variables.p_plasma_rad_mw + physics_variables.psolradmw ) - # pradpv = physics_variables.pradmw / physics_variables.vol_plasma # this line OVERWRITES the original definition of pradpv, probably shouldn't be defined like that as the core does not lose SOL power. + # pradpv = physics_variables.p_plasma_rad_mw / physics_variables.vol_plasma # this line OVERWRITES the original definition of pradpv, probably shouldn't be defined like that as the core does not lose SOL power. # The following line is unphysical, but prevents -ve sqrt argument # Should be obsolete if constraint eqn 17 is turned on (but beware - @@ -4362,14 +4372,14 @@ def stphys(self, output): if physics_variables.iwalld == 1: physics_variables.photon_wall = ( physics_variables.ffwal - * physics_variables.pradmw + * physics_variables.p_plasma_rad_mw / physics_variables.a_plasma_surface ) else: if heat_transport_variables.ipowerflow == 0: physics_variables.photon_wall = ( (1.0e0 - fwbs_variables.fhole) - * physics_variables.pradmw + * physics_variables.p_plasma_rad_mw / build_variables.fwarea ) else: @@ -4380,7 +4390,7 @@ def stphys(self, output): - fwbs_variables.fhcd - fwbs_variables.fdiv ) - * physics_variables.pradmw + * physics_variables.p_plasma_rad_mw / build_variables.fwarea ) @@ -4388,7 +4398,7 @@ def stphys(self, output): physics_variables.photon_wall * constraint_variables.peakfactrad ) - physics_variables.rad_fraction_total = physics_variables.pradmw / ( + physics_variables.rad_fraction_total = physics_variables.p_plasma_rad_mw / ( physics_variables.f_alpha_plasma * physics_variables.alpha_power_total + physics_variables.non_alpha_charged_power + physics_variables.p_plasma_ohmic_mw diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 9ec8a32e9d..bea5349abe 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -716,7 +716,7 @@ module physics_variables real(dp) :: len_plasma_poloidal !! plasma poloidal perimeter (m) - real(dp) :: pradmw + real(dp) :: p_plasma_rad_mw !! total radiation power from inside LCFS (MW) real(dp) :: pradpv @@ -1105,7 +1105,7 @@ subroutine init_physics_variables powerht = 0.0D0 fusion_power = 0.0D0 len_plasma_poloidal = 0.0D0 - pradmw = 0.0D0 + p_plasma_rad_mw = 0.0D0 pradpv = 0.0D0 pradsolmw = 0.0D0 proton_rate_density = 0.0D0 diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index 270f8bba33..82e3c2d358 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -195,7 +195,7 @@ subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar) tfcpmw, fcutfsu, acond, fcoolcp, rcool, whttf, ppump, vcool, wwp1, n_tf, & dr_tf_wp, b_crit_upper_nbti use fwbs_variables, only: tpeak - use physics_variables, only: q, aspect, pradmw, dene, fusion_power, btot, tesep, & + use physics_variables, only: q, aspect, p_plasma_rad_mw, dene, fusion_power, btot, tesep, & pdivt, ralpne, ten, beta_poloidal, hfac, teped, alpha_power_beams, q95_min, rmajor, wallmw, & beta, beta_max, bt, plasma_current use global_variables, only: verbose, maxcal, runtitle, run_tests @@ -268,7 +268,7 @@ subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar) outvar(50,iscan) = pdivt/rmajor !outvar(51,iscan) = fimpvar #OBSOLETE outvar(51,iscan) = 0.0d0 - outvar(52,iscan) = pradmw + outvar(52,iscan) = p_plasma_rad_mw outvar(53,iscan) = tpeak outvar(54,iscan) = fcutfsu outvar(55,iscan) = (wwp1+wwp2)*dr_tf_wp diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index b2853cbd2d..e2cf09025c 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -432,7 +432,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2647E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 6f1714d737..9e9265833e 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -433,7 +433,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2647E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index b90867a389..daf0891939 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -433,7 +433,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2647E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index f469094e8d..7e5fb79846 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -433,7 +433,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2647E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index dee92c5c16..5eddc707b7 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -429,7 +429,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1277E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3317E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2444E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7591E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 34a2d00fb5..2958372f78 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -434,7 +434,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.7889E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3132E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.1921E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.1921E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7628E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7180E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -1597,7 +1597,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8240E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3308E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2132E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2132E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7759E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7346E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -2760,7 +2760,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8985E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3558E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2457E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2457E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8297E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7600E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -3923,7 +3923,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8956E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3524E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2419E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8205E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7571E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -5086,7 +5086,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8995E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3412E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2311E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2311E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7851E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7487E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -6249,7 +6249,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8676E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3238E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2106E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2106E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7466E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7326E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -7412,7 +7412,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8858E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3234E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2120E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2120E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7410E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7337E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -8575,7 +8575,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.9000E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3386E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2286E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2286E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7776E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7467E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -9738,7 +9738,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8564E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3434E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2290E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2290E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7959E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7470E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -10901,7 +10901,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.9158E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3503E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2419E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7992E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7571E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -12064,7 +12064,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.0058E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3537E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2543E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2543E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8036E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7668E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -13227,7 +13227,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.0074E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3411E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2418E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2418E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7734E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7570E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -14390,7 +14390,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.0607E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3461E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2522E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2522E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7752E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7652E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -15553,7 +15553,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1011E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3661E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2762E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2762E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8120E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7840E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP @@ -16716,7 +16716,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1467E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3867E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.3014E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.3014E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8500E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.8037E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index bf1a869f6c..6aa01df692 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -288,7 +288,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -1283,7 +1283,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -2278,7 +2278,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -3273,7 +3273,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -4268,7 +4268,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -5263,7 +5263,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -6258,7 +6258,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -7253,7 +7253,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP @@ -8248,7 +8248,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP - Total_radiation_power_(MW)______________________________________________ (pradmw)______________________ 2.6097E+02 OP + Total_radiation_power_(MW)______________________________________________ (p_plasma_rad_mw)______________________ 2.6097E+02 OP Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index c002ce50ab..888754a0d5 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3611,7 +3611,7 @@ "pradfw": 0.0, "pradhcd": 0.0, "pradloss": 0.0, - "pradmw": 0.0, + "p_plasma_rad_mw": 0.0, "pradpv": 0.0, "pradsolmw": 0.0, "prdiv": 0.36, @@ -10366,7 +10366,7 @@ "pradfw": "Radiation power incident on the first wall (MW)", "pradhcd": "Radiation power incident on the heating and current drive system (MW)", "pradloss": "Radiation power lost through holes (eventually hits shield) (MW)\n Only used for stellarator", - "pradmw": "total radiation power from inside LCFS (MW)", + "p_plasma_rad_mw": "total radiation power from inside LCFS (MW)", "pradpv": "total radiation power per volume (MW/m3)", "pradsolmw": "radiation power from SoL (MW)", "prdiv": "divertor chamber pressure during burn (Pa)", @@ -19212,7 +19212,7 @@ "powerht", "fusion_power", "len_plasma_poloidal", - "pradmw", + "p_plasma_rad_mw", "pradpv", "pradsolmw", "proton_rate_density", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 20b8186906..65428a9b75 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -429,7 +429,7 @@ Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1277E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3317E+02 OP - Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (pradmw)______________________ 2.2444E+02 OP + Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7591E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index e396918426..dc233dcecd 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -806,7 +806,7 @@ class PowerflowCalcParam(NamedTuple): idivrt: Any = None - pradmw: Any = None + p_plasma_rad_mw: Any = None palpfwmw: Any = None @@ -876,7 +876,7 @@ class PowerflowCalcParam(NamedTuple): htpmw_div=0, fpumpdiv=0.0050000000000000001, idivrt=1, - pradmw=287.44866938104849, + p_plasma_rad_mw=287.44866938104849, palpfwmw=19.835845058655043, pdivt=143.6315222649435, p_he=8000000, @@ -925,7 +925,7 @@ class PowerflowCalcParam(NamedTuple): htpmw_div=1.7970292653352464, fpumpdiv=0.0050000000000000001, idivrt=1, - pradmw=287.44866938104849, + p_plasma_rad_mw=287.44866938104849, palpfwmw=19.829653483586444, pdivt=143.51338080047339, p_he=8000000, @@ -1035,7 +1035,9 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr(physics_variables, "idivrt", powerflowcalcparam.idivrt) - monkeypatch.setattr(physics_variables, "pradmw", powerflowcalcparam.pradmw) + monkeypatch.setattr( + physics_variables, "p_plasma_rad_mw", powerflowcalcparam.p_plasma_rad_mw + ) monkeypatch.setattr(physics_variables, "palpfwmw", powerflowcalcparam.palpfwmw) diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 7046d954e0..c6c71a202c 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -69,7 +69,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): neutron_power_total: Any = None - pradmw: Any = None + p_plasma_rad_mw: Any = None palpfwmw: Any = None @@ -112,7 +112,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): ptfnuc=0, idivrt=1, neutron_power_total=1587.7386535917431, - pradmw=287.44866938104849, + p_plasma_rad_mw=287.44866938104849, palpfwmw=19.835845058655043, expected_praddiv=33.056596978820579, expected_pnucdiv=182.58994516305046, @@ -144,7 +144,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): ptfnuc=0, idivrt=1, neutron_power_total=1587.2430556964196, - pradmw=287.44866938104849, + p_plasma_rad_mw=287.44866938104849, palpfwmw=19.829653483586444, expected_praddiv=33.056596978820579, expected_pnucdiv=182.53295140508826, @@ -238,7 +238,11 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl dcllneutronicsandpowerparam.neutron_power_total, ) - monkeypatch.setattr(physics_variables, "pradmw", dcllneutronicsandpowerparam.pradmw) + monkeypatch.setattr( + physics_variables, + "p_plasma_rad_mw", + dcllneutronicsandpowerparam.p_plasma_rad_mw, + ) monkeypatch.setattr( physics_variables, "palpfwmw", dcllneutronicsandpowerparam.palpfwmw diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index a6e90b26c3..4a148d0239 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2125,7 +2125,7 @@ class Power2Param(NamedTuple): pinnerzoneradmw: Any = None - pradmw: Any = None + p_plasma_rad_mw: Any = None itart: Any = None @@ -2271,7 +2271,7 @@ class Power2Param(NamedTuple): alpha_power_total=396.66154806848488, ignite=0, pinnerzoneradmw=113.53817859231452, - pradmw=287.99550050743289, + p_plasma_rad_mw=287.99550050743289, itart=0, pdivt=143.03180561618876, palpfwmw=19.833077403424262, @@ -2373,7 +2373,7 @@ class Power2Param(NamedTuple): alpha_power_total=396.53774329057228, ignite=0, pinnerzoneradmw=113.53817859231452, - pradmw=287.99550050743289, + p_plasma_rad_mw=287.99550050743289, itart=0, pdivt=142.91368967092416, palpfwmw=19.826887164528632, @@ -2554,7 +2554,9 @@ def test_power2(power2param, monkeypatch, power): physics_variables, "pinnerzoneradmw", power2param.pinnerzoneradmw ) - monkeypatch.setattr(physics_variables, "pradmw", power2param.pradmw) + monkeypatch.setattr( + physics_variables, "p_plasma_rad_mw", power2param.p_plasma_rad_mw + ) monkeypatch.setattr(physics_variables, "itart", power2param.itart) diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index ff35d3b54c..e75a837193 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -137,7 +137,7 @@ class ProcessTracker: "kappa95", "neped", "dene", - "pradmw", + "p_plasma_rad_mw", "ne0", "aux_current_fraction", "nd_impurities", From 9ba06357a2f3235e27b49a5291c9ff92d7e66fc8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 13:26:39 +0000 Subject: [PATCH 17/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20photon=5Fwall=20v?= =?UTF-8?q?ariable=20to=20p=5Ffw=5Frad=5Fmw=20for=20consistency=20across?= =?UTF-8?q?=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/mfile_comparison.py | 2 +- process/physics.py | 12 ++++---- process/stellarator.py | 8 ++--- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 19 files changed, 60 insertions(+), 60 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index de12de2c76..aff9b9f68e 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -435,7 +435,7 @@ SOL_radiation_power_as_imposed_by_f_rad_(MW)____________________________ (psolradmw)___________________ 0.0000E+00 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2417E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.9094E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7570E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7570E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8507E-01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index fe8d0608a8..8eca40656f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -435,7 +435,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 425a89218c..5b314157e4 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -435,7 +435,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 036fdeaf6b..a0dccf9661 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -435,7 +435,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index c180fa337d..f44682b5f6 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -435,7 +435,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 078bb219de..88d3acc821 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -292,7 +292,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -1287,7 +1287,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -2282,7 +2282,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -3277,7 +3277,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -4272,7 +4272,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -5267,7 +5267,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -6262,7 +6262,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -7257,7 +7257,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -8252,7 +8252,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 63f8759c29..533b57584f 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -226,7 +226,7 @@ "pinjmw", "pnetelmw", "wallmw", - "photon_wall", + "p_fw_rad_mw", "ralpne", "pinnerzoneradmw", "p_plasma_rad_mw", diff --git a/process/physics.py b/process/physics.py index 81cf91cb38..cf6e2562f0 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2381,7 +2381,7 @@ def physics(self): # Nominal mean photon wall load on entire first wall area including divertor and beam holes # Note that 'fwarea' excludes these, so they have been added back in. if physics_variables.iwalld == 1: - physics_variables.photon_wall = ( + physics_variables.p_fw_rad_mw = ( physics_variables.ffwal * physics_variables.p_plasma_rad_mw / physics_variables.a_plasma_surface @@ -2389,7 +2389,7 @@ def physics(self): else: if physics_variables.idivrt == 2: # Double Null configuration in - including SoL radiation - physics_variables.photon_wall = ( + physics_variables.p_fw_rad_mw = ( 1.0e0 - fwbs_variables.fhcd - 2.0e0 * fwbs_variables.fdiv ) * physics_variables.p_plasma_rad_mw / build_variables.fwarea + ( 1.0e0 - fwbs_variables.fhcd - 2.0e0 * fwbs_variables.fdiv @@ -2398,7 +2398,7 @@ def physics(self): ) else: # Single null configuration - including SoL radaition - physics_variables.photon_wall = ( + physics_variables.p_fw_rad_mw = ( (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) * physics_variables.p_plasma_rad_mw / build_variables.fwarea @@ -2409,7 +2409,7 @@ def physics(self): ) constraint_variables.peakradwallload = ( - physics_variables.photon_wall * constraint_variables.peakfactrad + physics_variables.p_fw_rad_mw * constraint_variables.peakfactrad ) # Calculate the target imbalances @@ -4546,8 +4546,8 @@ def outplas(self): po.ovarre( self.outfile, "Nominal mean radiation load on inside surface of reactor (MW/m2)", - "(photon_wall)", - physics_variables.photon_wall, + "(p_fw_rad_mw)", + physics_variables.p_fw_rad_mw, "OP ", ) po.ovarre( diff --git a/process/stellarator.py b/process/stellarator.py index 483d0f08db..ba380c9013 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4370,20 +4370,20 @@ def stphys(self, output): # Nominal mean photon wall load if physics_variables.iwalld == 1: - physics_variables.photon_wall = ( + physics_variables.p_fw_rad_mw = ( physics_variables.ffwal * physics_variables.p_plasma_rad_mw / physics_variables.a_plasma_surface ) else: if heat_transport_variables.ipowerflow == 0: - physics_variables.photon_wall = ( + physics_variables.p_fw_rad_mw = ( (1.0e0 - fwbs_variables.fhole) * physics_variables.p_plasma_rad_mw / build_variables.fwarea ) else: - physics_variables.photon_wall = ( + physics_variables.p_fw_rad_mw = ( ( 1.0e0 - fwbs_variables.fhole @@ -4395,7 +4395,7 @@ def stphys(self, output): ) constraint_variables.peakradwallload = ( - physics_variables.photon_wall * constraint_variables.peakfactrad + physics_variables.p_fw_rad_mw * constraint_variables.peakfactrad ) physics_variables.rad_fraction_total = physics_variables.p_plasma_rad_mw / ( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index bea5349abe..c162aac7b2 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -680,7 +680,7 @@ module physics_variables real(dp) :: phiint !! internal plasma V-s - real(dp) :: photon_wall + real(dp) :: p_fw_rad_mw !! Nominal mean radiation load on inside surface of reactor (MW/m2) real(dp) :: piepv @@ -1093,7 +1093,7 @@ subroutine init_physics_variables pedgeradpv = 0.0D0 charged_particle_power = 0.0D0 phiint = 0.0D0 - photon_wall = 0.0D0 + p_fw_rad_mw = 0.0D0 piepv = 0.0D0 plasma_current = 0.0D0 neutron_power_plasma = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index e2cf09025c..75509c3a74 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -434,7 +434,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 9e9265833e..4fcef4d22e 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -435,7 +435,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index daf0891939..9f73a53be6 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -435,7 +435,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 7e5fb79846..4cac02ba72 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -435,7 +435,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 5eddc707b7..2ac5e3397f 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -431,7 +431,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3317E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7591E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7591E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8578E-01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 2958372f78..4ead0c8f79 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -436,7 +436,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3132E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.1921E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7628E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7180E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7180E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.7210E-01 OP @@ -1599,7 +1599,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3308E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2132E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7759E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7346E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7346E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.7761E-01 OP @@ -2762,7 +2762,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3558E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2457E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8297E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7600E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7600E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8609E-01 OP @@ -3925,7 +3925,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3524E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8205E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7571E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7571E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8512E-01 OP @@ -5088,7 +5088,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3412E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2311E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7851E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7487E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7487E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8230E-01 OP @@ -6251,7 +6251,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3238E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2106E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7466E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7326E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7326E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.7694E-01 OP @@ -7414,7 +7414,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3234E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2120E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7410E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7337E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7337E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.7731E-01 OP @@ -8577,7 +8577,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3386E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2286E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7776E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7467E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7467E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8165E-01 OP @@ -9740,7 +9740,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3434E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2290E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7959E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7470E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7470E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8174E-01 OP @@ -10903,7 +10903,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3503E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7992E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7571E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7571E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8512E-01 OP @@ -12066,7 +12066,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3537E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2543E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8036E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7668E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7668E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8834E-01 OP @@ -13229,7 +13229,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3411E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2418E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7734E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7570E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7570E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8509E-01 OP @@ -14392,7 +14392,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3461E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2522E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7752E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7652E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7652E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8780E-01 OP @@ -15555,7 +15555,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3661E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2762E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8120E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7840E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7840E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9407E-01 OP @@ -16718,7 +16718,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3867E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.3014E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8500E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.8037E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.8037E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 6.0063E-01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 6aa01df692..0026781c90 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -292,7 +292,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -1287,7 +1287,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -2282,7 +2282,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -3277,7 +3277,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -4272,7 +4272,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -5267,7 +5267,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -6262,7 +6262,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -7257,7 +7257,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP @@ -8252,7 +8252,7 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 888754a0d5..0d6cea643c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3528,7 +3528,7 @@ "phi_tfc_ib": 0.0, "phi_tfc_ob": 0.0, "phiint": 0.0, - "photon_wall": 0.0, + "p_fw_rad_mw": 0.0, "pi": "3.14159265358979e0_rkind", "pibv": 20000.0, "piepv": 0.0, @@ -10289,7 +10289,7 @@ "phi_tfc_ib": "", "phi_tfc_ob": "", "phiint": "internal plasma V-s", - "photon_wall": "Nominal mean radiation load on inside surface of reactor (MW/m2)", + "p_fw_rad_mw": "Nominal mean radiation load on inside surface of reactor (MW/m2)", "pi": "pi", "pibv": "power injection building volume (m3)", "piepv": "ion/electron equilibration power per volume (MW/m3)", @@ -19200,7 +19200,7 @@ "pedgeradpv", "charged_particle_power", "phiint", - "photon_wall", + "p_fw_rad_mw", "piepv", "plasma_current", "plinepv", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 65428a9b75..28a118a6b9 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -431,7 +431,7 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3317E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (photon_wall)_________________ 1.7591E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7591E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8578E-01 OP From 1865bb059e37e002f63a89458e146d5c271b2ae9 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 13:29:16 +0000 Subject: [PATCH 18/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20peakradwallload?= =?UTF-8?q?=20variable=20to=20p=5Ffw=5Frad=5Fmax=5Fmw=20for=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/physics.py | 6 ++-- process/stellarator.py | 2 +- source/fortran/constraint_equations.f90 | 6 ++-- source/fortran/constraint_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 20 files changed, 57 insertions(+), 57 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index aff9b9f68e..6aaa960a05 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -438,7 +438,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7570E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8507E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8507E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.5907E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.9792E-01 OP Radiation_power_from_SoL_(MW)___________________________________________ (pradsolmw)___________________ 1.2414E+02 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 8eca40656f..c50261dbf0 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -438,7 +438,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 5b314157e4..3575a93d16 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -438,7 +438,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index a0dccf9661..a5357757a9 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -438,7 +438,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index f44682b5f6..0a8c9a2b7b 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -438,7 +438,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 88d3acc821..aba16db390 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -295,7 +295,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -1290,7 +1290,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -2285,7 +2285,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -3280,7 +3280,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -4275,7 +4275,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -5270,7 +5270,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -6265,7 +6265,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -7260,7 +7260,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -8255,7 +8255,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/process/physics.py b/process/physics.py index cf6e2562f0..03800fad60 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2408,7 +2408,7 @@ def physics(self): / build_variables.fwarea ) - constraint_variables.peakradwallload = ( + constraint_variables.p_fw_rad_max_mw = ( physics_variables.p_fw_rad_mw * constraint_variables.peakfactrad ) @@ -4567,8 +4567,8 @@ def outplas(self): po.ovarre( self.outfile, "Peak radiation wall load (MW/m^2)", - "(peakradwallload)", - constraint_variables.peakradwallload, + "(p_fw_rad_max_mw)", + constraint_variables.p_fw_rad_max_mw, "OP ", ) po.ovarre( diff --git a/process/stellarator.py b/process/stellarator.py index ba380c9013..20d5101253 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4394,7 +4394,7 @@ def stphys(self, output): / build_variables.fwarea ) - constraint_variables.peakradwallload = ( + constraint_variables.p_fw_rad_max_mw = ( physics_variables.p_fw_rad_mw * constraint_variables.peakfactrad ) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index cea8174036..c1ea0a807d 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2606,8 +2606,8 @@ subroutine constraint_eqn_067(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fradwall : input real : f-value for upper limit on radiation wall load !! maxradwallload : input real : Maximum permitted radiation wall load (MW/m^2) - !! peakradwallload : input real : Peak radiation wall load (MW/m^2) - use constraint_variables, only: fradwall, maxradwallload, peakradwallload + !! p_fw_rad_max_mw : input real : Peak radiation wall load (MW/m^2) + use constraint_variables, only: fradwall, maxradwallload, p_fw_rad_max_mw implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -2615,7 +2615,7 @@ subroutine constraint_eqn_067(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) character(len=1), intent(out) :: tmp_symbol character(len=10), intent(out) :: tmp_units - tmp_cc = 1.0d0 - fradwall * maxradwallload / peakradwallload + tmp_cc = 1.0d0 - fradwall * maxradwallload / p_fw_rad_max_mw tmp_con = maxradwallload tmp_err = maxradwallload * tmp_cc tmp_symbol = '<' diff --git a/source/fortran/constraint_variables.f90 b/source/fortran/constraint_variables.f90 index f04e9920de..d4226a1669 100644 --- a/source/fortran/constraint_variables.f90 +++ b/source/fortran/constraint_variables.f90 @@ -241,7 +241,7 @@ module constraint_variables real(dp) :: peakfactrad !! peaking factor for radiation wall load (`constraint equation 67`) - real(dp) :: peakradwallload + real(dp) :: p_fw_rad_max_mw !! Peak radiation wall load (MW/m^2) (`constraint equation 67`) real(dp) :: pnetelin @@ -378,7 +378,7 @@ subroutine init_constraint_variables nflutfmax = 1.0D23 pdivtlim = 150.0D0 peakfactrad = 3.33D0 - peakradwallload = 0.0D0 + p_fw_rad_max_mw = 0.0D0 pnetelin = 1.0D3 powfmax = 1.5D3 psepbqarmax = 9.5D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 75509c3a74..6226d4c914 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -437,7 +437,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 4fcef4d22e..9490b3fcfc 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -438,7 +438,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 9f73a53be6..a109e0ca15 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -438,7 +438,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 4cac02ba72..8bfeabe608 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -438,7 +438,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 2ac5e3397f..47d5de36bf 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -434,7 +434,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7591E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8578E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8578E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6157E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0136E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2824E+01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 4ead0c8f79..19f7bf7de1 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -439,7 +439,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7180E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.7210E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7210E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.5972E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0020E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2234E+01 OP @@ -1602,7 +1602,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7346E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.7761E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7761E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6119E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0112E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2371E+01 OP @@ -2765,7 +2765,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7600E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8609E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8609E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6196E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0160E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2128E+01 OP @@ -3928,7 +3928,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7571E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8512E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8512E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6224E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0178E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2196E+01 OP @@ -5091,7 +5091,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7487E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8230E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8230E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6250E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0194E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2511E+01 OP @@ -6254,7 +6254,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7326E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.7694E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7694E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6199E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0162E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2724E+01 OP @@ -7417,7 +7417,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7337E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.7731E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7731E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6231E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0182E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2820E+01 OP @@ -8580,7 +8580,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7467E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8165E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8165E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6254E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0197E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2575E+01 OP @@ -9743,7 +9743,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7470E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8174E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8174E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6193E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0158E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2337E+01 OP @@ -10906,7 +10906,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7571E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8512E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8512E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6298E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0224E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2479E+01 OP @@ -12069,7 +12069,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7668E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8834E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8834E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6394E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0285E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2599E+01 OP @@ -13232,7 +13232,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7570E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8509E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8509E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6388E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0281E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2824E+01 OP @@ -14395,7 +14395,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7652E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8780E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8780E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6476E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0336E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2952E+01 OP @@ -15558,7 +15558,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7840E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.9407E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9407E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6563E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0390E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2804E+01 OP @@ -16721,7 +16721,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.8037E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 6.0063E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 6.0063E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6654E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0448E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2652E+01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 0026781c90..e78cf32b10 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -295,7 +295,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -1290,7 +1290,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -2285,7 +2285,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -3280,7 +3280,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -4275,7 +4275,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -5270,7 +5270,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -6265,7 +6265,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -7260,7 +7260,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -8255,7 +8255,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 0d6cea643c..dc695cc8e2 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3504,7 +3504,7 @@ "peaking_factor": 1.0, "peakmva": 0.0, "peakpoloidalpower": 0.0, - "peakradwallload": 0.0, + "p_fw_rad_max_mw": 0.0, "ped": null, "pedgeradpv": 0.0, "pfbldgm3": 20000.0, @@ -10266,7 +10266,7 @@ "peaking_factor": "peaking factor for first wall heat loads. (Applied separately to inboard and outboard loads.\n Applies to both neutron and surface loads. Only used to calculate peak temperature - not\n the coolant flow rate.)", "peakmva": "peak MVA requirement", "peakpoloidalpower": "Peak absolute rate of change of stored energy in poloidal field (MW)", - "peakradwallload": "Peak radiation wall load (MW/m^2) (`constraint equation 67`)", + "p_fw_rad_max_mw": "Peak radiation wall load (MW/m^2) (`constraint equation 67`)", "pedgeradpv": "edge radiation power per volume (MW/m3)", "pfbldgm3": "volume of PF coil power supply building (m3)", "pfcaseth": "steel case thickness for PF coil i (m)", @@ -17457,7 +17457,7 @@ "nflutfmax", "pdivtlim", "peakfactrad", - "peakradwallload", + "p_fw_rad_max_mw", "pnetelin", "powfmax", "psepbqarmax", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 48b32248e8..7b9727039a 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2667,7 +2667,7 @@ peakfactrad = 1.0 icc = 67 * DESCRIPTION: Upper limit on radiation wall load * JUSTIFICATION: To avoid melting the first wall -* VARIABLES: peakradwallload calculated in-situ +* VARIABLES: p_fw_rad_max_mw calculated in-situ maxradwallload = 1.2 * DESCRIPTION: Peak radiation wall load (MW/m^2) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 28a118a6b9..c92c512950 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -434,7 +434,7 @@ Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7591E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (peakradwallload)_____________ 5.8578E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8578E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6157E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0136E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2824E+01 OP From 451326c49df761bde95c1953dc86176b39e233ad Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 13:34:54 +0000 Subject: [PATCH 19/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20pinnerzoneradmw?= =?UTF-8?q?=20variable=20to=20p=5Fplasma=5Finner=5Frad=5Fmw=20for=20consis?= =?UTF-8?q?tency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- process/io/mfile_comparison.py | 6 ++-- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 2 +- process/physics.py | 10 +++---- process/power.py | 6 ++-- process/stellarator.py | 2 +- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_power.py | 8 ++--- tracking/tracking_data.py | 2 +- 22 files changed, 50 insertions(+), 50 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 6aaa960a05..2f93651f4b 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -430,7 +430,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.9376E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.9376E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3480E+02 OP SOL_radiation_power_as_imposed_by_f_rad_(MW)____________________________ (psolradmw)___________________ 0.0000E+00 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2417E+02 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index c50261dbf0..58784470bf 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -431,7 +431,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 3575a93d16..27255779ac 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -431,7 +431,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index a5357757a9..d126eb506a 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -431,7 +431,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 0a8c9a2b7b..9db599b027 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -431,7 +431,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 533b57584f..9820cd686b 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -79,7 +79,7 @@ "pnetelmw", "wallmw", "ralpne", - "pinnerzoneradmw", + "p_plasma_inner_rad_mw", "p_plasma_rad_mw", "pnucblkt", "pnucshld", @@ -135,7 +135,7 @@ "tauelaw", "ralpne", "wallmw", - "pinnerzoneradmw", + "p_plasma_inner_rad_mw", "psyncpv*vol_plasma", "p_plasma_rad_mw", "pnucblkt", @@ -228,7 +228,7 @@ "wallmw", "p_fw_rad_mw", "ralpne", - "pinnerzoneradmw", + "p_plasma_inner_rad_mw", "p_plasma_rad_mw", "bootstrap_current_fraction", "pdivmax_over_rmajor", diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index fd8a19c8a9..55d986c11f 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -70,7 +70,7 @@ "strain_wp": "str_wp", "fstrain_wp": "fstr_wp", "rad_fraction": "rad_fraction_total", - "pcoreradmw": "pinnerzoneradmw", + "pcoreradmw": "p_plasma_inner_rad_mw", "pedgeradmw": "pouterzoneradmw", "rad_fraction_core": "rad_fraction_LCFS", "thshield": ["thshield_ib", "thshield_ob", "thshield_vb"], diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 5ea8877e2b..0f200076f9 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2632,7 +2632,7 @@ def plot_power_info(axis, mfile_data, scan): coredescription, ped_height, ped_pos, - ("pinnerzoneradmw", "Inner zone radiation", "MW"), + ("p_plasma_inner_rad_mw", "Inner zone radiation", "MW"), ("p_plasma_rad_mw", "Total radiation in LCFS", "MW"), ("pnucblkt", "Nuclear heating in blanket", "MW"), ("pnucshld", "Nuclear heating in shield", "MW"), diff --git a/process/physics.py b/process/physics.py index 03800fad60..4f476ea72e 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2125,7 +2125,7 @@ def physics(self): physics_variables.pedgeradpv = radpwrdata.pedgeradpv physics_variables.pradpv = radpwrdata.pradpv - physics_variables.pinnerzoneradmw = ( + physics_variables.p_plasma_inner_rad_mw = ( physics_variables.pcoreradpv * physics_variables.vol_plasma ) physics_variables.pouterzoneradmw = ( @@ -4508,8 +4508,8 @@ def outplas(self): po.ovarre( self.outfile, "Radiation power from inner zone (MW)", - "(pinnerzoneradmw)", - physics_variables.pinnerzoneradmw, + "(p_plasma_inner_rad_mw)", + physics_variables.p_plasma_inner_rad_mw, "OP ", ) po.ovarre( @@ -5150,7 +5150,7 @@ def outplas(self): self.outfile, "Radiation power subtracted from plasma power balance (MW)", "", - physics_variables.pinnerzoneradmw, + physics_variables.p_plasma_inner_rad_mw, "OP ", ) po.ocmmnt(self.outfile, " (Radiation correction is core radiation power)") @@ -5173,7 +5173,7 @@ def outplas(self): / ( physics_variables.powerht + physics_variables.psyncpv - + physics_variables.pinnerzoneradmw + + physics_variables.p_plasma_inner_rad_mw ) ) ** 0.31, diff --git a/process/power.py b/process/power.py index 6f2b36a876..334495d61c 100644 --- a/process/power.py +++ b/process/power.py @@ -1591,17 +1591,17 @@ def power2(self, output: bool): self.outfile, 'Radiation power from inside "coreradius" (MW)', "(pcoreradmw.)", - physics_variables.pinnerzoneradmw, + physics_variables.p_plasma_inner_rad_mw, "OP ", ) po.ovarrf( self.outfile, "Total (MW)", "", - physics_variables.pscalingmw + physics_variables.pinnerzoneradmw, + physics_variables.pscalingmw + physics_variables.p_plasma_inner_rad_mw, "OP ", ) - total = physics_variables.pscalingmw + physics_variables.pinnerzoneradmw + total = physics_variables.pscalingmw + physics_variables.p_plasma_inner_rad_mw elif physics_variables.iradloss == 2: po.ocmmnt( self.outfile, diff --git a/process/stellarator.py b/process/stellarator.py index 20d5101253..ad8b277381 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4309,7 +4309,7 @@ def stphys(self, output): physics_variables.pcoreradpv = max(physics_variables.pcoreradpv, 0.0e0) physics_variables.pedgeradpv = max(physics_variables.pedgeradpv, 0.0e0) - physics_variables.pinnerzoneradmw = ( + physics_variables.p_plasma_inner_rad_mw = ( physics_variables.pcoreradpv * physics_variables.vol_plasma ) # Should probably be vol_core physics_variables.pouterzoneradmw = ( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index c162aac7b2..845cab9a78 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -641,7 +641,7 @@ module physics_variables real(dp) :: pcoef !! profile factor (= n-weighted T / average T) - real(dp) :: pinnerzoneradmw + real(dp) :: p_plasma_inner_rad_mw !! radiation power from inner zone (MW) real(dp) :: pcoreradpv @@ -1079,7 +1079,7 @@ subroutine init_physics_variables non_alpha_charged_power = 0.0D0 charged_power_density = 0.0D0 pcoef = 0.0D0 - pinnerzoneradmw = 0.0D0 + p_plasma_inner_rad_mw = 0.0D0 pcoreradpv = 0.0D0 dd_power = 0.0D0 dhe3_power = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 6226d4c914..a2d2fe5a06 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -430,7 +430,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 9490b3fcfc..cca34b5c65 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -431,7 +431,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index a109e0ca15..7f1b9eaf7b 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -431,7 +431,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 8bfeabe608..adbdabcb6f 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -431,7 +431,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1650E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 47d5de36bf..0858d0c911 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -427,7 +427,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1277E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1277E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3317E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 19f7bf7de1..5db173418b 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -432,7 +432,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.7889E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.7889E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3132E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.1921E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7628E-01 OP @@ -1595,7 +1595,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8240E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8240E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3308E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2132E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7759E-01 OP @@ -2758,7 +2758,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8985E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8985E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3558E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2457E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8297E-01 OP @@ -3921,7 +3921,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8956E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8956E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3524E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8205E-01 OP @@ -5084,7 +5084,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8995E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8995E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3412E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2311E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7851E-01 OP @@ -6247,7 +6247,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8676E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8676E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3238E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2106E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7466E-01 OP @@ -7410,7 +7410,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8858E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8858E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3234E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2120E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7410E-01 OP @@ -8573,7 +8573,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.9000E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.9000E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3386E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2286E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7776E-01 OP @@ -9736,7 +9736,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.8564E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8564E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3434E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2290E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7959E-01 OP @@ -10899,7 +10899,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 8.9158E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.9158E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3503E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7992E-01 OP @@ -12062,7 +12062,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.0058E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.0058E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3537E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2543E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8036E-01 OP @@ -13225,7 +13225,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.0074E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.0074E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3411E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2418E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7734E-01 OP @@ -14388,7 +14388,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.0607E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.0607E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3461E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2522E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7752E-01 OP @@ -15551,7 +15551,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1011E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1011E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3661E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2762E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8120E-01 OP @@ -16714,7 +16714,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1467E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1467E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3867E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.3014E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8500E-01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index dc695cc8e2..434a2a6b5e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3542,7 +3542,7 @@ "pinjmw": 0.0, "pinjwp": 0.0, "pinjwpfix": 0.0, - "pinnerzoneradmw": 0.0, + "p_plasma_inner_rad_mw": 0.0, "pitch": 0.02, "plasma_current": 0.0, "plasipf": 0.0, @@ -10303,7 +10303,7 @@ "pinjmw": "total auxiliary injected power (MW)", "pinjwp": "injector wall plug power (MW)", "pinjwpfix": "secondary injector wall plug power (MW)", - "pinnerzoneradmw": "radiation power from inner zone (MW)", + "p_plasma_inner_rad_mw": "radiation power from inner zone (MW)", "pitch": "pitch of first wall cooling channels (m)", "plasma_current": "plasma current (A)", "plasipf": "plasma driven current fraction (Bootstrap + Diamagnetic + PS)", @@ -19186,7 +19186,7 @@ "non_alpha_charged_power", "charged_power_density", "pcoef", - "pinnerzoneradmw", + "p_plasma_inner_rad_mw", "pcoreradpv", "dd_power", "dhe3_power", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c92c512950..9689d39b3c 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -427,7 +427,7 @@ Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 - Radiation_power_from_inner_zone_(MW)____________________________________ (pinnerzoneradmw)_____________ 9.1277E+01 OP + Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1277E+01 OP Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3317E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 4a148d0239..9fbad780d7 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2123,7 +2123,7 @@ class Power2Param(NamedTuple): ignite: Any = None - pinnerzoneradmw: Any = None + p_plasma_inner_rad_mw: Any = None p_plasma_rad_mw: Any = None @@ -2270,7 +2270,7 @@ class Power2Param(NamedTuple): pfwpmw=0.89998039031509891, alpha_power_total=396.66154806848488, ignite=0, - pinnerzoneradmw=113.53817859231452, + p_plasma_inner_rad_mw=113.53817859231452, p_plasma_rad_mw=287.99550050743289, itart=0, pdivt=143.03180561618876, @@ -2372,7 +2372,7 @@ class Power2Param(NamedTuple): pfwpmw=0.068213156646500808, alpha_power_total=396.53774329057228, ignite=0, - pinnerzoneradmw=113.53817859231452, + p_plasma_inner_rad_mw=113.53817859231452, p_plasma_rad_mw=287.99550050743289, itart=0, pdivt=142.91368967092416, @@ -2551,7 +2551,7 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(physics_variables, "ignite", power2param.ignite) monkeypatch.setattr( - physics_variables, "pinnerzoneradmw", power2param.pinnerzoneradmw + physics_variables, "p_plasma_inner_rad_mw", power2param.p_plasma_inner_rad_mw ) monkeypatch.setattr( diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index e75a837193..b624e374f0 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -116,7 +116,7 @@ class ProcessTracker: "pnucblkt", "triang", "triang95", - "pinnerzoneradmw", + "p_plasma_inner_rad_mw", "tesep", "ralpne", "wallmw", From 4569b43099d41d546a081fe51592ba144236075b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 13:36:22 +0000 Subject: [PATCH 20/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20pouterzoneradmw?= =?UTF-8?q?=20variable=20to=20p=5Fplasma=5Fouter=5Frad=5Fmw=20for=20consis?= =?UTF-8?q?tency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- process/io/obsolete_vars.py | 2 +- process/physics.py | 6 ++-- process/stellarator.py | 2 +- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 2f93651f4b..b52d2f8cc5 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -431,7 +431,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.9376E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3480E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3480E+02 OP SOL_radiation_power_as_imposed_by_f_rad_(MW)____________________________ (psolradmw)___________________ 0.0000E+00 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2417E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.9094E-01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 58784470bf..24c20a1123 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -432,7 +432,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 27255779ac..16750b9122 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -432,7 +432,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index d126eb506a..b536240056 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -432,7 +432,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 9db599b027..fb21ec52f1 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -432,7 +432,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 55d986c11f..f4eae8d980 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -71,7 +71,7 @@ "fstrain_wp": "fstr_wp", "rad_fraction": "rad_fraction_total", "pcoreradmw": "p_plasma_inner_rad_mw", - "pedgeradmw": "pouterzoneradmw", + "pedgeradmw": "p_plasma_outer_rad_mw", "rad_fraction_core": "rad_fraction_LCFS", "thshield": ["thshield_ib", "thshield_ob", "thshield_vb"], "igeom": None, diff --git a/process/physics.py b/process/physics.py index 4f476ea72e..5515b31081 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2128,7 +2128,7 @@ def physics(self): physics_variables.p_plasma_inner_rad_mw = ( physics_variables.pcoreradpv * physics_variables.vol_plasma ) - physics_variables.pouterzoneradmw = ( + physics_variables.p_plasma_outer_rad_mw = ( physics_variables.pedgeradpv * physics_variables.vol_plasma ) physics_variables.p_plasma_rad_mw = ( @@ -4515,8 +4515,8 @@ def outplas(self): po.ovarre( self.outfile, "Radiation power from outer zone (MW)", - "(pouterzoneradmw)", - physics_variables.pouterzoneradmw, + "(p_plasma_outer_rad_mw)", + physics_variables.p_plasma_outer_rad_mw, "OP ", ) diff --git a/process/stellarator.py b/process/stellarator.py index ad8b277381..4b922d1eaa 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4312,7 +4312,7 @@ def stphys(self, output): physics_variables.p_plasma_inner_rad_mw = ( physics_variables.pcoreradpv * physics_variables.vol_plasma ) # Should probably be vol_core - physics_variables.pouterzoneradmw = ( + physics_variables.p_plasma_outer_rad_mw = ( physics_variables.pedgeradpv * physics_variables.vol_plasma ) diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 845cab9a78..8152682a13 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -671,7 +671,7 @@ module physics_variables real(dp) :: dt_power_plasma !! Deuterium-tritium fusion power, just from plasma [MW] - real(dp) :: pouterzoneradmw + real(dp) :: p_plasma_outer_rad_mw !! radiation power from outer zone (MW) real(dp) :: pedgeradpv @@ -1089,7 +1089,7 @@ subroutine init_physics_variables pdivmax = 0.0D0 dt_power_total = 0.0D0 dt_power_plasma = 0.0D0 - pouterzoneradmw = 0.0D0 + p_plasma_outer_rad_mw = 0.0D0 pedgeradpv = 0.0D0 charged_particle_power = 0.0D0 phiint = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index a2d2fe5a06..493641cf82 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -431,7 +431,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index cca34b5c65..f2701993aa 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -432,7 +432,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 7f1b9eaf7b..dc697e4197 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -432,7 +432,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index adbdabcb6f..76c3bc1b32 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -432,7 +432,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3482E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 0858d0c911..b9332896ff 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -428,7 +428,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1277E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3317E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3317E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7591E-01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 5db173418b..1e6651edc6 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -433,7 +433,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.7889E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3132E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3132E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.1921E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7628E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7180E-01 OP @@ -1596,7 +1596,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8240E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3308E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3308E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2132E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7759E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7346E-01 OP @@ -2759,7 +2759,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8985E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3558E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3558E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2457E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8297E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7600E-01 OP @@ -3922,7 +3922,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8956E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3524E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3524E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8205E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7571E-01 OP @@ -5085,7 +5085,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8995E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3412E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3412E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2311E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7851E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7487E-01 OP @@ -6248,7 +6248,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8676E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3238E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3238E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2106E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7466E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7326E-01 OP @@ -7411,7 +7411,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8858E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3234E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3234E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2120E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7410E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7337E-01 OP @@ -8574,7 +8574,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.9000E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3386E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3386E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2286E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7776E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7467E-01 OP @@ -9737,7 +9737,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8564E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3434E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3434E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2290E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7959E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7470E-01 OP @@ -10900,7 +10900,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.9158E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3503E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3503E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7992E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7571E-01 OP @@ -12063,7 +12063,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.0058E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3537E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3537E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2543E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8036E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7668E-01 OP @@ -13226,7 +13226,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.0074E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3411E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3411E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2418E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7734E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7570E-01 OP @@ -14389,7 +14389,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.0607E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3461E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3461E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2522E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7752E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7652E-01 OP @@ -15552,7 +15552,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1011E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3661E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3661E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2762E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8120E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7840E-01 OP @@ -16715,7 +16715,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1467E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3867E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3867E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.3014E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8500E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.8037E-01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 434a2a6b5e..df5ca84161 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3597,7 +3597,7 @@ 0.0 ], "porbitlossmw": 0.0, - "pouterzoneradmw": 0.0, + "p_plasma_outer_rad_mw": 0.0, "powerht": 0.0, "powfmax": 1500.0, "fusion_power": 0.0, @@ -10352,7 +10352,7 @@ "poisson_steel": "Steel Poisson's ratio", "poloidalpower": "Poloidal power usage at time t (MW)", "porbitlossmw": "neutral beam power lost after ionisation but before thermalisation (orbit loss power) (MW)", - "pouterzoneradmw": "radiation power from outer zone (MW)", + "p_plasma_outer_rad_mw": "radiation power from outer zone (MW)", "powerht": "heating power (= transport loss power) (MW) used in confinement time calculation", "powfmax": "maximum fusion power (MW) (`constraint equation 9`)", "fusion_power": "fusion power (MW)", @@ -19196,7 +19196,7 @@ "pdivmax", "dt_power_total", "dt_power_plasma", - "pouterzoneradmw", + "p_plasma_outer_rad_mw", "pedgeradpv", "charged_particle_power", "phiint", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 9689d39b3c..f2a1679c90 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -428,7 +428,7 @@ Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1277E+01 OP - Radiation_power_from_outer_zone_(MW)____________________________________ (pouterzoneradmw)_____________ 1.3317E+02 OP + Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3317E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7591E-01 OP From eecca637a34420aca640fdf1616d35501a2e9af8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 13:40:53 +0000 Subject: [PATCH 21/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20peakfactrad=20var?= =?UTF-8?q?iable=20to=20f=5Ffw=5Frad=5Fmax=20for=20consistency=20across=20?= =?UTF-8?q?the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/physics.py | 6 ++-- process/stellarator.py | 2 +- source/fortran/constraint_variables.f90 | 4 +-- source/fortran/input.f90 | 6 ++-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- .../integration/data/morris_method_output.txt | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 10 +++---- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index b52d2f8cc5..b15e47bcee 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -436,7 +436,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2417E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.9094E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7570E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8507E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.5907E+01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 24c20a1123..f7999907f3 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -436,7 +436,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 16750b9122..93836d0dc0 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -436,7 +436,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index b536240056..7b31e20bf3 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -436,7 +436,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index fb21ec52f1..371513070f 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -436,7 +436,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index aba16db390..0321878114 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -293,7 +293,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -1288,7 +1288,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -2283,7 +2283,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -3278,7 +3278,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -4273,7 +4273,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -5268,7 +5268,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -6263,7 +6263,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -7258,7 +7258,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -8253,7 +8253,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP diff --git a/process/physics.py b/process/physics.py index 5515b31081..3fc430585d 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2409,7 +2409,7 @@ def physics(self): ) constraint_variables.p_fw_rad_max_mw = ( - physics_variables.p_fw_rad_mw * constraint_variables.peakfactrad + physics_variables.p_fw_rad_mw * constraint_variables.f_fw_rad_max ) # Calculate the target imbalances @@ -4553,8 +4553,8 @@ def outplas(self): po.ovarre( self.outfile, "Peaking factor for radiation wall load", - "(peakfactrad)", - constraint_variables.peakfactrad, + "(f_fw_rad_max)", + constraint_variables.f_fw_rad_max, "IP ", ) po.ovarre( diff --git a/process/stellarator.py b/process/stellarator.py index 4b922d1eaa..e40bcabccc 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4395,7 +4395,7 @@ def stphys(self, output): ) constraint_variables.p_fw_rad_max_mw = ( - physics_variables.p_fw_rad_mw * constraint_variables.peakfactrad + physics_variables.p_fw_rad_mw * constraint_variables.f_fw_rad_max ) physics_variables.rad_fraction_total = physics_variables.p_plasma_rad_mw / ( diff --git a/source/fortran/constraint_variables.f90 b/source/fortran/constraint_variables.f90 index d4226a1669..8fd7aebe0b 100644 --- a/source/fortran/constraint_variables.f90 +++ b/source/fortran/constraint_variables.f90 @@ -238,7 +238,7 @@ module constraint_variables real(dp) :: pdivtlim !! Minimum pdivt [MW] (`constraint equation 80`) - real(dp) :: peakfactrad + real(dp) :: f_fw_rad_max !! peaking factor for radiation wall load (`constraint equation 67`) real(dp) :: p_fw_rad_max_mw @@ -377,7 +377,7 @@ subroutine init_constraint_variables nbshinefmax = 1.0D-3 nflutfmax = 1.0D23 pdivtlim = 150.0D0 - peakfactrad = 3.33D0 + f_fw_rad_max = 3.33D0 p_fw_rad_max_mw = 0.0D0 pnetelin = 1.0D3 powfmax = 1.5D3 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 1ec4155e4c..96cb534098 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -236,7 +236,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fstrcond, fptemp, ftmargoh, fvs, fbeta_max, vvhealw, fpnetel, ft_burn, & ffuspow, fpsepr, ptfnucmax, fvdump, pdivtlim, ftaulimit, nbshinefmax, & fcqt, fzeffmax, fstrcase, fhldiv, foh_stress, fwalld, gammax, fjprot, & - ft_current_ramp_up, tcycmn, auxmin, zeffmax, peakfactrad, fdtmp, fpoloidalpower, & + ft_current_ramp_up, tcycmn, auxmin, zeffmax, f_fw_rad_max, fdtmp, fpoloidalpower, & fnbshinef, freinke, fvvhe, fqval, fq, fmaxvvstress, fbeta_poloidal, fbeta_poloidal_eps, fjohc, & fflutf, bmxlim, t_burn_min, fbeta_min, fecrh_ignition, fstr_wp, fncycle use cost_variables, only: ucich, uctfsw, dintrt, ucblbe, uubop, dtlife, & @@ -1003,8 +1003,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('pdivtlim') call parse_real_variable('pdivtlim', pdivtlim, 0.1D0, 1.0D3, & 'Minimum pdivt (MW) (con. 80, itvar. 153)') - case ('peakfactrad') - call parse_real_variable('peakfactrad', peakfactrad, 0.1D0, 10D0, & + case ('f_fw_rad_max') + call parse_real_variable('f_fw_rad_max', f_fw_rad_max, 0.1D0, 10D0, & 'peaking factor for radiation wall load') case ('pnetelin') call parse_real_variable('pnetelin', pnetelin, 1.0D0, 1.0D4, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 493641cf82..37e4a9c300 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -435,7 +435,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index f2701993aa..77145b3707 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -436,7 +436,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index dc697e4197..bedacb7db2 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -436,7 +436,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 76c3bc1b32..96d8de8802 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -436,7 +436,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b9332896ff..ca6ada114a 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -432,7 +432,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7591E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8578E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6157E+01 OP diff --git a/tests/integration/data/morris_method_output.txt b/tests/integration/data/morris_method_output.txt index c635ee3ae0..e2c5118b87 100644 --- a/tests/integration/data/morris_method_output.txt +++ b/tests/integration/data/morris_method_output.txt @@ -7,7 +7,7 @@ fimp(14) 128.750000 187.450000 202.801914 50.868668 psepbqarmax 504.150000 506.550000 468.370104 163.313514 boundl(103) -1030.845000 1030.845000 598.924417 215.477105 cboot 37.700000 137.400000 495.800565 171.013632 -peakfactrad 0.000000 0.000000 0.000000 0.000000 +f_fw_rad_max 0.000000 0.000000 0.000000 0.000000 kappa -74.615000 196.015000 439.721926 144.051555 etaech 33.550000 39.150000 186.146973 66.313416 feffcd 0.000000 0.000000 0.000000 0.000000 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 1e6651edc6..51f9d5eb30 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -437,7 +437,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.1921E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7628E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7180E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7210E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.5972E+01 OP @@ -1600,7 +1600,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2132E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7759E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7346E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7761E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6119E+01 OP @@ -2763,7 +2763,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2457E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8297E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7600E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8609E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6196E+01 OP @@ -3926,7 +3926,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8205E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7571E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8512E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6224E+01 OP @@ -5089,7 +5089,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2311E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7851E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7487E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8230E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6250E+01 OP @@ -6252,7 +6252,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2106E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7466E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7326E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7694E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6199E+01 OP @@ -7415,7 +7415,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2120E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7410E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7337E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7731E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6231E+01 OP @@ -8578,7 +8578,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2286E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7776E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7467E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8165E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6254E+01 OP @@ -9741,7 +9741,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2290E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7959E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7470E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8174E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6193E+01 OP @@ -10904,7 +10904,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7992E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7571E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8512E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6298E+01 OP @@ -12067,7 +12067,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2543E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8036E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7668E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8834E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6394E+01 OP @@ -13230,7 +13230,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2418E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7734E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7570E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8509E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6388E+01 OP @@ -14393,7 +14393,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2522E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7752E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7652E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8780E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6476E+01 OP @@ -15556,7 +15556,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2762E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8120E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7840E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9407E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6563E+01 OP @@ -16719,7 +16719,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.3014E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8500E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.8037E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 6.0063E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6654E+01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index e78cf32b10..b39bd7c461 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -293,7 +293,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -1288,7 +1288,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -2283,7 +2283,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -3278,7 +3278,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -4273,7 +4273,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -5268,7 +5268,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -6263,7 +6263,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -7258,7 +7258,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP @@ -8253,7 +8253,7 @@ SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index df5ca84161..29ed1baea2 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3500,7 +3500,7 @@ "pdrive": 23000000.0, "dt_power_total": 0.0, "dt_power_plasma": 0.0, - "peakfactrad": 3.33, + "f_fw_rad_max": 3.33, "peaking_factor": 1.0, "peakmva": 0.0, "peakpoloidalpower": 0.0, @@ -10262,7 +10262,7 @@ "pdrive": "IFE driver power reaching target (W) (`iteration variable 85`)", "dt_power_total": "deuterium-tritium fusion power, from plasma and beams (MW)", "dt_power_plasma": "deuterium-tritium fusion power, just from plasma (MW)", - "peakfactrad": "peaking factor for radiation wall load (`constraint equation 67`)", + "f_fw_rad_max": "peaking factor for radiation wall load (`constraint equation 67`)", "peaking_factor": "peaking factor for first wall heat loads. (Applied separately to inboard and outboard loads.\n Applies to both neutron and surface loads. Only used to calculate peak temperature - not\n the coolant flow rate.)", "peakmva": "peak MVA requirement", "peakpoloidalpower": "Peak absolute rate of change of stored energy in poloidal field (MW)", @@ -13879,7 +13879,7 @@ "lb": 1000000.0, "ub": 200000000.0 }, - "peakfactrad": { + "f_fw_rad_max": { "lb": 0.1, "ub": 10 }, @@ -17456,7 +17456,7 @@ "nbshinefmax", "nflutfmax", "pdivtlim", - "peakfactrad", + "f_fw_rad_max", "p_fw_rad_max_mw", "pnetelin", "powfmax", @@ -20611,7 +20611,7 @@ "pbase": "real_variable", "pdivtlim": "real_variable", "pdrive": "real_variable", - "peakfactrad": "real_variable", + "f_fw_rad_max": "real_variable", "peaking_factor": "real_variable", "pfbldgm3": "real_variable", "pfclres": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 7b9727039a..f87fbd8132 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2628,7 +2628,7 @@ outlet_temp_liq = 873.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ First Wall Loads ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -peakfactrad = 1.0 +f_fw_rad_max = 1.0 * DESCRIPTION: Radiation wall load peacking factor * JUSTIFICATION: We consider an average wall load value as a limit diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index f2a1679c90..85b93cc22f 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -432,7 +432,7 @@ Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7591E-01 OP - Peaking_factor_for_radiation_wall_load__________________________________ (peakfactrad)_________________ 3.3300E+00 IP + Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8578E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6157E+01 OP From 86287d0ad5e65bd45c41cdaee89268fc43b9a375 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 13:53:07 +0000 Subject: [PATCH 22/48] :recycle: Rename p_fw_rad_mw and p_fw_rad_max_mw to pflux_fw_rad_mw and pflux_fw_rad_max_mw for consistency across the codebase --- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +- examples/data/large_tokamak_1_MFILE.DAT | 4 +- examples/data/large_tokamak_2_MFILE.DAT | 4 +- examples/data/large_tokamak_3_MFILE.DAT | 4 +- examples/data/large_tokamak_4_MFILE.DAT | 4 +- examples/data/scan_MFILE.DAT | 36 +++++------ process/io/mfile_comparison.py | 2 +- process/physics.py | 18 +++--- process/stellarator.py | 10 ++-- source/fortran/constraint_equations.f90 | 6 +- source/fortran/constraint_variables.f90 | 4 +- source/fortran/physics_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 60 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 36 +++++------ tests/integration/ref_dicts.json | 12 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- 22 files changed, 117 insertions(+), 117 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index b15e47bcee..4a1682850f 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -435,10 +435,10 @@ SOL_radiation_power_as_imposed_by_f_rad_(MW)____________________________ (psolradmw)___________________ 0.0000E+00 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2417E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.9094E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7570E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7570E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8507E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8507E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.5907E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.9792E-01 OP Radiation_power_from_SoL_(MW)___________________________________________ (pradsolmw)___________________ 1.2414E+02 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index f7999907f3..70d72e945b 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -435,10 +435,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 93836d0dc0..130e7e7e0e 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -435,10 +435,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 7b31e20bf3..d1c95ec706 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -435,10 +435,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 371513070f..ed208daf29 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -435,10 +435,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 0321878114..4178e5ba2e 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -292,10 +292,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -1287,10 +1287,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -2282,10 +2282,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -3277,10 +3277,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -4272,10 +4272,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -5267,10 +5267,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -6262,10 +6262,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -7257,10 +7257,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -8252,10 +8252,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 9820cd686b..ecc0b9add7 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -226,7 +226,7 @@ "pinjmw", "pnetelmw", "wallmw", - "p_fw_rad_mw", + "pflux_fw_rad_mw", "ralpne", "p_plasma_inner_rad_mw", "p_plasma_rad_mw", diff --git a/process/physics.py b/process/physics.py index 3fc430585d..d163e03442 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2381,7 +2381,7 @@ def physics(self): # Nominal mean photon wall load on entire first wall area including divertor and beam holes # Note that 'fwarea' excludes these, so they have been added back in. if physics_variables.iwalld == 1: - physics_variables.p_fw_rad_mw = ( + physics_variables.pflux_fw_rad_mw = ( physics_variables.ffwal * physics_variables.p_plasma_rad_mw / physics_variables.a_plasma_surface @@ -2389,7 +2389,7 @@ def physics(self): else: if physics_variables.idivrt == 2: # Double Null configuration in - including SoL radiation - physics_variables.p_fw_rad_mw = ( + physics_variables.pflux_fw_rad_mw = ( 1.0e0 - fwbs_variables.fhcd - 2.0e0 * fwbs_variables.fdiv ) * physics_variables.p_plasma_rad_mw / build_variables.fwarea + ( 1.0e0 - fwbs_variables.fhcd - 2.0e0 * fwbs_variables.fdiv @@ -2398,7 +2398,7 @@ def physics(self): ) else: # Single null configuration - including SoL radaition - physics_variables.p_fw_rad_mw = ( + physics_variables.pflux_fw_rad_mw = ( (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) * physics_variables.p_plasma_rad_mw / build_variables.fwarea @@ -2408,8 +2408,8 @@ def physics(self): / build_variables.fwarea ) - constraint_variables.p_fw_rad_max_mw = ( - physics_variables.p_fw_rad_mw * constraint_variables.f_fw_rad_max + constraint_variables.pflux_fw_rad_max_mw = ( + physics_variables.pflux_fw_rad_mw * constraint_variables.f_fw_rad_max ) # Calculate the target imbalances @@ -4546,8 +4546,8 @@ def outplas(self): po.ovarre( self.outfile, "Nominal mean radiation load on inside surface of reactor (MW/m2)", - "(p_fw_rad_mw)", - physics_variables.p_fw_rad_mw, + "(pflux_fw_rad_mw)", + physics_variables.pflux_fw_rad_mw, "OP ", ) po.ovarre( @@ -4567,8 +4567,8 @@ def outplas(self): po.ovarre( self.outfile, "Peak radiation wall load (MW/m^2)", - "(p_fw_rad_max_mw)", - constraint_variables.p_fw_rad_max_mw, + "(pflux_fw_rad_max_mw)", + constraint_variables.pflux_fw_rad_max_mw, "OP ", ) po.ovarre( diff --git a/process/stellarator.py b/process/stellarator.py index e40bcabccc..6bc6e8b0c7 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4370,20 +4370,20 @@ def stphys(self, output): # Nominal mean photon wall load if physics_variables.iwalld == 1: - physics_variables.p_fw_rad_mw = ( + physics_variables.pflux_fw_rad_mw = ( physics_variables.ffwal * physics_variables.p_plasma_rad_mw / physics_variables.a_plasma_surface ) else: if heat_transport_variables.ipowerflow == 0: - physics_variables.p_fw_rad_mw = ( + physics_variables.pflux_fw_rad_mw = ( (1.0e0 - fwbs_variables.fhole) * physics_variables.p_plasma_rad_mw / build_variables.fwarea ) else: - physics_variables.p_fw_rad_mw = ( + physics_variables.pflux_fw_rad_mw = ( ( 1.0e0 - fwbs_variables.fhole @@ -4394,8 +4394,8 @@ def stphys(self, output): / build_variables.fwarea ) - constraint_variables.p_fw_rad_max_mw = ( - physics_variables.p_fw_rad_mw * constraint_variables.f_fw_rad_max + constraint_variables.pflux_fw_rad_max_mw = ( + physics_variables.pflux_fw_rad_mw * constraint_variables.f_fw_rad_max ) physics_variables.rad_fraction_total = physics_variables.p_plasma_rad_mw / ( diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index c1ea0a807d..9e69ddb850 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2606,8 +2606,8 @@ subroutine constraint_eqn_067(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fradwall : input real : f-value for upper limit on radiation wall load !! maxradwallload : input real : Maximum permitted radiation wall load (MW/m^2) - !! p_fw_rad_max_mw : input real : Peak radiation wall load (MW/m^2) - use constraint_variables, only: fradwall, maxradwallload, p_fw_rad_max_mw + !! pflux_fw_rad_max_mw : input real : Peak radiation wall load (MW/m^2) + use constraint_variables, only: fradwall, maxradwallload, pflux_fw_rad_max_mw implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -2615,7 +2615,7 @@ subroutine constraint_eqn_067(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) character(len=1), intent(out) :: tmp_symbol character(len=10), intent(out) :: tmp_units - tmp_cc = 1.0d0 - fradwall * maxradwallload / p_fw_rad_max_mw + tmp_cc = 1.0d0 - fradwall * maxradwallload / pflux_fw_rad_max_mw tmp_con = maxradwallload tmp_err = maxradwallload * tmp_cc tmp_symbol = '<' diff --git a/source/fortran/constraint_variables.f90 b/source/fortran/constraint_variables.f90 index 8fd7aebe0b..0c954b5847 100644 --- a/source/fortran/constraint_variables.f90 +++ b/source/fortran/constraint_variables.f90 @@ -241,7 +241,7 @@ module constraint_variables real(dp) :: f_fw_rad_max !! peaking factor for radiation wall load (`constraint equation 67`) - real(dp) :: p_fw_rad_max_mw + real(dp) :: pflux_fw_rad_max_mw !! Peak radiation wall load (MW/m^2) (`constraint equation 67`) real(dp) :: pnetelin @@ -378,7 +378,7 @@ subroutine init_constraint_variables nflutfmax = 1.0D23 pdivtlim = 150.0D0 f_fw_rad_max = 3.33D0 - p_fw_rad_max_mw = 0.0D0 + pflux_fw_rad_max_mw = 0.0D0 pnetelin = 1.0D3 powfmax = 1.5D3 psepbqarmax = 9.5D0 diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 8152682a13..8dd06d52d9 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -680,7 +680,7 @@ module physics_variables real(dp) :: phiint !! internal plasma V-s - real(dp) :: p_fw_rad_mw + real(dp) :: pflux_fw_rad_mw !! Nominal mean radiation load on inside surface of reactor (MW/m2) real(dp) :: piepv @@ -1093,7 +1093,7 @@ subroutine init_physics_variables pedgeradpv = 0.0D0 charged_particle_power = 0.0D0 phiint = 0.0D0 - p_fw_rad_mw = 0.0D0 + pflux_fw_rad_mw = 0.0D0 piepv = 0.0D0 plasma_current = 0.0D0 neutron_power_plasma = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 37e4a9c300..1557e2a64e 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -434,10 +434,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 77145b3707..f36edf7db5 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -435,10 +435,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index bedacb7db2..e7b048d69c 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -435,10 +435,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 96d8de8802..be4f866a7e 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -435,10 +435,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2647E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7749E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9106E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index ca6ada114a..6564cdc53c 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -431,10 +431,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3317E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7591E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7591E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8578E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8578E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6157E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0136E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2824E+01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 51f9d5eb30..37b8a1a295 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -436,10 +436,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3132E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.1921E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7628E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7180E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7180E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7210E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.7210E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.5972E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0020E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2234E+01 OP @@ -1599,10 +1599,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3308E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2132E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7759E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7346E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7346E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7761E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.7761E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6119E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0112E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2371E+01 OP @@ -2762,10 +2762,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3558E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2457E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8297E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7600E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7600E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8609E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8609E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6196E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0160E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2128E+01 OP @@ -3925,10 +3925,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3524E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8205E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7571E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7571E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8512E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8512E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6224E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0178E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2196E+01 OP @@ -5088,10 +5088,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3412E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2311E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7851E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7487E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7487E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8230E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8230E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6250E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0194E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2511E+01 OP @@ -6251,10 +6251,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3238E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2106E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7466E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7326E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7326E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7694E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.7694E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6199E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0162E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2724E+01 OP @@ -7414,10 +7414,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3234E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2120E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7410E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7337E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7337E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.7731E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.7731E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6231E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0182E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2820E+01 OP @@ -8577,10 +8577,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3386E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2286E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7776E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7467E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7467E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8165E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8165E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6254E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0197E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2575E+01 OP @@ -9740,10 +9740,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3434E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2290E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7959E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7470E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7470E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8174E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8174E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6193E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0158E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2337E+01 OP @@ -10903,10 +10903,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3503E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2419E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7992E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7571E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7571E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8512E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8512E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6298E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0224E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2479E+01 OP @@ -12066,10 +12066,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3537E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2543E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8036E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7668E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7668E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8834E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8834E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6394E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0285E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2599E+01 OP @@ -13229,10 +13229,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3411E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2418E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7734E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7570E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7570E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8509E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8509E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6388E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0281E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2824E+01 OP @@ -14392,10 +14392,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3461E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2522E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7752E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7652E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7652E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8780E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8780E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6476E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0336E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2952E+01 OP @@ -15555,10 +15555,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3661E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2762E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8120E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7840E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7840E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.9407E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9407E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6563E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0390E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2804E+01 OP @@ -16718,10 +16718,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3867E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.3014E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8500E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.8037E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.8037E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 6.0063E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 6.0063E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6654E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0448E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2652E+01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index b39bd7c461..146e082422 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -292,10 +292,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -1287,10 +1287,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -2282,10 +2282,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -3277,10 +3277,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -4272,10 +4272,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -5267,10 +5267,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -6262,10 +6262,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -7257,10 +7257,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -8252,10 +8252,10 @@ Core_radiation_fraction_=_total_radiation_in_core_/_total_power_deposite (rad_fraction_core)___________ 6.0001E-01 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.6053E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.3457E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 29ed1baea2..f4568db34e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3504,7 +3504,7 @@ "peaking_factor": 1.0, "peakmva": 0.0, "peakpoloidalpower": 0.0, - "p_fw_rad_max_mw": 0.0, + "pflux_fw_rad_max_mw": 0.0, "ped": null, "pedgeradpv": 0.0, "pfbldgm3": 20000.0, @@ -3528,7 +3528,7 @@ "phi_tfc_ib": 0.0, "phi_tfc_ob": 0.0, "phiint": 0.0, - "p_fw_rad_mw": 0.0, + "pflux_fw_rad_mw": 0.0, "pi": "3.14159265358979e0_rkind", "pibv": 20000.0, "piepv": 0.0, @@ -10266,7 +10266,7 @@ "peaking_factor": "peaking factor for first wall heat loads. (Applied separately to inboard and outboard loads.\n Applies to both neutron and surface loads. Only used to calculate peak temperature - not\n the coolant flow rate.)", "peakmva": "peak MVA requirement", "peakpoloidalpower": "Peak absolute rate of change of stored energy in poloidal field (MW)", - "p_fw_rad_max_mw": "Peak radiation wall load (MW/m^2) (`constraint equation 67`)", + "pflux_fw_rad_max_mw": "Peak radiation wall load (MW/m^2) (`constraint equation 67`)", "pedgeradpv": "edge radiation power per volume (MW/m3)", "pfbldgm3": "volume of PF coil power supply building (m3)", "pfcaseth": "steel case thickness for PF coil i (m)", @@ -10289,7 +10289,7 @@ "phi_tfc_ib": "", "phi_tfc_ob": "", "phiint": "internal plasma V-s", - "p_fw_rad_mw": "Nominal mean radiation load on inside surface of reactor (MW/m2)", + "pflux_fw_rad_mw": "Nominal mean radiation load on inside surface of reactor (MW/m2)", "pi": "pi", "pibv": "power injection building volume (m3)", "piepv": "ion/electron equilibration power per volume (MW/m3)", @@ -17457,7 +17457,7 @@ "nflutfmax", "pdivtlim", "f_fw_rad_max", - "p_fw_rad_max_mw", + "pflux_fw_rad_max_mw", "pnetelin", "powfmax", "psepbqarmax", @@ -19200,7 +19200,7 @@ "pedgeradpv", "charged_particle_power", "phiint", - "p_fw_rad_mw", + "pflux_fw_rad_mw", "piepv", "plasma_current", "plinepv", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index f87fbd8132..d89abee322 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2667,7 +2667,7 @@ f_fw_rad_max = 1.0 icc = 67 * DESCRIPTION: Upper limit on radiation wall load * JUSTIFICATION: To avoid melting the first wall -* VARIABLES: p_fw_rad_max_mw calculated in-situ +* VARIABLES: pflux_fw_rad_max_mw calculated in-situ maxradwallload = 1.2 * DESCRIPTION: Peak radiation wall load (MW/m^2) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 85b93cc22f..0ef38fed4c 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -431,10 +431,10 @@ Radiation_power_from_outer_zone_(MW)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3317E+02 OP Total_radiation_power_from_inside_LCFS_(MW)_____________________________ (p_plasma_rad_mw)______________________ 2.2444E+02 OP LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.7763E-01 OP - Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (p_fw_rad_mw)_________________ 1.7591E-01 OP + Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7591E-01 OP Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP - Peak_radiation_wall_load_(MW/m^2)_______________________________________ (p_fw_rad_max_mw)_____________ 5.8578E-01 OP + Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8578E-01 OP Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6157E+01 OP Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0136E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2824E+01 OP From cc0e940129f0894863fbbbc7203c801bf7744c42 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 15:47:09 +0000 Subject: [PATCH 23/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20radpwr()=20to=20c?= =?UTF-8?q?alculate=5Fradiation=5Fpower()=20and=20add=20type=20hints=20and?= =?UTF-8?q?=20docstring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../physics-models/plasma_composition.md | 6 +++ process/physics.py | 2 +- process/physics_functions.py | 49 +++++++++++-------- process/stellarator.py | 2 +- 4 files changed, 36 insertions(+), 23 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_composition.md b/documentation/proc-pages/physics-models/plasma_composition.md index 459c3072ad..2292bcf534 100644 --- a/documentation/proc-pages/physics-models/plasma_composition.md +++ b/documentation/proc-pages/physics-models/plasma_composition.md @@ -1,5 +1,11 @@ # Plasma composition and impurities. +Within `PROCESS` we always assume the plasma is quasi-neutral eg: + +$$ +n_{\text{e}} = \underbrace{n_{\text{i}}}_{\text{Fuel Ions}} + \underbrace{2n_{\text{e}}f_{\alpha}}_{\text{Alpha particles}} + \underbrace{n_{\text{e}}f_{\text{beam}}}_{\text{Neutral beams}} + \underbrace{\sum_j Z_j n_{\text{e}} f_j}_{\text{Impurities}} +$$ + ## Plasma Composition Calculation | `plasma_composition()` This function sets the fractional makeups and determines the relative density and charges of different plasma species. diff --git a/process/physics.py b/process/physics.py index d163e03442..ceebcff1e7 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2119,7 +2119,7 @@ def physics(self): # Calculate radiation power - radpwrdata = physics_funcs.radpwr(self.plasma_profile) + radpwrdata = physics_funcs.calculate_radiation_powers(self.plasma_profile) physics_variables.psyncpv = radpwrdata.psyncpv physics_variables.pcoreradpv = radpwrdata.pcoreradpv physics_variables.pedgeradpv = radpwrdata.pedgeradpv diff --git a/process/physics_functions.py b/process/physics_functions.py index 9f836e3fa4..0d187aa5ea 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -551,31 +551,48 @@ def set_physics_variables(self) -> None: physics_variables.f_dd_branching_trit = self.f_dd_branching_trit -def radpwr(plasma_profile): - """This routine finds the radiation powers in MW/m3 by calling - relevant routines. +@dataclass +class RadpwrData: + """DataClass which holds the output of the function radpwr""" + + psyncpv: float + pcoreradpv: float + pedgeradpv: float + pradpv: float + + +def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: + """ + Calculate the radiation powers in MW/m^3 by calling relevant routines. + + This function computes the radiation power densities for the plasma, including + impurity radiation and synchrotron radiation. It returns a dataclass containing + the calculated radiation power densities. + + Parameters: + plasma_profile (PlasmaProfile): The parameterized temperature and density profiles of the plasma. + + Returns: + RadpwrData: A dataclass containing the following radiation power densities: + - psyncpv (float): Synchrotron radiation power per unit volume (MW/m^3). + - pcoreradpv (float): Total core radiation power per unit volume (MW/m^3). + - pedgeradpv (float): Edge radiation power per unit volume (MW/m^3). + - pradpv (float): Total radiation power per unit volume (MW/m^3). + Author: P J Knight, CCFE, Culham Science Centre - - :param plasma_profile: - :type plasma_profile: PlasmaProfile - :return: RadpwrData - dataclass returning radiation power - :rtype: DataClass """ imp_rad = impurity.ImpurityRadiation(plasma_profile) imp_rad.calculate_imprad() pedgeradpv = imp_rad.radtot - imp_rad.radcore - # Synchrotron radiation power/volume; assumed to be from core only. # Synchrotron radiation power/volume; assumed to be from core only. psyncpv = psync_albajar_fidone() - # Total core radiation power/volume. # Total core radiation power/volume. pcoreradpv = imp_rad.radcore + psyncpv - # Total radiation power/volume. # Total radiation power/volume. pradpv = imp_rad.radtot + psyncpv @@ -796,16 +813,6 @@ def bosch_hale_reactivity( return sigmav -@dataclass -class RadpwrData: - """DataClass which holds the output of the function radpwr""" - - psyncpv: float - pcoreradpv: float - pedgeradpv: float - pradpv: float - - def set_fusion_powers( f_alpha_electron: float, f_alpha_ion: float, diff --git a/process/stellarator.py b/process/stellarator.py index 6bc6e8b0c7..904906d4c7 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4300,7 +4300,7 @@ def stphys(self, output): ) # Calculate radiation power - radpwr_data = physics_funcs.radpwr(self.plasma_profile) + radpwr_data = physics_funcs.calculate_radiation_powers(self.plasma_profile) physics_variables.psyncpv = radpwr_data.psyncpv physics_variables.pcoreradpv = radpwr_data.pcoreradpv physics_variables.pedgeradpv = radpwr_data.pedgeradpv From 384cad8ebb1919e5d14662ff197fbf8001c6132e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 15:51:50 +0000 Subject: [PATCH 24/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20psyncpv=20to=20pd?= =?UTF-8?q?en=5Fplasma=5Fsync=5Fmw=20for=20consistency=20across=20the=20co?= =?UTF-8?q?debase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/mfile_comparison.py | 2 +- process/physics.py | 8 ++--- process/physics_functions.py | 17 ++++++----- process/stellarator.py | 2 +- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 20 files changed, 64 insertions(+), 63 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 4a1682850f..fbf06f7abc 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -426,7 +426,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.7935E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4356E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4715E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.2665E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2665E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 70d72e945b..8da57ab175 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -427,7 +427,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8950E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 130e7e7e0e..8229a751d1 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -427,7 +427,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8950E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index d1c95ec706..9557fa165a 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -427,7 +427,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8950E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index ed208daf29..1fac9568c2 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -427,7 +427,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8950E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 4178e5ba2e..ae5a91b42a 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -282,7 +282,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -1277,7 +1277,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -2272,7 +2272,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -3267,7 +3267,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -4262,7 +4262,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -5257,7 +5257,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -6252,7 +6252,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -7247,7 +7247,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -8242,7 +8242,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index ecc0b9add7..f787ec7035 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -136,7 +136,7 @@ "ralpne", "wallmw", "p_plasma_inner_rad_mw", - "psyncpv*vol_plasma", + "pden_plasma_sync_mw*vol_plasma", "p_plasma_rad_mw", "pnucblkt", "pnucshld", diff --git a/process/physics.py b/process/physics.py index ceebcff1e7..8ac832e24a 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2120,7 +2120,7 @@ def physics(self): # Calculate radiation power radpwrdata = physics_funcs.calculate_radiation_powers(self.plasma_profile) - physics_variables.psyncpv = radpwrdata.psyncpv + physics_variables.pden_plasma_sync_mw = radpwrdata.pden_plasma_sync_mw physics_variables.pcoreradpv = radpwrdata.pcoreradpv physics_variables.pedgeradpv = radpwrdata.pedgeradpv physics_variables.pradpv = radpwrdata.pradpv @@ -4483,8 +4483,8 @@ def outplas(self): po.ovarre( self.outfile, "Synchrotron radiation power (MW)", - "(psyncpv*vol_plasma)", - physics_variables.psyncpv * physics_variables.vol_plasma, + "(pden_plasma_sync_mw*vol_plasma)", + physics_variables.pden_plasma_sync_mw * physics_variables.vol_plasma, "OP ", ) po.ovarrf( @@ -5172,7 +5172,7 @@ def outplas(self): physics_variables.powerht / ( physics_variables.powerht - + physics_variables.psyncpv + + physics_variables.pden_plasma_sync_mw + physics_variables.p_plasma_inner_rad_mw ) ) diff --git a/process/physics_functions.py b/process/physics_functions.py index 0d187aa5ea..b91fcb69c1 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -555,7 +555,7 @@ def set_physics_variables(self) -> None: class RadpwrData: """DataClass which holds the output of the function radpwr""" - psyncpv: float + pden_plasma_sync_mw: float pcoreradpv: float pedgeradpv: float pradpv: float @@ -574,7 +574,7 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: Returns: RadpwrData: A dataclass containing the following radiation power densities: - - psyncpv (float): Synchrotron radiation power per unit volume (MW/m^3). + - pden_plasma_sync_mw (float): Synchrotron radiation power per unit volume (MW/m^3). - pcoreradpv (float): Total core radiation power per unit volume (MW/m^3). - pedgeradpv (float): Edge radiation power per unit volume (MW/m^3). - pradpv (float): Total radiation power per unit volume (MW/m^3). @@ -588,15 +588,15 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: pedgeradpv = imp_rad.radtot - imp_rad.radcore # Synchrotron radiation power/volume; assumed to be from core only. - psyncpv = psync_albajar_fidone() + pden_plasma_sync_mw = psync_albajar_fidone() # Total core radiation power/volume. - pcoreradpv = imp_rad.radcore + psyncpv + pcoreradpv = imp_rad.radcore + pden_plasma_sync_mw # Total radiation power/volume. - pradpv = imp_rad.radtot + psyncpv + pradpv = imp_rad.radtot + pden_plasma_sync_mw - return RadpwrData(psyncpv, pcoreradpv, pedgeradpv, pradpv) + return RadpwrData(pden_plasma_sync_mw, pcoreradpv, pedgeradpv, pradpv) def psync_albajar_fidone(): @@ -609,7 +609,7 @@ def psync_albajar_fidone(): P J Knight, CCFE, Culham Science Centre R Kemp, CCFE, Culham Science Centre - :return: psyncpv synchrotron radiation power/volume (MW/m3) + :return: pden_plasma_sync_mw synchrotron radiation power/volume (MW/m3) :rtype: float """ tbet = 2.0e0 @@ -626,6 +626,7 @@ def psync_albajar_fidone(): kfun = 0.0 dum = 0.0 psync = 0.0 + pden_plasma_sync_mw = 0.0 kap = physics_variables.vol_plasma / ( 2.0e0 * np.pi**2 * physics_variables.rmajor * physics_variables.rminor**2 @@ -674,7 +675,7 @@ def psync_albajar_fidone(): * kfun ) - # psyncpv should be per unit volume; Albajar gives it as total + # pden_plasma_sync_mw should be per unit volume; Albajar gives it as total return psync / physics_variables.vol_plasma diff --git a/process/stellarator.py b/process/stellarator.py index 904906d4c7..82350d38a4 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4301,7 +4301,7 @@ def stphys(self, output): # Calculate radiation power radpwr_data = physics_funcs.calculate_radiation_powers(self.plasma_profile) - physics_variables.psyncpv = radpwr_data.psyncpv + physics_variables.pden_plasma_sync_mw = radpwr_data.pden_plasma_sync_mw physics_variables.pcoreradpv = radpwr_data.pcoreradpv physics_variables.pedgeradpv = radpwr_data.pedgeradpv physics_variables.pradpv = radpwr_data.pradpv diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 8dd06d52d9..4ecae2777a 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -731,7 +731,7 @@ module physics_variables real(dp) :: psolradmw !! SOL radiation power (MW) (`stellarator only`) - real(dp) :: psyncpv + real(dp) :: pden_plasma_sync_mw !! synchrotron radiation power per volume (MW/m3) integer :: ilhthresh @@ -1110,7 +1110,7 @@ subroutine init_physics_variables pradsolmw = 0.0D0 proton_rate_density = 0.0D0 psolradmw = 0.0D0 - psyncpv = 0.0D0 + pden_plasma_sync_mw = 0.0D0 ilhthresh = 19 plhthresh = 0.0D0 pthrmw = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 1557e2a64e..c579418fcb 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -426,7 +426,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8950E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index f36edf7db5..8afc974946 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -427,7 +427,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8950E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index e7b048d69c..4cfca80c49 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -427,7 +427,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8950E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index be4f866a7e..95ba001de5 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -427,7 +427,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8950E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 6564cdc53c..e1e401dcf5 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -423,7 +423,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8856E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4604E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4402E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.5820E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5820E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 37b8a1a295..6223135eaa 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -428,7 +428,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8038E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.2134E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4406E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.3016E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3016E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -1591,7 +1591,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8317E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.2817E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4610E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.2401E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2401E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -2754,7 +2754,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8521E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3698E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4907E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.1799E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.1799E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -3917,7 +3917,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8517E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3791E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4829E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.2108E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2108E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -5080,7 +5080,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8567E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3428E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4695E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.2740E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2740E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -6243,7 +6243,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8468E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.2726E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4496E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.3375E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3375E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -7406,7 +7406,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8530E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.2912E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4457E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.3724E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3724E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -8569,7 +8569,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8574E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3416E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4639E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.3060E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3060E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -9732,7 +9732,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8458E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3472E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4703E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.2401E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2401E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -10895,7 +10895,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8659E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4023E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4743E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.2737E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2737E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -12058,7 +12058,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8842E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4277E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4773E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.3421E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3421E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -13221,7 +13221,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8830E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3854E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4622E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.4105E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.4105E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -14384,7 +14384,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8998E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4318E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4642E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.4480E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.4480E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -15547,7 +15547,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.9165E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5116E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4871E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.3795E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3795E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -16710,7 +16710,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.9340E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5941E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.5107E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.3131E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3131E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 146e082422..2a3cf69629 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -282,7 +282,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -1277,7 +1277,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -2272,7 +2272,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -3267,7 +3267,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -4262,7 +4262,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -5257,7 +5257,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -6252,7 +6252,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -7247,7 +7247,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 @@ -8242,7 +8242,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 4.3494E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f4568db34e..58cbb07abd 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3641,7 +3641,7 @@ "psolradmw": 0.0, "psurffwi": 0.0, "psurffwo": 0.0, - "psyncpv": 0.0, + "pden_plasma_sync_mw": 0.0, "ptargf": 2.0, "ptarmw": 0.0, "ptempalw": 473.15, @@ -10396,7 +10396,7 @@ "psolradmw": "SOL radiation power (MW) (`stellarator only`)", "psurffwi": "Surface heat flux on first wall (MW) (sum = pradfw)", "psurffwo": "Surface heat flux on first wall (MW) (sum = pradfw)", - "psyncpv": "synchrotron radiation power per volume (MW/m3)", + "pden_plasma_sync_mw": "synchrotron radiation power per volume (MW/m3)", "ptargf": "IFE target factory power at 6 Hz repetition rate (MW)", "ptarmw": "", "ptempalw": "maximum peak centrepost temperature (K) (`constraint equation 44`)", @@ -19217,7 +19217,7 @@ "pradsolmw", "proton_rate_density", "psolradmw", - "psyncpv", + "pden_plasma_sync_mw", "ilhthresh", "plhthresh", "pthrmw", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 0ef38fed4c..cf5e5789c5 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -423,7 +423,7 @@ Total_power_deposited_in_plasma_(MW)____________________________________ (tot_power_plasma)____________ 3.8856E+02 OP Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4604E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4402E+02 OP - Synchrotron_radiation_power_(MW)________________________________________ (psyncpv*vol)_________________ 1.5820E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5820E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 From e74b5e6a991bf8b406a52ef97181b28949bc2003 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 Jan 2025 16:24:01 +0000 Subject: [PATCH 25/48] :bug: fix old nimp variable name for new init.py --- process/impurity_radiation.py | 2 +- process/init.py | 2 +- process/physics.py | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/process/impurity_radiation.py b/process/impurity_radiation.py index 5eed4eb0da..8da39b5f34 100644 --- a/process/impurity_radiation.py +++ b/process/impurity_radiation.py @@ -8,7 +8,7 @@ from scipy import integrate from process.fortran import constants -from process.fortran import error_handling, impurity_radiation_module +from process.fortran import constants, error_handling, impurity_radiation_module logger = logging.getLogger(__name__) diff --git a/process/init.py b/process/init.py index b6e15af220..6ef434acf4 100644 --- a/process/init.py +++ b/process/init.py @@ -335,7 +335,7 @@ def check_process(): ) # Impurity fractions - for imp in range(fortran.impurity_radiation_module.nimp): + for imp in range(fortran.impurity_radiation_module.n_impurities): fortran.impurity_radiation_module.impurity_arr_frac[imp] = ( fortran.impurity_radiation_module.fimp[imp] ) diff --git a/process/physics.py b/process/physics.py index 8ac832e24a..d89334743d 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2407,6 +2407,14 @@ def physics(self): * physics_variables.pdivt / build_variables.fwarea ) + (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) + * physics_variables.p_plasma_rad_mw + / build_variables.fwarea + + (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) + * physics_variables.rad_fraction_sol + * physics_variables.pdivt + / build_variables.fwarea + ) constraint_variables.pflux_fw_rad_max_mw = ( physics_variables.pflux_fw_rad_mw * constraint_variables.f_fw_rad_max @@ -7561,11 +7569,7 @@ def pthresh( # Martin et al (2008) for recent ITER scaling, with mass correction # and 95% confidence limits martin = ( - 0.0488 - * dnla20**0.717 - * bt**0.803 - * a_plasma_surface**0.941 - * (2.0 / m_ions_total_amu) + 0.0488 * dnla20**0.717 * bt**0.803 * a_plasma_surface**0.941 * (2.0 / m_ions_total_amu) ) martin_error = ( np.sqrt( @@ -7600,16 +7604,12 @@ def pthresh( snipes_2000_cd = ( 0.8 * dnla20**0.5 * bt**0.53 * rmajor**1.51 * (2.0 / m_ions_total_amu) ) - snipes_2000_cd_ub = 0.867 - * dnla20**0.561 - * bt**0.588 - * rmajor**1.587 - * (2.0 / m_ions_total_amu) - snipes_2000_cd_lb = 0.733 - * dnla20**0.439 - * bt**0.472 - * rmajor**1.433 - * (2.0 / m_ions_total_amu) + snipes_2000_cd_ub = ( + 0.867 * dnla20**0.561 * bt**0.588 * rmajor**1.587 * (2.0 / m_ions_total_amu) + ) + snipes_2000_cd_lb = ( + 0.733 * dnla20**0.439 * bt**0.472 * rmajor**1.433 * (2.0 / m_ions_total_amu) + ) # Hubbard et al. 2012 L-I threshold scaling hubbard_2012 = 2.11 * (plasma_current / 1e6) ** 0.94 * dnla20**0.65 From 8f10e269f226133901f7be1d3a754725a1a4f4a6 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 10 Jan 2025 16:48:40 +0000 Subject: [PATCH 26/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20pradpv=20to=20pde?= =?UTF-8?q?n=5Fplasma=5Frad=5Fmw=20for=20consistency=20across=20the=20code?= =?UTF-8?q?base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/physics-models/error.txt | 2 +- .../physics-models/plasma_confinement.md | 2 +- process/physics.py | 11 +++--- process/physics_functions.py | 8 ++-- process/stellarator.py | 8 ++-- source/fortran/constraint_equations.f90 | 20 +++++----- source/fortran/physics_variables.f90 | 4 +- tests/integration/ref_dicts.json | 6 +-- tests/unit/test_physics.py | 38 ++++++++++--------- 9 files changed, 51 insertions(+), 48 deletions(-) diff --git a/documentation/proc-pages/physics-models/error.txt b/documentation/proc-pages/physics-models/error.txt index b79082b548..f34c28cf76 100644 --- a/documentation/proc-pages/physics-models/error.txt +++ b/documentation/proc-pages/physics-models/error.txt @@ -994,7 +994,7 @@ is derived directly from the energy confinement scaling law. \texttt{iradloss\ =\ 0} -- Total power lost is scaling power plus radiation -\texttt{pscaling\ +\ pradpv\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ pinjmw/vol_plasma} +\texttt{pscaling\ +\ pden_plasma_rad_mw\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ pinjmw/vol_plasma} \texttt{iradloss\ =\ 1} -- Total power lost is scaling power plus core radiation only diff --git a/documentation/proc-pages/physics-models/plasma_confinement.md b/documentation/proc-pages/physics-models/plasma_confinement.md index 77b7b44b32..e618aae029 100644 --- a/documentation/proc-pages/physics-models/plasma_confinement.md +++ b/documentation/proc-pages/physics-models/plasma_confinement.md @@ -78,7 +78,7 @@ derived directly from the energy confinement scaling law. `iradloss = 0` -- Total power lost is scaling power plus radiation: -`pscaling + pradpv = f_alpha_plasma*alpha_power_density_total + charged_power_density + pden_plasma_ohmic_mw + pinjmw/vol_plasma` +`pscaling + pden_plasma_rad_mw = f_alpha_plasma*alpha_power_density_total + charged_power_density + pden_plasma_ohmic_mw + pinjmw/vol_plasma` `iradloss = 1` -- Total power lost is scaling power plus radiation from a region defined as the "core": diff --git a/process/physics.py b/process/physics.py index d89334743d..47100645e2 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2123,7 +2123,7 @@ def physics(self): physics_variables.pden_plasma_sync_mw = radpwrdata.pden_plasma_sync_mw physics_variables.pcoreradpv = radpwrdata.pcoreradpv physics_variables.pedgeradpv = radpwrdata.pedgeradpv - physics_variables.pradpv = radpwrdata.pradpv + physics_variables.pden_plasma_rad_mw = radpwrdata.pden_plasma_rad_mw physics_variables.p_plasma_inner_rad_mw = ( physics_variables.pcoreradpv * physics_variables.vol_plasma @@ -2132,7 +2132,7 @@ def physics(self): physics_variables.pedgeradpv * physics_variables.vol_plasma ) physics_variables.p_plasma_rad_mw = ( - physics_variables.pradpv * physics_variables.vol_plasma + physics_variables.pden_plasma_rad_mw * physics_variables.vol_plasma ) # Calculate ohmic power @@ -5197,7 +5197,8 @@ def outplas(self): physics_variables.powerht / ( physics_variables.powerht - + physics_variables.pradpv * physics_variables.vol_plasma + + physics_variables.pden_plasma_rad_mw + * physics_variables.vol_plasma ) ) ** 0.31, @@ -6502,7 +6503,7 @@ def fhz(self, hhh): # Include the radiation power if requested if physics_variables.iradloss == 0: - fhz += physics_variables.pradpv + fhz += physics_variables.pden_plasma_rad_mw elif physics_variables.iradloss == 1: fhz += physics_variables.pcoreradpv @@ -6624,7 +6625,7 @@ def pcond( # Include the radiation as a loss term if requested if physics_variables.iradloss == 0: - powerht = powerht - physics_variables.pradpv * vol_plasma + powerht = powerht - physics_variables.pden_plasma_rad_mw * vol_plasma elif physics_variables.iradloss == 1: powerht = ( powerht - pcoreradpv * vol_plasma diff --git a/process/physics_functions.py b/process/physics_functions.py index b91fcb69c1..3d7f170769 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -558,7 +558,7 @@ class RadpwrData: pden_plasma_sync_mw: float pcoreradpv: float pedgeradpv: float - pradpv: float + pden_plasma_rad_mw: float def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: @@ -577,7 +577,7 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: - pden_plasma_sync_mw (float): Synchrotron radiation power per unit volume (MW/m^3). - pcoreradpv (float): Total core radiation power per unit volume (MW/m^3). - pedgeradpv (float): Edge radiation power per unit volume (MW/m^3). - - pradpv (float): Total radiation power per unit volume (MW/m^3). + - pden_plasma_rad_mw (float): Total radiation power per unit volume (MW/m^3). Author: P J Knight, CCFE, Culham Science Centre @@ -594,9 +594,9 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: pcoreradpv = imp_rad.radcore + pden_plasma_sync_mw # Total radiation power/volume. - pradpv = imp_rad.radtot + pden_plasma_sync_mw + pden_plasma_rad_mw = imp_rad.radtot + pden_plasma_sync_mw - return RadpwrData(pden_plasma_sync_mw, pcoreradpv, pedgeradpv, pradpv) + return RadpwrData(pden_plasma_sync_mw, pcoreradpv, pedgeradpv, pden_plasma_rad_mw) def psync_albajar_fidone(): diff --git a/process/stellarator.py b/process/stellarator.py index 82350d38a4..a8e84ee970 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4304,7 +4304,7 @@ def stphys(self, output): physics_variables.pden_plasma_sync_mw = radpwr_data.pden_plasma_sync_mw physics_variables.pcoreradpv = radpwr_data.pcoreradpv physics_variables.pedgeradpv = radpwr_data.pedgeradpv - physics_variables.pradpv = radpwr_data.pradpv + physics_variables.pden_plasma_rad_mw = radpwr_data.pden_plasma_rad_mw physics_variables.pcoreradpv = max(physics_variables.pcoreradpv, 0.0e0) physics_variables.pedgeradpv = max(physics_variables.pedgeradpv, 0.0e0) @@ -4317,7 +4317,7 @@ def stphys(self, output): ) physics_variables.p_plasma_rad_mw = ( - physics_variables.pradpv * physics_variables.vol_plasma + physics_variables.pden_plasma_rad_mw * physics_variables.vol_plasma ) # Heating power to plasma (= Psol in divertor model) @@ -4328,7 +4328,7 @@ def stphys(self, output): physics_variables.f_alpha_plasma * physics_variables.alpha_power_total + physics_variables.non_alpha_charged_power + physics_variables.p_plasma_ohmic_mw - - physics_variables.pradpv * physics_variables.vol_plasma + - physics_variables.pden_plasma_rad_mw * physics_variables.vol_plasma ) powht = max( 0.00001e0, powht @@ -4355,7 +4355,7 @@ def stphys(self, output): physics_variables.p_plasma_rad_mw = ( physics_variables.p_plasma_rad_mw + physics_variables.psolradmw ) - # pradpv = physics_variables.p_plasma_rad_mw / physics_variables.vol_plasma # this line OVERWRITES the original definition of pradpv, probably shouldn't be defined like that as the core does not lose SOL power. + # pden_plasma_rad_mw = physics_variables.p_plasma_rad_mw / physics_variables.vol_plasma # this line OVERWRITES the original definition of pden_plasma_rad_mw, probably shouldn't be defined like that as the core does not lose SOL power. # The following line is unphysical, but prevents -ve sqrt argument # Should be obsolete if constraint eqn 17 is turned on (but beware - diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 9e69ddb850..550a8a62b7 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -450,7 +450,7 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !!
    • = 1 assume ignited (but include auxiliary power in costs)
    !! ptrepv : input real : electron transport power per volume (MW/m3) !! ptripv : input real : ion transport power per volume (MW/m3) - !! pradpv : input real : total radiation power per volume (MW/m3) + !! pden_plasma_rad_mw : input real : total radiation power per volume (MW/m3) !! pcoreradpv : input real : total core radiation power per volume (MW/m3) !! f_alpha_plasma : input real : fraction of alpha power deposited in plasma !! alpha_power_density_total : input real : alpha power per volume (MW/m3) @@ -459,7 +459,7 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! pinjmw : input real : total auxiliary injected power (MW) !! vol_plasma : input real : plasma volume (m3) - use physics_variables, only: iradloss, ignite, ptrepv, ptripv, pradpv, & + use physics_variables, only: iradloss, ignite, ptrepv, ptripv, pden_plasma_rad_mw, & pcoreradpv, f_alpha_plasma, alpha_power_density_total, charged_power_density, & pden_plasma_ohmic_mw, vol_plasma use current_drive_variables, only: pinjmw @@ -479,7 +479,7 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) pscaling = ptrepv + ptripv ! Total power lost is scaling power plus radiation: if (iradloss == 0) then - pnumerator = pscaling + pradpv + pnumerator = pscaling + pden_plasma_rad_mw else if (iradloss == 1) then pnumerator = pscaling + pcoreradpv else @@ -569,7 +569,7 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !!
  • = 0 do not assume plasma ignition; !!
  • = 1 assume ignited (but include auxiliary power in costs)
!! ptrepv : input real : electron transport power per volume (MW/m3) - !! pradpv : input real : total radiation power per volume (MW/m3) + !! pden_plasma_rad_mw : input real : total radiation power per volume (MW/m3) !! pcoreradpv : input real : total core radiation power per volume (MW/m3) !! f_alpha_plasma : input real : fraction of alpha power deposited in plasma !! alpha_power_electron_density : input real : alpha power per volume to electrons (MW/m3) @@ -577,7 +577,7 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! pinjemw : input real : auxiliary injected power to electrons (MW) !! vol_plasma : input real : plasma volume (m3) use physics_variables, only: iradloss, ignite, ptrepv, pcoreradpv, f_alpha_plasma, & - alpha_power_electron_density, piepv, vol_plasma, pradpv + alpha_power_electron_density, piepv, vol_plasma, pden_plasma_rad_mw use current_drive_variables, only: pinjemw implicit none real(dp), intent(out) :: tmp_cc @@ -592,7 +592,7 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) pscaling = ptrepv ! Total power lost is scaling power plus radiation: if (iradloss == 0) then - pnumerator = pscaling + pradpv + pnumerator = pscaling + pden_plasma_rad_mw else if (iradloss == 1) then pnumerator = pscaling + pcoreradpv else @@ -1034,8 +1034,8 @@ subroutine constraint_eqn_017(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! charged_power_density : input real : non-alpha charged particle fusion power per volume (MW/m3) !! pden_plasma_ohmic_mw : input real : ohmic heating power per volume (MW/m3) !! fradpwr : input real : f-value for core radiation power limit - !! pradpv : input real : total radiation power per volume (MW/m3) - use physics_variables, only: f_alpha_plasma, vol_plasma, alpha_power_density_total, charged_power_density, pden_plasma_ohmic_mw, pradpv + !! pden_plasma_rad_mw : input real : total radiation power per volume (MW/m3) + use physics_variables, only: f_alpha_plasma, vol_plasma, alpha_power_density_total, charged_power_density, pden_plasma_ohmic_mw, pden_plasma_rad_mw use current_drive_variables, only: pinjmw use constraint_variables, only: fradpwr implicit none @@ -1049,9 +1049,9 @@ subroutine constraint_eqn_017(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Maximum possible power/vol_plasma that can be radiated (local) pradmaxpv = pinjmw/vol_plasma + alpha_power_density_total*f_alpha_plasma + charged_power_density + pden_plasma_ohmic_mw - tmp_cc = 1.0D0 - fradpwr * pradmaxpv / pradpv + tmp_cc = 1.0D0 - fradpwr * pradmaxpv / pden_plasma_rad_mw tmp_con = pradmaxpv * (1.0D0 - tmp_cc) - tmp_err = pradpv * tmp_cc + tmp_err = pden_plasma_rad_mw * tmp_cc tmp_symbol = '<' tmp_units = 'MW/m3' diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 4ecae2777a..efd5382f4e 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -719,7 +719,7 @@ module physics_variables real(dp) :: p_plasma_rad_mw !! total radiation power from inside LCFS (MW) - real(dp) :: pradpv + real(dp) :: pden_plasma_rad_mw !! total radiation power per volume (MW/m3) real(dp) :: pradsolmw @@ -1106,7 +1106,7 @@ subroutine init_physics_variables fusion_power = 0.0D0 len_plasma_poloidal = 0.0D0 p_plasma_rad_mw = 0.0D0 - pradpv = 0.0D0 + pden_plasma_rad_mw = 0.0D0 pradsolmw = 0.0D0 proton_rate_density = 0.0D0 psolradmw = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 58cbb07abd..351c98ba81 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3612,7 +3612,7 @@ "pradhcd": 0.0, "pradloss": 0.0, "p_plasma_rad_mw": 0.0, - "pradpv": 0.0, + "pden_plasma_rad_mw": 0.0, "pradsolmw": 0.0, "prdiv": 0.36, "precircmw": 0.0, @@ -10367,7 +10367,7 @@ "pradhcd": "Radiation power incident on the heating and current drive system (MW)", "pradloss": "Radiation power lost through holes (eventually hits shield) (MW)\n Only used for stellarator", "p_plasma_rad_mw": "total radiation power from inside LCFS (MW)", - "pradpv": "total radiation power per volume (MW/m3)", + "pden_plasma_rad_mw": "total radiation power per volume (MW/m3)", "pradsolmw": "radiation power from SoL (MW)", "prdiv": "divertor chamber pressure during burn (Pa)", "precircmw": "recirculating electric power (MW)", @@ -19213,7 +19213,7 @@ "fusion_power", "len_plasma_poloidal", "p_plasma_rad_mw", - "pradpv", + "pden_plasma_rad_mw", "pradsolmw", "proton_rate_density", "psolradmw", diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index f732b1875d..b3053c37f0 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -2168,7 +2168,7 @@ class PcondParam(NamedTuple): tauee_in: Any = None - pradpv: Any = None + pden_plasma_rad_mw: Any = None kappaa_ipb: Any = None @@ -2255,7 +2255,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2299,7 +2299,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2343,7 +2343,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2387,7 +2387,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2431,7 +2431,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2475,7 +2475,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2519,7 +2519,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2563,7 +2563,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2607,7 +2607,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2651,7 +2651,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2695,7 +2695,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2739,7 +2739,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2783,7 +2783,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2827,7 +2827,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2871,7 +2871,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2915,7 +2915,7 @@ class PcondParam(NamedTuple): PcondParam( iradloss=1, tauee_in=0, - pradpv=0.11824275660100725, + pden_plasma_rad_mw=0.11824275660100725, kappaa_ipb=1.68145080681586, p_plasma_ohmic_mw=0.63634001890069991, f_alpha_plasma=0.94999999999999996, @@ -2975,7 +2975,9 @@ def test_pcond(pcondparam, monkeypatch, physics): monkeypatch.setattr(physics_variables, "tauee_in", pcondparam.tauee_in) - monkeypatch.setattr(physics_variables, "pradpv", pcondparam.pradpv) + monkeypatch.setattr( + physics_variables, "pden_plasma_rad_mw", pcondparam.pden_plasma_rad_mw + ) monkeypatch.setattr(physics_variables, "kappaa_ipb", pcondparam.kappaa_ipb) From 9c1be03f4d1c4dfc3e4e12b16865a8864a4f07b7 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 10 Jan 2025 17:44:15 +0000 Subject: [PATCH 27/48] :art: Update plasma radiation documentation and improve psync_albajar_fidone function docstring for clarity --- .../physics-models/plasma_radiation.md | 81 +++++++++++++++++-- process/physics_functions.py | 30 ++++--- 2 files changed, 93 insertions(+), 18 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_radiation.md b/documentation/proc-pages/physics-models/plasma_radiation.md index bcc6effa49..d17db08d77 100644 --- a/documentation/proc-pages/physics-models/plasma_radiation.md +++ b/documentation/proc-pages/physics-models/plasma_radiation.md @@ -1,21 +1,88 @@ # Plasma Radiation + +## Impurity Radiation Class | `ImpurityRadiation` + +### Initialization | `__init__()` + +Initialize the FusionReactionRate class with the given plasma profile. + +#### Parameters: +- `plasma_profile (PlasmaProfile)`: The parameterized temperature and density profiles of the plasma. Taken from the plasma_profile object. + +#### Attributes: +- `plasma_profile` (`PlasmaProfile`): Plasma profile instance. + +- `rho` (`numpy.ndarray`): Density profile along the x-axis. + +- `rhodx` (`numpy.ndarray`): Density profile step size along the x-axis. + +- `imp` (`numpy.ndarray`): Indices of impurities with a fraction greater than 1.0e-30. + +- `pimp_profile` (`numpy.ndarray`): Impurity profile array initialized to zeros. + +- `radtot_profile` (`numpy.ndarray`): Total radiation profile array initialized to zeros. + +- `radcore_profile` (`numpy.ndarray`): Core radiation profile array initialized to zeros. + +- `radtot` (`float`): Total radiation initialized to 0.0. + +- `radcore` (`float`): Core radiation initialized to 0.0. + + +## Synchrotron radiation | `psync_albajar_fidone()` + The synchrotron radiation power[^1] [^2] is assumed to originate from the -plasma core. The wall reflection factor `ssync` may be set by the user. +plasma core. + + + +-------------------- By changing the input parameter `coreradius`, the user may set the normalised radius defining the 'core' region. Only the impurity and synchrotron radiation from this affects the confinement scaling. Figure 1 below shows the radiation power contributions. +The wall reflection factor `ssync` may be set by the user. + + ![Schematic diagram of radiation power contributions](../images/radiation.png "Schematic diagram of radiation power contributions") *Figure 1: Schematic diagram of the radiation power contributions and how they are split between core and edge radiation* -Constraint equation no. 17 with iteration variable no. 28 (`fradpwr`) -ensures that the calculated total radiation power does not exceed the total +------------------ + +## Key Constraints + +### Radiation power density upper limit + +This constraint can be activated by stating `icc = 17` in the input file. + +$$ +\frac{P_{\text{rad}}}{V_{\text{plasma}}} < \frac{P_{\text{inj}} + P_{\alpha}f_{\alpha, \text{plasma}} + P_{\text{charged}} + P_{\text{ohmic}} }{V_{\text{plasma}}} +$$ + +Ensures that the calculated total radiation power density does not exceed the total power available that can be converted to radiation (i.e. the sum of the fusion -alpha power, other charged particle fusion power, auxiliary injected power and -the ohmic power). This constraint should always be turned on. +alpha power coupled to the plasma, other charged particle fusion power, auxiliary injected power and +the ohmic heating power). $f_{\alpha, \text{plasma}}$ is the fraction of alpha power that is coupled to the plasma (`f_alpha_plasma`). + +The scaling value `fradpwr` can be varied also. + +**It is recommended to have this constraint on as it is a plasma stability model** + +---------------- + +### Radiation wall load upper limit + +This constraint can be activated by stating `icc = 67` in the input file. + +The limiting value of $q_{\text{fw,rad}}$ in $\mathrm {MWm^{-2}}$ is be set using input parameter `maxradwallload`. + +The scaling value `fradwall` can be varied also. + -[^1]: Albajar, Nuclear Fusion **41** (2001) 665 -[^2]: Fidone, Giruzzi and Granata, Nuclear Fusion **41** (2001) 1755 \ No newline at end of file +[^1]: F. Albajar, J. Johner, and G. Granata, “Improved calculation of synchrotron radiation losses in realistic tokamak plasmas,” Nuclear Fusion, vol. 41, no. 6, pp. 665–678, Jun. 2001, doi: https://doi.org/10.1088/0029-5515/41/6/301. +‌ +[^2]: I. Fidone, G Giruzzi, and G. Granata, “Synchrotron radiation loss in tokamaks of arbitrary geometry,” Nuclear Fusion, vol. 41, no. 12, pp. 1755–1758, Dec. 2001, doi: https://doi.org/10.1088/0029-5515/41/12/102. +‌ \ No newline at end of file diff --git a/process/physics_functions.py b/process/physics_functions.py index 3d7f170769..6fa20f58b9 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -599,18 +599,26 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: return RadpwrData(pden_plasma_sync_mw, pcoreradpv, pedgeradpv, pden_plasma_rad_mw) -def psync_albajar_fidone(): - """This routine finds the synchrotron radiation power in MW/m3, - using the method of Albajar and Fidone. - References: - Albajar, Nuclear Fusion 41 (2001) 665 - Fidone, Giruzzi, Granata, Nuclear Fusion 41 (2001) 1755 - Authors: - P J Knight, CCFE, Culham Science Centre - R Kemp, CCFE, Culham Science Centre +def psync_albajar_fidone() -> float: + """ + Calculate the synchrotron radiation power in MW/m^3 using the method of Albajar and Fidone. - :return: pden_plasma_sync_mw synchrotron radiation power/volume (MW/m3) - :rtype: float + This function computes the synchrotron radiation power density for the plasma based on + the plasma shape, major and minor radii, electron density, and temperature profiles. + + References: + - F. Albajar, J. Johner, and G. Granata, “Improved calculation of synchrotron radiation losses in realistic tokamak plasmas,” + Nuclear Fusion, vol. 41, no. 6, pp. 665–678, Jun. 2001, doi: https://doi.org/10.1088/0029-5515/41/6/301. + ‌ + - I. Fidone, G Giruzzi, and G. Granata, “Synchrotron radiation loss in tokamaks of arbitrary geometry,” + Nuclear Fusion, vol. 41, no. 12, pp. 1755–1758, Dec. 2001, doi: https://doi.org/10.1088/0029-5515/41/12/102. + ‌ + Authors: + - P J Knight, CCFE, Culham Science Centre + - R Kemp, CCFE, Culham Science Centre + + Returns: + float: Synchrotron radiation power per unit volume (MW/m^3). """ tbet = 2.0e0 From 3ef18e2b04f08d35616b122617b548d6b4489e13 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 10 Jan 2025 19:08:41 +0000 Subject: [PATCH 28/48] :bug: Add the tbeta parameter to the synchrotron power calculations as intended. Value was fixed to 2.0 --- .../profiles/plasma_profiles.md | 5 ++ process/physics_functions.py | 60 ++++++++----------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/documentation/proc-pages/physics-models/profiles/plasma_profiles.md b/documentation/proc-pages/physics-models/profiles/plasma_profiles.md index 0ddddbd112..82dd4b638e 100644 --- a/documentation/proc-pages/physics-models/profiles/plasma_profiles.md +++ b/documentation/proc-pages/physics-models/profiles/plasma_profiles.md @@ -148,6 +148,11 @@ at the separatrix (`neped, nesep` for the electron density, and `teped, tesep` for the electron temperature); the ion equivalents are scaled from the electron values by the ratio of the volume-averaged values). +!!! note "$\beta_T$ setting" + $\beta_T$ can have an important impact not on just the plasma profile shape but also synchrotron radiation calculations. + For more info on its effect, visit the radiation section [here](../plasma_radiation.md). + + !!! warning " Pedestal setting" If `ipedestal == 1` then the pedestal density `neped` is set as a fraction `fgwped` of the Greenwald density (providing `fgwped` >= 0). The default value of `fgwped` is 0.8[^2]. diff --git a/process/physics_functions.py b/process/physics_functions.py index 6fa20f58b9..8afd81c303 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -601,32 +601,28 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: def psync_albajar_fidone() -> float: """ - Calculate the synchrotron radiation power in MW/m^3 using the method of Albajar and Fidone. + Calculate the synchrotron radiation power in MW/m^3. This function computes the synchrotron radiation power density for the plasma based on the plasma shape, major and minor radii, electron density, and temperature profiles. + Returns: + float: Synchrotron radiation power per unit volume (MW/m^3). + + Notes: + References: - F. Albajar, J. Johner, and G. Granata, “Improved calculation of synchrotron radiation losses in realistic tokamak plasmas,” - Nuclear Fusion, vol. 41, no. 6, pp. 665–678, Jun. 2001, doi: https://doi.org/10.1088/0029-5515/41/6/301. + Nuclear Fusion, vol. 41, no. 6, pp. 665–678, Jun. 2001, doi: https://doi.org/10.1088/0029-5515/41/6/301. ‌ - I. Fidone, G Giruzzi, and G. Granata, “Synchrotron radiation loss in tokamaks of arbitrary geometry,” - Nuclear Fusion, vol. 41, no. 12, pp. 1755–1758, Dec. 2001, doi: https://doi.org/10.1088/0029-5515/41/12/102. + Nuclear Fusion, vol. 41, no. 12, pp. 1755–1758, Dec. 2001, doi: https://doi.org/10.1088/0029-5515/41/12/102. ‌ - Authors: - - P J Knight, CCFE, Culham Science Centre - - R Kemp, CCFE, Culham Science Centre - - Returns: - float: Synchrotron radiation power per unit volume (MW/m^3). """ - tbet = 2.0e0 # rpow is the (1-Rsyn) power dependence based on plasma shape # (see Fidone) - rpow = 0.62e0 - kap = 0.0 de2o = 0.0 pao = 0.0 @@ -640,9 +636,6 @@ def psync_albajar_fidone() -> float: 2.0e0 * np.pi**2 * physics_variables.rmajor * physics_variables.rminor**2 ) - # No account is taken of pedestal profiles here, other than use of - # the correct physics_variables.ne0 and physics_variables.te0... - de2o = 1.0e-20 * physics_variables.ne0 pao = 6.04e3 * (physics_variables.rminor * de2o) / physics_variables.bt gfun = 0.93e0 * ( @@ -652,32 +645,31 @@ def psync_albajar_fidone() -> float: kfun = (physics_variables.alphan + 3.87e0 * physics_variables.alphat + 1.46e0) ** ( -0.79e0 ) - kfun = kfun * (1.98e0 + physics_variables.alphat) ** 1.36e0 * tbet**2.14e0 - kfun = kfun * (tbet**1.53e0 + 1.87e0 * physics_variables.alphat - 0.16e0) ** ( - -1.33e0 + kfun = ( + kfun + * (1.98e0 + physics_variables.alphat) ** 1.36e0 + * physics_variables.tbeta**2.14e0 ) + kfun = kfun * ( + physics_variables.tbeta**1.53e0 + 1.87e0 * physics_variables.alphat - 0.16e0 + ) ** (-1.33e0) dum = ( - 1.0e0 - + 0.12e0 - * (physics_variables.te0 / (pao**0.41e0)) - * (1.0e0 - physics_variables.ssync) ** 0.41e0 - ) - - # Very high T modification, from Fidone - - dum = dum ** (-1.51e0) + 1.0 + + 0.12 + * (physics_variables.te0 / pao**0.41) + * (1.0 - physics_variables.ssync) ** 0.41 + ) ** -1.51 psync = ( 3.84e-8 - * (1.0e0 - physics_variables.ssync) ** rpow + * (1.0 - physics_variables.ssync) ** 0.62 * physics_variables.rmajor - * physics_variables.rminor**1.38e0 - ) - psync = psync * kap**0.79e0 * physics_variables.bt**2.62e0 * de2o**0.38e0 - psync = ( - psync + * physics_variables.rminor**1.38 + * kap**0.79 + * physics_variables.bt**2.62 + * de2o**0.38 * physics_variables.te0 - * (16.0e0 + physics_variables.te0) ** 2.61e0 + * (16.0 + physics_variables.te0) ** 2.61 * dum * gfun * kfun From 7e8a3196fe899d2cc1a9e0877cc13818ed6ff25d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 10 Jan 2025 19:22:05 +0000 Subject: [PATCH 29/48] :bug: Remove unused kap variable from psync_albajar_fidone function and replace with physics_variables.kappa for clarity --- process/physics_functions.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/process/physics_functions.py b/process/physics_functions.py index 8afd81c303..fd67d3f4f8 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -623,7 +623,6 @@ def psync_albajar_fidone() -> float: # rpow is the (1-Rsyn) power dependence based on plasma shape # (see Fidone) - kap = 0.0 de2o = 0.0 pao = 0.0 gfun = 0.0 @@ -632,10 +631,6 @@ def psync_albajar_fidone() -> float: psync = 0.0 pden_plasma_sync_mw = 0.0 - kap = physics_variables.vol_plasma / ( - 2.0e0 * np.pi**2 * physics_variables.rmajor * physics_variables.rminor**2 - ) - de2o = 1.0e-20 * physics_variables.ne0 pao = 6.04e3 * (physics_variables.rminor * de2o) / physics_variables.bt gfun = 0.93e0 * ( @@ -665,7 +660,7 @@ def psync_albajar_fidone() -> float: * (1.0 - physics_variables.ssync) ** 0.62 * physics_variables.rmajor * physics_variables.rminor**1.38 - * kap**0.79 + * physics_variables.kappa**0.79 * physics_variables.bt**2.62 * de2o**0.38 * physics_variables.te0 From 53c92ffd3d462cd888a8f6007bfb04ecc9a3ce65 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 11:36:51 +0000 Subject: [PATCH 30/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20ssync=20to=20f=5F?= =?UTF-8?q?sync=5Freflect=20for=20clarity=20and=20consistency=20across=20t?= =?UTF-8?q?he=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/physics-models/error.txt | 2 +- .../physics-models/plasma_radiation.md | 25 ++++++++++++++- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +-- examples/data/large_tokamak_1_MFILE.DAT | 4 +-- examples/data/large_tokamak_2_MFILE.DAT | 4 +-- examples/data/large_tokamak_3_MFILE.DAT | 4 +-- examples/data/large_tokamak_4_MFILE.DAT | 4 +-- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 20 ++++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/io/plot_proc.py | 4 +-- process/physics.py | 4 +-- process/physics_functions.py | 32 ++++++------------- source/fortran/input.f90 | 6 ++-- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 20 ++++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 10 +++--- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- .../regression/input_files/stellarator.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- 35 files changed, 119 insertions(+), 110 deletions(-) diff --git a/documentation/proc-pages/physics-models/error.txt b/documentation/proc-pages/physics-models/error.txt index f34c28cf76..d76d45bab6 100644 --- a/documentation/proc-pages/physics-models/error.txt +++ b/documentation/proc-pages/physics-models/error.txt @@ -509,7 +509,7 @@ The impurity fraction of one of the elements listed in array The synchrotron radiation power\footnote{Albajar, Nuclear Fusion \textbf{41} (2001) 665} \footnote{Fidone, Giruzzi and Granata, Nuclear Fusion \textbf{41} (2001) 1755} is assumed to originate from the -plasma core. The wall reflection factor \texttt{ssync} may be set by the +plasma core. The wall reflection factor \texttt{f_sync_reflect} may be set by the user. By changing the input parameter \texttt{coreradius}, the user may set diff --git a/documentation/proc-pages/physics-models/plasma_radiation.md b/documentation/proc-pages/physics-models/plasma_radiation.md index d17db08d77..7fec8487f6 100644 --- a/documentation/proc-pages/physics-models/plasma_radiation.md +++ b/documentation/proc-pages/physics-models/plasma_radiation.md @@ -35,6 +35,29 @@ Initialize the FusionReactionRate class with the given plasma profile. The synchrotron radiation power[^1] [^2] is assumed to originate from the plasma core. +$$ +\begin{aligned} +P_{s y n, r}(\mathrm{MW})= & 3.84 \times 10^{-8}(1-r)^{1 / 2} R a^{1.38} \kappa^{0.79} \\ +& \times B_t^{2.62} n_{e_0(20)}^{0.38} T_{e_0}\left(16+T_{e_0}\right)^{2.61} \\ +& \times\left(1+0.12 \frac{T_{e_0}}{p_{a_0}^{0.41}}\right)^{-1.51} \\ +& \times K\left(\alpha_n, \alpha_T, \beta_T\right) G(A) +\end{aligned} +$$ + +$$ +K(\alpha_n, \alpha_T, \beta_T) = \left(\alpha_n +3.87\alpha_T +1.46\right)^{-0.79} \\ +\times \left(1.98+\alpha_T\right)^{1.36}\beta_T^{2.14} \\ +\times \left(\beta_T^{1.53}+1.87\alpha_T-0.16\right)^{-1.33} +$$ + +$$ +G\left(A\right) = 0.93\left[1+0.85 e^{-0.82A}\right] +$$ + +$$ +p_{a_0} = 6.04 \times 10^3 \frac{a n_{e_0(20)}}{B_T} +$$ + -------------------- @@ -44,7 +67,7 @@ radius defining the 'core' region. Only the impurity and synchrotron radiation from this affects the confinement scaling. Figure 1 below shows the radiation power contributions. -The wall reflection factor `ssync` may be set by the user. +The wall reflection factor `f_sync_reflect` may be set by the user. ![Schematic diagram of radiation power contributions](../images/radiation.png "Schematic diagram of radiation power contributions") diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index fbf06f7abc..95c385e81a 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -427,7 +427,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4356E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4715E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2665E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.9376E+01 OP @@ -1625,7 +1625,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 8da57ab175..e3a29075b1 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -428,7 +428,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP @@ -1619,7 +1619,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 8229a751d1..bba61bcb93 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -428,7 +428,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP @@ -1619,7 +1619,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 9557fa165a..f58c300b06 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -428,7 +428,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP @@ -1619,7 +1619,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 1fac9568c2..caaecdb32c 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -428,7 +428,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP @@ -1619,7 +1619,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index fe14ce4fbc..53d7874948 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -429,7 +429,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index ae5a91b42a..ecb06cf833 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -283,7 +283,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -1278,7 +1278,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -2273,7 +2273,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -3268,7 +3268,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -4263,7 +4263,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -5258,7 +5258,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -6253,7 +6253,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -7248,7 +7248,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -8243,7 +8243,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -9264,7 +9264,7 @@ q = 3.247 * Safety factor 'near' plasma edge (iteration variable 18); q0 = 1.0 * Safety factor on axis rmajor = 9.072 * Plasma major radius (m) (iteration variable 3) i_single_null = 1 * Switch for single null / double null plasma; -ssync = 0.6 * Synchrotron wall reflectivity factor +f_sync_reflect = 0.6 * Synchrotron wall reflectivity factor te = 13.07 * Volume averaged electron temperature (kev) *zfear = 1 * High-z impurity switch; 0=iron; 1=argon plasma_res_factor = 0.66 * plasma resistivity pre-factor diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 472c68b4db..df1e5e61e4 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -429,7 +429,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 0f200076f9..c51b58f810 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3515,10 +3515,10 @@ def main(args=None): # Ion dens(10^19 m^-3) -- 15 # Poloidal flux (Wb) -- 16 # rad profile - global ssync + global f_sync_reflect global bt global vol_plasma - ssync = m_file.data["ssync"].get_scan(scan) + f_sync_reflect = m_file.data["f_sync_reflect"].get_scan(scan) bt = m_file.data["bt"].get_scan(scan) vol_plasma = m_file.data["vol_plasma"].get_scan(scan) diff --git a/process/physics.py b/process/physics.py index 47100645e2..105203745d 100644 --- a/process/physics.py +++ b/process/physics.py @@ -4498,8 +4498,8 @@ def outplas(self): po.ovarrf( self.outfile, "Synchrotron wall reflectivity factor", - "(ssync)", - physics_variables.ssync, + "(f_sync_reflect)", + physics_variables.f_sync_reflect, ) po.ovarre( self.outfile, diff --git a/process/physics_functions.py b/process/physics_functions.py index fd67d3f4f8..6d80fdff34 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -623,41 +623,27 @@ def psync_albajar_fidone() -> float: # rpow is the (1-Rsyn) power dependence based on plasma shape # (see Fidone) - de2o = 0.0 - pao = 0.0 - gfun = 0.0 - kfun = 0.0 - dum = 0.0 - psync = 0.0 - pden_plasma_sync_mw = 0.0 - de2o = 1.0e-20 * physics_variables.ne0 pao = 6.04e3 * (physics_variables.rminor * de2o) / physics_variables.bt - gfun = 0.93e0 * ( - 1.0e0 - + 0.85e0 * np.exp(-0.82e0 * physics_variables.rmajor / physics_variables.rminor) - ) - kfun = (physics_variables.alphan + 3.87e0 * physics_variables.alphat + 1.46e0) ** ( - -0.79e0 - ) + gfun = 0.93e0 * (1.0e0 + 0.85e0 * np.exp(-0.82e0 * physics_variables.aspect)) kfun = ( - kfun - * (1.98e0 + physics_variables.alphat) ** 1.36e0 - * physics_variables.tbeta**2.14e0 + (physics_variables.alphan + 3.87 * physics_variables.alphat + 1.46) ** -0.79 + * (1.98 + physics_variables.alphat) ** 1.36 + * physics_variables.tbeta**2.14 + * (physics_variables.tbeta**1.53 + 1.87 * physics_variables.alphat - 0.16) + ** -1.33 ) - kfun = kfun * ( - physics_variables.tbeta**1.53e0 + 1.87e0 * physics_variables.alphat - 0.16e0 - ) ** (-1.33e0) + dum = ( 1.0 + 0.12 * (physics_variables.te0 / pao**0.41) - * (1.0 - physics_variables.ssync) ** 0.41 + * (1.0 - physics_variables.f_sync_reflect) ** 0.41 ) ** -1.51 psync = ( 3.84e-8 - * (1.0 - physics_variables.ssync) ** 0.62 + * (1.0 - physics_variables.f_sync_reflect) ** 0.62 * physics_variables.rmajor * physics_variables.rminor**1.38 * physics_variables.kappa**0.79 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 96cb534098..4cedc123dc 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -306,7 +306,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use physics_variables, only: ipedestal, taumax, i_single_null, fvsbrnni, & rhopedt, f_vol_plasma, f_deuterium, ffwal, i_beta_component, itartpf, ilhthresh, & fpdivlim, beta_poloidal_eps_max, isc, kappa95, aspect, f_r_conducting_wall, nesep, c_beta, csawth, dene, & - ftar, plasma_res_factor, ssync, rnbeam, beta, neped, hfact, beta_norm_max, & + ftar, plasma_res_factor, f_sync_reflect, rnbeam, beta, neped, hfact, beta_norm_max, & fgwsep, rhopedn, tratio, q0, i_plasma_geometry, i_plasma_shape, fne0, ignite, f_tritium, & i_beta_fast_alpha, tauee_in, alphaj, alphat, i_plasma_current, q, ti, tesep, rli, triang, & itart, ralpne, iprofile, triang95, rad_fraction_sol, betbm0, f_nd_protium_electrons, & @@ -739,8 +739,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('i_single_null') call parse_int_variable('i_single_null', i_single_null, 0, 1, & 'Switch for single/double null plasma') - case ('ssync') - call parse_real_variable('ssync', ssync, 0.0D0, 1.0D0, & + case ('f_sync_reflect') + call parse_real_variable('f_sync_reflect', f_sync_reflect, 0.0D0, 1.0D0, & 'Synchrotron wall reflectivity factor') case ('tbeta') call parse_real_variable('tbeta', tbeta, 0.0D0, 4.0D0, & diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index efd5382f4e..6e6ccdabd4 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -863,7 +863,7 @@ module physics_variables !! - =0 for double null !! - =1 for single null (diverted side down) - real(dp) :: ssync + real(dp) :: f_sync_reflect !! synchrotron wall reflectivity factor real(dp) :: tauee @@ -1145,7 +1145,7 @@ subroutine init_physics_variables a_plasma_surface = 0.0D0 a_plasma_surface_outboard = 0.0D0 i_single_null = 1 - ssync = 0.6D0 + f_sync_reflect = 0.6D0 tauee = 0.0D0 tauee_in = 0.0D0 taueff = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index c579418fcb..3422ee619c 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -427,7 +427,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP @@ -1618,7 +1618,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 8afc974946..25f3323668 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -428,7 +428,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP @@ -1619,7 +1619,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 4cfca80c49..260028add0 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -428,7 +428,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP @@ -1619,7 +1619,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 95ba001de5..6372857115 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -428,7 +428,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5195E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1650E+01 OP @@ -1619,7 +1619,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index fe14ce4fbc..53d7874948 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -429,7 +429,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index e1e401dcf5..e4a2ac28c9 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -424,7 +424,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4604E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4402E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5820E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1277E+01 OP @@ -1620,7 +1620,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index a9bd6d5582..d1a875f0ec 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -348,7 +348,7 @@ q0 = 1.0 * safety factor on axis ralpne = 0.060238763988650204 * thermal alpha density/electron density (`iteration variable 109`) rmajor = 8.0 * plasma major radius (m) (`iteration variable 3`) i_single_null = 1 * switch for single null / double null plasma; -ssync = 0.6 * synchrotron wall reflectivity factor +f_sync_reflect = 0.6 * synchrotron wall reflectivity factor te = 12.221383528378944 * volume averaged electron temperature (keV) (`iteration variable 4`) triang = 0.5 * plasma separatrix triangularity (calculated if `i_plasma_geometry = 1; 3-5 or 7`) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 278219d5d3..cdde1ed273 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -285,7 +285,7 @@ q = 3.247 * Safety factor 'near' plasma edge (iteration variable 18); q0 = 1.0 * Safety factor on axis rmajor = 9.072 * Plasma major radius (m) (iteration variable 3) i_single_null = 1 * Switch for single null / double null plasma; -ssync = 0.6 * Synchrotron wall reflectivity factor +f_sync_reflect = 0.6 * Synchrotron wall reflectivity factor te = 13.07 * Volume averaged electron temperature (kev) *zfear = 1 * High-z impurity switch; 0=iron; 1=argon plasma_res_factor = 0.66 * plasma resistivity pre-factor diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 6223135eaa..580900be4d 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -429,7 +429,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.2134E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4406E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3016E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.7889E+01 OP @@ -1592,7 +1592,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.2817E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4610E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2401E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8240E+01 OP @@ -2755,7 +2755,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3698E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4907E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.1799E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8985E+01 OP @@ -3918,7 +3918,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3791E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4829E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2108E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8956E+01 OP @@ -5081,7 +5081,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3428E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4695E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2740E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8995E+01 OP @@ -6244,7 +6244,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.2726E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4496E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3375E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8676E+01 OP @@ -7407,7 +7407,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.2912E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4457E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3724E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8858E+01 OP @@ -8570,7 +8570,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3416E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4639E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3060E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.9000E+01 OP @@ -9733,7 +9733,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3472E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4703E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2401E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.8564E+01 OP @@ -10896,7 +10896,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4023E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4743E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2737E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 8.9158E+01 OP @@ -12059,7 +12059,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4277E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4773E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3421E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.0058E+01 OP @@ -13222,7 +13222,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.3854E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4622E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.4105E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.0074E+01 OP @@ -14385,7 +14385,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4318E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4642E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.4480E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.0607E+01 OP @@ -15548,7 +15548,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5116E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4871E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3795E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1011E+01 OP @@ -16711,7 +16711,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.5941E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.5107E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3131E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1467E+01 OP @@ -17905,7 +17905,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 2a3cf69629..7a4bcb39a3 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -283,7 +283,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -1278,7 +1278,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -2273,7 +2273,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -3268,7 +3268,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -4263,7 +4263,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -5258,7 +5258,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -6253,7 +6253,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -7248,7 +7248,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -8243,7 +8243,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.0456E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Total_core_radiation_power_(MW)_________________________________________ (pcoreradmw)__________________ 1.0500E+02 OP @@ -9264,7 +9264,7 @@ q = 3.247 * Safety factor 'near' plasma edge (iteration variable 18); q0 = 1.0 * Safety factor on axis rmajor = 9.072 * Plasma major radius (m) (iteration variable 3) i_single_null = 1 * Switch for single null / double null plasma; -ssync = 0.6 * Synchrotron wall reflectivity factor +f_sync_reflect = 0.6 * Synchrotron wall reflectivity factor te = 13.07 * Volume averaged electron temperature (kev) *zfear = 1 * High-z impurity switch; 0=iron; 1=argon plasma_res_factor = 0.66 * plasma resistivity pre-factor diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index a8b2bf30e5..79132d1482 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -285,7 +285,7 @@ q = 3.247 * Safety factor 'near' plasma edge (iteration variable 18); q0 = 1.0 * Safety factor on axis rmajor = 9.072 * Plasma major radius (m) (iteration variable 3) i_single_null = 1 * Switch for single null / double null plasma; -ssync = 0.6 * Synchrotron wall reflectivity factor +f_sync_reflect = 0.6 * Synchrotron wall reflectivity factor te = 13.07 * Volume averaged electron temperature (kev) *zfear = 1 * High-z impurity switch; 0=iron; 1=argon plasma_res_factor = 0.66 * plasma resistivity pre-factor diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index ee0314be51..20c36335fc 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -285,7 +285,7 @@ q = 3.247 * Safety factor 'near' plasma edge (iteration variable 18); q0 = 1.0 * Safety factor on axis rmajor = 9.072 * Plasma major radius (m) (iteration variable 3) i_single_null = 1 * Switch for single null / double null plasma; -ssync = 0.6 * Synchrotron wall reflectivity factor +f_sync_reflect = 0.6 * Synchrotron wall reflectivity factor te = 13.07 * Volume averaged electron temperature (kev) *zfear = 1 * High-z impurity switch; 0=iron; 1=argon plasma_res_factor = 0.66 * plasma resistivity pre-factor diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 351c98ba81..48909a2908 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -5356,7 +5356,7 @@ "sqsumsq_tol": null, "srcktpm": 0.0, "ssq0": 0.0, - "ssync": 0.6, + "f_sync_reflect": 0.6, "stack_thickness": 0.0, "staff_buildings_area": 480000.0, "staff_buildings_h": 5.0, @@ -10665,7 +10665,7 @@ "sqsumsq_tol": "", "srcktpm": "sum of resistive PF coil power (kW)", "ssq0": "", - "ssync": "synchrotron wall reflectivity factor", + "f_sync_reflect": "synchrotron wall reflectivity factor", "stack_thickness": "", "staff_buildings_area": "footprint of staff buildings (m2)", "staff_buildings_h": "staff buildings height (m)", @@ -14327,7 +14327,7 @@ "lb": 0.0, "ub": 10.0 }, - "ssync": { + "f_sync_reflect": { "lb": 0.0, "ub": 1.0 }, @@ -19252,7 +19252,7 @@ "a_plasma_surface", "a_plasma_surface_outboard", "i_single_null", - "ssync", + "f_sync_reflect", "tauee", "tauee_in", "taueff", @@ -20725,7 +20725,7 @@ "sigvvall": "real_variable", "sombdr": "real_variable", "somtdr": "real_variable", - "ssync": "real_variable", + "f_sync_reflect": "real_variable", "staff_buildings_area": "real_variable", "staff_buildings_h": "real_variable", "startupratio": "real_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 384d0115c1..5828946293 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -429,7 +429,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 3d5d56b19b..630609bffe 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -411,7 +411,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 340d176d19..3982a4f2dc 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -348,7 +348,7 @@ q0 = 1.0 * safety factor on axis ralpne = 0.060238763988650204 * thermal alpha density/electron density (`iteration variable 109`) rmajor = 8.0 * plasma major radius (m) (`iteration variable 3`) i_single_null = 1 * switch for single null / double null plasma; -ssync = 0.6 * synchrotron wall reflectivity factor +f_sync_reflect = 0.6 * synchrotron wall reflectivity factor te = 12.221383528378944 * volume averaged electron temperature (keV) (`iteration variable 4`) triang = 0.5 * plasma separatrix triangularity (calculated if `i_plasma_geometry = 1; 3-5 or 7`) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index d89abee322..1b2dc66d8a 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -595,7 +595,7 @@ coreradiationfraction = 0.7 * DESCRIPTION: SoL radiation fraction (default = 0.8) * JUSTIFICATION: Not set, using default -ssync = 0.6 +f_sync_reflect = 0.6 * DESCRIPTION: Plasma synchrotron radiation wall reflectivity factor * JUSTIFICATION: diff --git a/tests/regression/input_files/stellarator.IN.DAT b/tests/regression/input_files/stellarator.IN.DAT index b56227ff64..8d608a65e2 100644 --- a/tests/regression/input_files/stellarator.IN.DAT +++ b/tests/regression/input_files/stellarator.IN.DAT @@ -131,7 +131,7 @@ ipedestal = 0 *Switch for pedestal profiles (0: Parabolic Profiles) iradloss = 1 *Switch for radiation loss term usage in power balance (1: Total power lost is scaling power plus core radiation only) isc = 38 *Switch for energy confinement time scaling law (38: ISS04, 49: ISS04-Gyro-Bohm) kappa = 1.001 *Plasma separatrix elongation -ssync = 0.6 *Synchrotron wall reflectivity factor +f_sync_reflect = 0.6 *Synchrotron wall reflectivity factor te = 6.019 *Volume averaged electron temperature (keV) tratio = 0.95 *Ion temperature / electron temperature *zfear = 0 *High-Z impurity switch (0: Iron) diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index a4d0e3330c..da57a85903 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -429,7 +429,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index cf5e5789c5..cce6e8c1dd 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -424,7 +424,7 @@ Bremsstrahlung_radiation_power_(MW)_____________________________________ (pbrempv*vol)_________________ 6.4604E+01 OP Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4402E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5820E+01 OP - Synchrotron_wall_reflectivity_factor____________________________________ (ssync)_______________________ 6.0000E-01 + Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 Fraction_of_core_radiation_subtracted_from_P_L__________________________ (coreradiationfraction)_______ 6.0000E-01 Radiation_power_from_inner_zone_(MW)____________________________________ (p_plasma_inner_rad_mw)_____________ 9.1277E+01 OP @@ -1620,7 +1620,7 @@ q0 = 1.0 i_single_null = 1 * Synchrotron wall reflectivity factor -ssync = 0.6 +f_sync_reflect = 0.6 * plasma resistivity pre-factor plasma_res_factor = 0.7 From 40718a0e185c7279a20ac4b383b88cfcb869180f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 14 Jan 2025 10:32:57 +0000 Subject: [PATCH 31/48] :truck: Move coulomb logarithm definitions to the appropriate section in the Physics class for better organization --- process/physics.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/process/physics.py b/process/physics.py index 105203745d..05bf36d5f1 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1503,6 +1503,19 @@ def physics(self): # Issue #261 Remove old radiation model (imprad_model=0) self.plasma_composition() + # Define coulomb logarithm + # (collisions: ion-electron, electron-electron) + physics_variables.dlamee = ( + 31.0 + - (np.log(physics_variables.dene) / 2.0) + + np.log(physics_variables.te * 1000.0) + ) + physics_variables.dlamie = ( + 31.3 + - (np.log(physics_variables.dene) / 2.0) + + np.log(physics_variables.te * 1000.0) + ) + # Calculate plasma current ( physics_variables.alphaj, @@ -2817,19 +2830,6 @@ def plasma_composition() -> None: ** 2 ) - # Define coulomb logarithm - # (collisions: ion-electron, electron-electron) - physics_variables.dlamee = ( - 31.0 - - (np.log(physics_variables.dene) / 2.0) - + np.log(physics_variables.te * 1000.0) - ) - physics_variables.dlamie = ( - 31.3 - - (np.log(physics_variables.dene) / 2.0) - + np.log(physics_variables.te * 1000.0) - ) - # Fraction of alpha energy to ions and electrons # From Max Fenstermacher # (used with electron and ion power balance equations only) From 1103792d101c55078e86e8d9f7c57d677c26c890 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 14 Jan 2025 11:30:10 +0000 Subject: [PATCH 32/48] :heavy_plus_sign: Add new m_proton_amu variable and multiply it by the proton mass in the density weighted calculation --- process/physics.py | 6 +++--- source/fortran/constants.f90 | 5 +++++ tests/unit/test_physics.py | 18 ------------------ 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/process/physics.py b/process/physics.py index 05bf36d5f1..47be7649f4 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2868,10 +2868,10 @@ def plasma_composition() -> None: # Density weighted mass physics_variables.m_ions_total_amu = ( - physics_variables.m_fuel_amu * physics_variables.deni + (physics_variables.m_fuel_amu * physics_variables.deni) + (constants.m_alpha_amu * physics_variables.nd_alphas) - + physics_variables.nd_protons - + physics_variables.m_beam_amu * physics_variables.nd_beam_ions + + (physics_variables.nd_protons * constants.m_proton_amu) + + (physics_variables.m_beam_amu * physics_variables.nd_beam_ions) ) for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: diff --git a/source/fortran/constants.f90 b/source/fortran/constants.f90 index 324191fdae..95f4ea99c3 100644 --- a/source/fortran/constants.f90 +++ b/source/fortran/constants.f90 @@ -72,6 +72,11 @@ module constants ! https://physics.nist.gov/cgi-bin/cuu/Value?mp|search_for=PROTON+MASS real(dp), parameter :: proton_mass = 1.67262192595D-27 + ! Proton mass [amu] + ! Reference: National Institute of Standards and Technology (NIST) + ! https://physics.nist.gov/cgi-bin/cuu/Value?mpu + real(dp), parameter :: m_proton_amu = 1.0072764665789 + ! Protium atomic mass [amu] ! Reference: National Institute of Standards and Technology (NIST) ! https://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl?ele=1 diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index b3053c37f0..7c88af64e6 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1177,8 +1177,6 @@ class PlasmaCompositionParam(NamedTuple): m_beam_amu: Any = None - dlamie: Any = None - te: Any = None proton_rate_density: Any = None @@ -1245,8 +1243,6 @@ class PlasmaCompositionParam(NamedTuple): expected_m_beam_amu: Any = None - expected_dlamie: Any = None - expected_nd_alphas: Any = None expected_nd_protons: Any = None @@ -1314,7 +1310,6 @@ class PlasmaCompositionParam(NamedTuple): alpha_rate_density_total=0, rnfene=0, m_beam_amu=0, - dlamie=0, te=12, proton_rate_density=0, f_deuterium=0.5, @@ -1363,7 +1358,6 @@ class PlasmaCompositionParam(NamedTuple): expected_zeff=2.0909945616489103, expected_nd_impurities=28875000000000004, expected_m_beam_amu=2.01355414, - expected_dlamie=17.810652035055568, expected_nd_alphas=7.5e18, expected_nd_protons=7500000000000000, expected_first_call=0, @@ -1434,7 +1428,6 @@ class PlasmaCompositionParam(NamedTuple): alpha_rate_density_total=1.973996644759543e17, rnfene=0, m_beam_amu=2.01355414, - dlamie=17.810652035055568, te=12, proton_rate_density=540072280299564.38, f_deuterium=0.5, @@ -1483,7 +1476,6 @@ class PlasmaCompositionParam(NamedTuple): expected_zeff=2.0909945616489103, expected_nd_impurities=28875000000000004, expected_m_beam_amu=2.01355414, - expected_dlamie=17.810652035055568, expected_nd_alphas=7.5e18, expected_nd_protons=20519498414548412, expected_first_call=0, @@ -1595,8 +1587,6 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): physics_variables, "m_beam_amu", plasmacompositionparam.m_beam_amu ) - monkeypatch.setattr(physics_variables, "dlamie", plasmacompositionparam.dlamie) - monkeypatch.setattr(physics_variables, "te", plasmacompositionparam.te) monkeypatch.setattr( @@ -1687,10 +1677,6 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): plasmacompositionparam.expected_f_alpha_ion ) - assert physics_variables.dlamee == pytest.approx( - plasmacompositionparam.expected_dlamee - ) - assert physics_variables.zeff == pytest.approx(plasmacompositionparam.expected_zeff) assert physics_variables.nd_impurities == pytest.approx( @@ -1701,10 +1687,6 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): plasmacompositionparam.expected_m_beam_amu ) - assert physics_variables.dlamie == pytest.approx( - plasmacompositionparam.expected_dlamie - ) - assert physics_variables.nd_alphas == pytest.approx( plasmacompositionparam.expected_nd_alphas ) From dd0e2c03f48d188c72277d88aae091229e2f7d40 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 14 Jan 2025 13:13:40 +0000 Subject: [PATCH 33/48] :bug: Refactor zeffai calculation to use mass-weighted plasma effective charge with constants for improved accuracy --- process/physics.py | 40 +++++++++++++++++++++++++++----------- tests/unit/test_physics.py | 6 +++--- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/process/physics.py b/process/physics.py index 47be7649f4..5b55f26d44 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2886,18 +2886,36 @@ def plasma_composition() -> None: ) # Mass weighted plasma effective charge + # Sum of (Zi^2*n_i) / m_i physics_variables.zeffai = ( - physics_variables.f_deuterium * physics_variables.deni / 2.0 - + physics_variables.f_tritium * physics_variables.deni / 3.0 - + 4.0 * physics_variables.f_helium3 * physics_variables.deni / 3.0 - + physics_variables.nd_alphas - + physics_variables.nd_protons - + (1.0 - current_drive_variables.f_tritium_beam) - * physics_variables.nd_beam_ions - / 2.0 - + current_drive_variables.f_tritium_beam - * physics_variables.nd_beam_ions - / 3.0 + ( + physics_variables.f_deuterium + * physics_variables.deni + / constants.m_deuteron_amu + ) + + ( + physics_variables.f_tritium + * physics_variables.deni + / constants.m_triton_amu + ) + + ( + 4.0 + * physics_variables.f_helium3 + * physics_variables.deni + / constants.m_helion_amu + ) + + (4.0 * physics_variables.nd_alphas / constants.m_alpha_amu) + + (physics_variables.nd_protons / constants.m_proton_amu) + + ( + (1.0 - current_drive_variables.f_tritium_beam) + * physics_variables.nd_beam_ions + / constants.m_deuteron_amu + ) + + ( + current_drive_variables.f_tritium_beam + * physics_variables.nd_beam_ions + / constants.m_triton_amu + ) ) / physics_variables.dene for imp in range(impurity_radiation_module.n_impurities): if impurity_radiation_module.impurity_arr_z[imp] > 2: diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 7c88af64e6..1dcb8cf56b 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1352,7 +1352,7 @@ class PlasmaCompositionParam(NamedTuple): expected_deni=5.8589175702454272e19, expected_m_ions_total_amu=2.7395439636787726, expected_nd_ions_total=6.6125550702454276e19, - expected_zeffai=0.43248858851447464, + expected_zeffai=0.43046641789338563, expected_f_alpha_ion=0.3154069116809366, expected_dlamee=17.510652035055571, expected_zeff=2.0909945616489103, @@ -1415,7 +1415,7 @@ class PlasmaCompositionParam(NamedTuple): m_ions_total_amu=2.7395439636787726, nd_ions_total=6.6125550702454276e19, f_nd_protium_electrons=0, - zeffai=0.43248858851447464, + zeffai=0.43046641789338563, rncne=0, rnone=0, f_alpha_ion=0.3154069116809366, @@ -1470,7 +1470,7 @@ class PlasmaCompositionParam(NamedTuple): expected_deni=5.8576156204039725e19, expected_m_ions_total_amu=2.739245767577763, expected_nd_ions_total=6.6125550702454276e19, - expected_zeffai=0.43258985127992111, + expected_zeffai=0.43056686748101997, expected_f_alpha_ion=0.26903878212105858, expected_dlamee=17.510652035055571, expected_zeff=2.0909945616489103, From 78ed5a144304b9d9dcc87b5f7df55b8068322b3e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 14 Jan 2025 15:30:20 +0000 Subject: [PATCH 34/48] :art: Update plasma_composition() doc section --- .../NBI/nbi_overview.md | 3 + .../physics-models/plasma_composition.md | 327 +++++++----------- 2 files changed, 133 insertions(+), 197 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md index 9ececc967e..1dbc213677 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md @@ -60,6 +60,9 @@ with $E, n_e, T$ expressed in units of keV/u, $\text{cm}^3$ and keV, respectivel !!! info "Info" For the full table of values for $A_{ijk}$ & $B_{ijk}^{(z)}$\ please see the accompanying paper[^1] or `current_drive.py` +!!! warning "Model applicability with different impurities" + Be cautious that the model only incorporates the presence of carbon, oxygen and iron impurities. Using other impurities will mean that the cross-section is not calculated appropriately. + For a plasma having an arbitrary mix of $N$ different types of impurities with densities $n$, and charges $Z_q (q = 1, ..., N)$, the beam stopping cross-section can be represented as the weighted sum of the stopping cross- sections for $N$ reference single-impurity plasmas. In each of these reference plasmas, the electron density and the proton density (including that of deuterium and tritium ions) are the same as in a true plasma. The impurity density, however, is increased in order to satisfy quasi-neutrality. The weighting function is the electron density $n_qZ_q$ associated with the amu impurity (in the true plasma), divided by the sum of these densities. The result is: $$ diff --git a/documentation/proc-pages/physics-models/plasma_composition.md b/documentation/proc-pages/physics-models/plasma_composition.md index 2292bcf534..21eca12ab4 100644 --- a/documentation/proc-pages/physics-models/plasma_composition.md +++ b/documentation/proc-pages/physics-models/plasma_composition.md @@ -3,9 +3,13 @@ Within `PROCESS` we always assume the plasma is quasi-neutral eg: $$ -n_{\text{e}} = \underbrace{n_{\text{i}}}_{\text{Fuel Ions}} + \underbrace{2n_{\text{e}}f_{\alpha}}_{\text{Alpha particles}} + \underbrace{n_{\text{e}}f_{\text{beam}}}_{\text{Neutral beams}} + \underbrace{\sum_j Z_j n_{\text{e}} f_j}_{\text{Impurities}} +n_{\text{e}} = \underbrace{Z_{\text{fuel}}n_{\text{i}}}_{\text{Fuel Ions}} + \underbrace{2n_{\text{e}}f_{\alpha}}_{\text{Alpha particles}} + \underbrace{n_{\text{e}}f_{\text{beam}}}_{\text{Neutral beams}} + \underbrace{\sum_j Z_j n_{\text{e}} f_j}_{\text{Impurities}} $$ +* Only deuterium and tritium can be put into the beams so charge is always 1 + +-------------------- + ## Plasma Composition Calculation | `plasma_composition()` This function sets the fractional makeups and determines the relative density and charges of different plasma species. @@ -15,8 +19,13 @@ All of the plasma composites are normally given as a fraction of the volume aver 1. **Alpha Ash Portion Calculation** - Calculate the number density of alpha particles (`nd_alphas`) using the electron density (`dene`) and the alpha particle to electron ratio (`ralpne`). + - `ralpne` can be set as an iteration variable (`ixc = 109`) or set directly. + + $$ + n_{\alpha} = \mathtt{ralpne}\times n_{\text{e}} + $$ + - `ralpne` can be set as an iteration variable (ixc = 109) or set directly. 2. **Protons Calculation** - The calculation of proton density (`nd_protons`) depends on whether the alpha rate density has been calculated. This should only happen in the first function call as the rates are calculated later on in the code. @@ -38,235 +47,142 @@ All of the plasma composites are normally given as a fraction of the volume aver - Otherwise, use the calculated proton rate density. 3. **Beam Hot Ion Component** - ```python - if physics_variables.ignite == 0: - physics_variables.nd_beam_ions = ( - physics_variables.dene * physics_variables.rnbeam - ) - else: - physics_variables.nd_beam_ions = 0.0 - ``` - - Calculate the number density of beam ions (`nd_beam_ions`). If the plasma is ignited, set it to zero. -4. **Sum of Zi.ni for All Impurity Ions** - ```python - znimp = 0.0 - for imp in range(impurity_radiation_module.n_impurities): - if impurity_radiation_module.impurity_arr_z[imp] > 2: - znimp += impurity_radiation.zav_of_te( - imp, np.array([physics_variables.te]) - ).squeeze() * ( - impurity_radiation_module.impurity_arr_frac[imp] - * physics_variables.dene - ) - ``` - - Sum the product of charge number (`Zi`) and number density (`ni`) for all impurity ions with charge greater than helium. + - Calculate the number density of beam ions (`nd_beam_ions`), using the electron density (`dene`) and the beam ion to electron ratio (`rnbeam`). If the plasma is ignited, set it to zero. + - `rnbeam` can be set as an iteration variable (`ixc = 7`) or set directly. + + $$ + \mathtt{nd\_beam\_ions} | n_{\text{beam}} = \mathtt{rnbeam} \times n_{\text{e}} + $$ + +4. **Sum of charge number density for all impurity ions** + + - Sum the product of charge number (`Zi`) and number density for all impurity ions with charge greater than helium. + + $$ + \mathtt{znimp} = \sum_j Z_j n_{\text{e}} f_j + $$ 5. **Fuel Portion - Conserve Charge Neutrality** - ```python - znfuel = ( - physics_variables.dene - - 2.0 * physics_variables.nd_alphas - - physics_variables.nd_protons - - physics_variables.nd_beam_ions - - znimp - ) - ``` - Calculate the fuel portion (`znfuel`) by conserving charge neutrality. + $$ + \mathtt{znfuel} | \underbrace{Z_{\text{fuel}}n_{\text{i}}}_{\text{Fuel Ions}} = n_{\text{e}} - \underbrace{2n_{\text{e}}f_{\alpha}}_{\text{Alpha particles}} - \underbrace{n_{\text{e}}f_{\text{beam}}}_{\text{Neutral beams}} - \underbrace{\sum_j Z_j n_{\text{e}} f_j}_{\text{Impurities}} + $$ + 6. **Fuel Ion Density Calculation** - ```python - physics_variables.deni = znfuel / (1.0 + physics_variables.f_helium3) - ``` + + $$ + \mathtt{deni} | n_{\text{i}} = \frac{\mathtt{znfuel}}{1+f_{\text{3He}}} + $$ + - Calculate the fuel ion density (`deni`). 7. **Set Hydrogen and Helium Impurity Fractions** - ```python - impurity_radiation_module.impurity_arr_frac[ - impurity_radiation.element2index("H_") - ] = ( - physics_variables.nd_protons - + (physics_variables.f_deuterium + physics_variables.f_tritium) - * physics_variables.deni - + physics_variables.nd_beam_ions - ) / physics_variables.dene - - impurity_radiation_module.impurity_arr_frac[ - impurity_radiation.element2index("He") - ] = ( - physics_variables.f_helium3 - * physics_variables.deni - / physics_variables.dene - + physics_variables.ralpne - ) - ``` - - Set the impurity fractions for hydrogen and helium. + + - Set the impurity fractions for hydrogen and helium species. + + $$ + \frac{n_{\text{H}}}{n_{\text{e}}} = n_{\text{protons}} + \left(f_{\text{deuterium}}+f_{\text{tritium}}\right)n_{\text{i}}+ n_{\text{beam}} + $$ + + $$ + \frac{n_{\text{He}}}{n_{\text{e}}} = f_{\text{3He}}n_{\text{i}}+\mathtt{ralpne} + $$ 8. **Total Impurity Density Calculation** - ```python - physics_variables.nd_impurities = 0.0 - for imp in range(impurity_radiation_module.n_impurities): - if impurity_radiation_module.impurity_arr_z[imp] > 2: - physics_variables.nd_impurities += ( - impurity_radiation_module.impurity_arr_frac[imp] - * physics_variables.dene - ) - ``` + - Calculate the total impurity density (`nd_impurities`). + $$ + \mathtt{nd\_impurities} | n_{\text{impurities}} = \sum_j n_{\text{e}} f_j + $$ + 9. **Total Ion Density Calculation** - ```python - physics_variables.nd_ions_total = ( - physics_variables.deni - + physics_variables.nd_alphas - + physics_variables.nd_protons - + physics_variables.nd_beam_ions - + physics_variables.nd_impurities - ) - ``` + - Calculate the total ion density (`nd_ions_total`). -10. **Set Obsolescent Impurity Fraction Variables** - ```python - physics_variables.rncne = impurity_radiation_module.impurity_arr_frac[ - impurity_radiation.element2index("C_") - ] - physics_variables.rnone = impurity_radiation_module.impurity_arr_frac[ - impurity_radiation.element2index("O_") - ] - physics_variables.rnfene = ( - impurity_radiation_module.impurity_arr_frac[ - impurity_radiation.element2index("Fe") - ] - + impurity_radiation_module.impurity_arr_frac[ - impurity_radiation.element2index("Ar") - ] - ) - ``` - - Set some obsolescent impurity fraction variables for other routines. + $$ + \mathtt{nd\_ions\_total} | n_{\text{i,total}} = n_{\text{i}} + n_{\alpha}+n_{\text{protons}}+ n_{\text{beam}}+n_{\text{impurities}} + $$ + +10. **Set Impurity Fraction Variables** + + - Set global impurity fraction variables for other routines. + + $$ + \mathtt{rncne} = \frac{n_{\text{C}}}{n_{\text{e}}}, \quad \mathtt{rnone} = \frac{n_{\text{O}}}{n_{\text{e}}} \quad \mathtt{rnfene} = \frac{n_{\text{Fe}}+ n_{\text{Ar}}}{n_{\text{e}}} + $$ + + The variable above are set as global physics variables to be used in the [`sigbeam()`](../eng-models/heating_and_current_drive/NBI/nbi_overview.md#beam-stopping-cross-section--sigbeam) routine, which calculates the beam stopping cross-section. 11. **Effective Charge Calculation** - ```python - physics_variables.zeff = 0.0 - for imp in range(impurity_radiation_module.n_impurities): - physics_variables.zeff += ( - impurity_radiation_module.impurity_arr_frac[imp] - * impurity_radiation.zav_of_te( - imp, np.array([physics_variables.te]) - ).squeeze() - ** 2 - ) - ``` - - Calculate the effective charge (`zeff`). -12. **Define Coulomb Logarithm** - ```python - physics_variables.dlamee = ( - 31.0 - - (np.log(physics_variables.dene) / 2.0) - + np.log(physics_variables.te * 1000.0) - ) - physics_variables.dlamie = ( - 31.3 - - (np.log(physics_variables.dene) / 2.0) - + np.log(physics_variables.te * 1000.0) - ) - ``` - - Define the Coulomb logarithm for ion-electron and electron-electron collisions. + - Calculate the effective charge (`zeff`), which is given by: -13. **Fraction of Alpha Energy to Ions and Electrons** - ```python - if physics_module.first_call == 1: - pc = ( - (1.0 + physics_variables.alphan) - * (1.0 + physics_variables.alphat) - / (1.0 + physics_variables.alphan + physics_variables.alphat) - ) - physics_module.first_call = 0 - else: - pc = physics_variables.pcoef + $$ + Z_{\text{eff}} = \frac{\sum_j Z^2_j n_{\text{i}}}{\sum_j Z_j n_{\text{i}}} + $$ + + As we assume the plasma is quai-neutral then: + + $$ + \sum_j Z_j n_{\text{i}} = n_{\text{e}} + $$ + + Thus we can write: + + $$ + \mathtt{zeff} | Z_{\text{eff}} = \frac{\sum_j Z^2_j n_{\text{e}} f_j}{n_{\text{e}}} + $$ + + More info can be found [here](https://wiki.fusion.ciemat.es/wiki/Effective_charge_state). + + +12. **Fraction of Alpha Energy to Ions and Electrons** - physics_variables.f_alpha_electron = 0.88155 * np.exp( - -physics_variables.te * pc / 67.4036 - ) - physics_variables.f_alpha_ion = 1.0 - physics_variables.f_alpha_electron - ``` - Calculate the fraction of alpha energy going to electrons and ions. -14. **Average Atomic Masses of Injected Fuel Species** - ```python - physics_variables.m_fuel_amu = ( - (constants.m_deuteron_amu * physics_variables.f_deuterium) - + (constants.m_triton_amu * physics_variables.f_tritium) - + (constants.m_helion_amu * physics_variables.f_helium3) - ) - ``` + $$ + \mathtt{f\_alpha\_electron} = 0.88155\exp{\left[-\langle T_{\text{e}} \rangle \frac{(1+\alpha_n)(1+\alpha_T)}{67.4036(1+\alpha_T+\alpha_n)}\right]} + $$ + + $$ + \mathtt{f\_alpha\_ion} = (1.0 - \mathtt{f\_alpha\_electron}) + $$ + +13. **Average Atomic Masses of Injected Fuel Species** + - Calculate the average atomic masses of injected fuel species. -15. **Average Atomic Masses of Injected Fuel Species in Neutral Beams** - ```python - physics_variables.m_beam_amu = ( - constants.m_deuteron_amu * (1.0 - current_drive_variables.f_tritium_beam) - ) + (constants.m_triton_amu * current_drive_variables.f_tritium_beam) - ``` - - Calculate the average atomic masses of injected fuel species in the neutral beams. + $$ + \mathtt{m\_fuel\_amu} | m_{\text{fuel,amu}} = \left(m_{\text{D}}f_{\text{D}}\right) + \left(m_{\text{T}}f_{\text{T}}\right) + \left(m_{\text{3He}}f_{\text{3He}}\right) + $$ -16. **Density Weighted Mass Calculation** - ```python - physics_variables.m_ions_total_amu = ( - physics_variables.m_fuel_amu * physics_variables.deni - + (constants.m_alpha_amu * physics_variables.nd_alphas) - + physics_variables.nd_protons - + physics_variables.m_beam_amu * physics_variables.nd_beam_ions - ) - for imp in range(impurity_radiation_module.n_impurities): - if impurity_radiation_module.impurity_arr_z[imp] > 2: - physics_variables.m_ions_total_amu += ( - physics_variables.dene - * impurity_radiation_module.impurity_arr_frac[imp] - * impurity_radiation_module.impurity_arr_amass[imp] - ) - - physics_variables.m_ions_total_amu = ( - physics_variables.m_ions_total_amu / physics_variables.nd_ions_total - ) - ``` - - Calculate the density-weighted mass of ions. +14. **Average Atomic Masses of Injected Fuel Species in Neutral Beams** -17. **Mass Weighted Plasma Effective Charge** - ```python - physics_variables.zeffai = ( - physics_variables.f_deuterium * physics_variables.deni / 2.0 - + physics_variables.f_tritium * physics_variables.deni / 3.0 - + 4.0 * physics_variables.f_helium3 * physics_variables.deni / 3.0 - + physics_variables.nd_alphas - + physics_variables.nd_protons - + (1.0 - current_drive_variables.f_tritium_beam) - * physics_variables.nd_beam_ions - / 2.0 - + current_drive_variables.f_tritium_beam - * physics_variables.nd_beam_ions - / 3.0 - ) / physics_variables.dene - for imp in range(impurity_radiation_module.n_impurities): - if impurity_radiation_module.impurity_arr_z[imp] > 2: - physics_variables.zeffai += ( - impurity_radiation_module.impurity_arr_frac[imp] - * impurity_radiation.zav_of_te( - imp, np.array([physics_variables.te]) - ).squeeze() - ** 2 - / impurity_radiation_module.impurity_arr_amass[imp] - ) - ``` - - Calculate the mass-weighted plasma effective charge (`zeffai`). + - Calculate the average atomic masses of injected fuel species in the neutral beams. + $$ + \mathtt{m\_beam\_amu} | m_{\text{beam,amu}} = \left(m_{\text{D}}(1-f_{\text{T,beam}}\right)) + \left(m_{\text{T}}f_{\text{T,beam}}\right) + $$ +15. **Density Weighted Mass Calculation** + - Calculate the density-weighted mass of ions. + $$ + \mathtt{m\_ions\_total\_amu} = \\ + \left[\frac{\left(m_{\text{fuel}}n_{\text{i}}\right) + \left(m_{\alpha}n_{\alpha}\right) + \left(m_{\text{p}}n_{p}\right) + \left(m_{\text{beam}}n_{\text{beam}}\right) + \sum_j m_{j} n_{\text{e}} f_j}{n_{\text{i,total}}}\right] + $$ +16. **Mass Weighted Plasma Effective Charge** + - Calculate the mass-weighted plasma effective charge (`zeffai`). Similar to the calculation of the effective charge except each element is divided by its mass + $$ + \mathtt{zeffai} | Z_{\text{eff,m}} = \frac{\sum_j \frac{Z^2_j n_{\text{e}} f_j}{m_{\text{j}}}}{n_{\text{e}}} + $$ --------------- @@ -304,4 +220,21 @@ The impurity fraction of any one of the elements listed in array `fimp` (other t 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. + +------------------ + +## Key Constraints + + +### Reinke criterion, divertor impurity fraction lower limit + +This constraint can be activated by stating `icc = 78` in the input file. + + + +The scaling value `freinke` can be varied also. + + + + [^1]: H. Lux, R. Kemp, D.J. Ward, M. Sertoli, Impurity radiation in DEMO systems modelling, Fusion Engineering and Design, Volume 101, 2015, Pages 42-51, ISSN 0920-3796, https://doi.org/10.1016/j.fusengdes.2015.10.002. From abcbaa381e650d919c0c48dd6ae521d897b1ec44 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 21 Jan 2025 15:21:55 +0000 Subject: [PATCH 35/48] :art: Enhance plasma radiation documentation with detailed loss functions and references --- .../physics-models/plasma_radiation.md | 54 ++++++++++++------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_radiation.md b/documentation/proc-pages/physics-models/plasma_radiation.md index 7fec8487f6..6491060792 100644 --- a/documentation/proc-pages/physics-models/plasma_radiation.md +++ b/documentation/proc-pages/physics-models/plasma_radiation.md @@ -1,5 +1,30 @@ # Plasma Radiation +The radiation per unit volume is determined using loss functions computed by the `ADAS405` code [^1]. +The effective collisional–radiative coefficients necessary to determine the ionization state and radiative losses of each ionic species, +assuming equilibrium ionization balance in an optically thin plasma, were sourced from `ADF11`-derived data files [^2]. +These coefficients utilize the generalized collisional-radiative approach [^3] for elements such as H, He, Be, C, N, O, Ne, and Si. + +For Ni, the data is based on [^4], for Fe it is derived from [^5]; and for W, the data is obtained from [^6]. +The Ni and Fe rates incorporate a density dependence as described in [^7]. For Kr and Xe, data is taken from the ADAS baseline. + +The computed loss functions exhibit a weak dependence on density but are evaluated at a fixed electron density of $10^{19} \text{m}^{-3}$. +This differs from strict coronal equilibrium, which assumes density independence. +In practice, non-local effects arising from density and temperature gradients are significant but are not considered here. +The loss functions account for Bremsstrahlung, line radiation, and recombination radiation, represented by: + +$$ +P_i = n_i n_e L_Z (Z_i, T) +$$ + +where \(P_i\) is the radiation per unit volume (excluding synchrotron radiation), +\(L_Z (Z_i, T)\) is the loss function for ion species \(i\) at temperature \(T\), and \(n_i\) is the density of ion species \(i\). + +The radiation emission is numerically integrated over the plasma profile, +using the corresponding temperature and density distributions. Emission is only considered from within the separatrix, +as the PROCESS model does not account for the scrape-off layer. +The plasma inside the separatrix is divided into two regions: the “core” and the “edge,” separated by a normalized minor radius defined by the user. +Radiation is calculated separately for the core and edge regions, except for synchrotron radiation, which is assumed to originate solely from the core. ## Impurity Radiation Class | `ImpurityRadiation` @@ -12,28 +37,18 @@ Initialize the FusionReactionRate class with the given plasma profile. #### Attributes: - `plasma_profile` (`PlasmaProfile`): Plasma profile instance. - - `rho` (`numpy.ndarray`): Density profile along the x-axis. - - `rhodx` (`numpy.ndarray`): Density profile step size along the x-axis. - - `imp` (`numpy.ndarray`): Indices of impurities with a fraction greater than 1.0e-30. - - `pimp_profile` (`numpy.ndarray`): Impurity profile array initialized to zeros. - - `radtot_profile` (`numpy.ndarray`): Total radiation profile array initialized to zeros. - - `radcore_profile` (`numpy.ndarray`): Core radiation profile array initialized to zeros. - - `radtot` (`float`): Total radiation initialized to 0.0. - - `radcore` (`float`): Core radiation initialized to 0.0. - ## Synchrotron radiation | `psync_albajar_fidone()` -The synchrotron radiation power[^1] [^2] is assumed to originate from the -plasma core. +The synchrotron radiation power[^8][^9] is assumed to originate from the plasma core. $$ \begin{aligned} @@ -58,8 +73,6 @@ $$ p_{a_0} = 6.04 \times 10^3 \frac{a n_{e_0(20)}}{B_T} $$ - - -------------------- By changing the input parameter `coreradius`, the user may set the normalised @@ -69,7 +82,6 @@ radiation power contributions. The wall reflection factor `f_sync_reflect` may be set by the user. - ![Schematic diagram of radiation power contributions](../images/radiation.png "Schematic diagram of radiation power contributions") *Figure 1: Schematic diagram of the radiation power contributions and how they are split between core and edge radiation* @@ -104,8 +116,12 @@ The limiting value of $q_{\text{fw,rad}}$ in $\mathrm {MWm^{-2}}$ is be set usin The scaling value `fradwall` can be varied also. - -[^1]: F. Albajar, J. Johner, and G. Granata, “Improved calculation of synchrotron radiation losses in realistic tokamak plasmas,” Nuclear Fusion, vol. 41, no. 6, pp. 665–678, Jun. 2001, doi: https://doi.org/10.1088/0029-5515/41/6/301. -‌ -[^2]: I. Fidone, G Giruzzi, and G. Granata, “Synchrotron radiation loss in tokamaks of arbitrary geometry,” Nuclear Fusion, vol. 41, no. 12, pp. 1755–1758, Dec. 2001, doi: https://doi.org/10.1088/0029-5515/41/12/102. -‌ \ No newline at end of file +[^1]: “ADAS: Docmentation,” Adas.ac.uk, 2024. https://www.adas.ac.uk/manual.php +[^2]: “OPEN-ADAS,” Adas.ac.uk, 2025. https://open.adas.ac.uk/adf11 (accessed Jan. 15, 2025). +[^3]: H. P. Summers et al., “Ionization state, excited populations and emission of impurities in dynamic finite density plasmas: I. The generalized collisional–radiative model for light elements,” Plasma Physics and Controlled Fusion, vol. 48, no. 2, pp. 263–293, Jan. 2006, doi: https://doi.org/10.1088/0741-3335/48/2/007. +[^4]: M. Arnaud and R. Rothenflug, “An updated evaluation of recombination and ionization rates,” Astronomy & Astrophysics Supplement Series, vol. 60, no. 3, pp. 425–457, Jun. 1985. +[^5]: M. Arnaud, R. Rothenflug, An updated evaluation of recombination and ionization rates, Astron. & Astrophys. Supp. Ser. 60 (1985) 425–457. +[^6]: T. Pütterich, R. Neu, R. Dux, A. D. Whiteford, and M. G. O’Mullane, “Modelling of measured tungsten spectra from ASDEX Upgrade and predictions for ITER,” Plasma Physics and Controlled Fusion, vol. 50, no. 8, p. 085016, Jun. 2008, doi: https://doi.org/10.1088/0741-3335/50/8/085016. +[^7]: Summers, H. P. (1974). Tables and Graphs of Collisional Dielectronic Recombination and Ionisation Coefficients and Ionisation Equilibria of H-like to A-like Ions of Elements. Appleton Laboratory. +[^8]: F. Albajar, J. Johner, and G. Granata, “Improved calculation of synchrotron radiation losses in realistic tokamak plasmas,"Nuclear Fusion, vol. 41, no. 6, pp. 665–678, Jun. 2001, doi: https://doi.org/10.1088/0029-5515/41/6/301. +[^9]: I. Fidone, G Giruzzi, and G. Granata, “Synchrotron radiation loss in tokamaks of arbitrary geometry,” Nuclear Fusion, vol. 41, no. 12, pp. 1755–1758, Dec. 2001, doi: https://doi.org/10.1088/0029-5515/41/12/102. From 84afb440aa14b538366d412a368daa21a21881aa Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 14:54:24 +0000 Subject: [PATCH 36/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ralpne'=20to=20'?= =?UTF-8?q?f=5Fnd=5Falpha=5Felectron'=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20data=20files=20and=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/physics-models/error.txt | 2 +- .../physics-models/plasma_composition.md | 10 +-- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +- examples/data/large_tokamak_1_MFILE.DAT | 4 +- examples/data/large_tokamak_2_MFILE.DAT | 4 +- examples/data/large_tokamak_3_MFILE.DAT | 4 +- examples/data/large_tokamak_4_MFILE.DAT | 4 +- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 22 ++--- examples/data/scan_example_file_IN.DAT | 2 +- examples/plot_solutions.ipynb | 80 +++++++++---------- process/current_drive.py | 4 +- process/impurity_radiation.py | 1 - process/init.py | 2 +- process/io/mfile_comparison.py | 6 +- process/io/variable_metadata.py | 2 +- process/physics.py | 36 +++++---- source/fortran/input.f90 | 6 +- source/fortran/iteration_variables.f90 | 12 +-- source/fortran/numerics.f90 | 2 +- source/fortran/physics_variables.f90 | 4 +- source/fortran/scan.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- .../data/large_tokamak_once_through.IN.DAT | 4 +- tests/integration/data/ref_IN.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 32 ++++---- tests/integration/data/scan_MFILE.DAT | 22 ++--- .../data/uncertainties_nonopt_ref_IN.DAT | 4 +- .../integration/data/uncertainties_ref_IN.DAT | 4 +- tests/integration/ref_dicts.json | 24 +++--- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 4 +- .../input_files/st_regression.IN.DAT | 2 +- .../regression/input_files/stellarator.IN.DAT | 4 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- tests/unit/test_physics.py | 12 ++- tracking/tracking_data.py | 2 +- 44 files changed, 188 insertions(+), 179 deletions(-) diff --git a/documentation/proc-pages/physics-models/error.txt b/documentation/proc-pages/physics-models/error.txt index d76d45bab6..acdb329249 100644 --- a/documentation/proc-pages/physics-models/error.txt +++ b/documentation/proc-pages/physics-models/error.txt @@ -500,7 +500,7 @@ As stated above, the number density fractions for hydrogen (all isotopes) and helium need not be set, as they are calculated by the code to ensure that plasma quasi-neutrality is maintained, and taking into account the fuel ratios \texttt{f_deuterium}, \texttt{f_tritium} and -\texttt{f_helium3}, and the alpha particle fraction \texttt{ralpne} which may +\texttt{f_helium3}, and the alpha particle fraction \texttt{f_nd_alpha_electron} which may be input by the user. The impurity fraction of one of the elements listed in array diff --git a/documentation/proc-pages/physics-models/plasma_composition.md b/documentation/proc-pages/physics-models/plasma_composition.md index 21eca12ab4..ed8260a86f 100644 --- a/documentation/proc-pages/physics-models/plasma_composition.md +++ b/documentation/proc-pages/physics-models/plasma_composition.md @@ -18,11 +18,11 @@ All of the plasma composites are normally given as a fraction of the volume aver 1. **Alpha Ash Portion Calculation** - - Calculate the number density of alpha particles (`nd_alphas`) using the electron density (`dene`) and the alpha particle to electron ratio (`ralpne`). - - `ralpne` can be set as an iteration variable (`ixc = 109`) or set directly. + - Calculate the number density of alpha particles (`nd_alphas`) using the electron density (`dene`) and the alpha particle to electron ratio (`f_nd_alpha_electron`). + - `f_nd_alpha_electron` can be set as an iteration variable (`ixc = 109`) or set directly. $$ - n_{\alpha} = \mathtt{ralpne}\times n_{\text{e}} + n_{\alpha} = \mathtt{f_nd_alpha_electron}\times n_{\text{e}} $$ @@ -87,7 +87,7 @@ All of the plasma composites are normally given as a fraction of the volume aver $$ $$ - \frac{n_{\text{He}}}{n_{\text{e}}} = f_{\text{3He}}n_{\text{i}}+\mathtt{ralpne} + \frac{n_{\text{He}}}{n_{\text{e}}} = f_{\text{3He}}n_{\text{i}}+\mathtt{f_nd_alpha_electron} $$ 8. **Total Impurity Density Calculation** @@ -213,7 +213,7 @@ using input array `fimp(1,...,14)`. The available species are as follows: As stated above, the number density fractions for hydrogen (all isotopes) and helium need not be set, as they are calculated by the code to ensure plasma quasi-neutrality taking into account the fuel ratios -`f_deuterium`, `f_tritium` and `f_helium3`, and the alpha particle fraction `ralpne` which may +`f_deuterium`, `f_tritium` and `f_helium3`, and the alpha particle fraction `f_nd_alpha_electron` which may 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 diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 95c385e81a..2f2c1309fc 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -377,7 +377,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4748E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4748E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.2363E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.2363E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0759E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.2363E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1461,7 +1461,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index e3a29075b1..f57188b70f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -378,7 +378,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.3954E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0392E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.3954E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1455,7 +1455,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index bba61bcb93..ae4038a774 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -378,7 +378,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.3954E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0392E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.3954E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1455,7 +1455,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index f58c300b06..303eea8253 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -378,7 +378,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.3954E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0392E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.3954E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1455,7 +1455,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index caaecdb32c..9671f8ae36 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -378,7 +378,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.3954E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0392E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.3954E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1455,7 +1455,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 53d7874948..838e0942b0 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -265,7 +265,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index ecb06cf833..a79a653be5 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -233,7 +233,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -1228,7 +1228,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -2223,7 +2223,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -3218,7 +3218,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -4213,7 +4213,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -5208,7 +5208,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -6203,7 +6203,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -7198,7 +7198,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -8193,7 +8193,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -9068,7 +9068,7 @@ ixc = 54 * ftmargtf ixc = 106 * ftmargoh ixc = 122 * oh_steel_frac ixc = 123 * foh_stress -ixc = 109 * ralpne +ixc = 109 * f_nd_alpha_electron ixc = 110 * ftaulimit isweep = 9 @@ -9352,5 +9352,5 @@ t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) ftmargoh = 1.0000E+00 oh_steel_frac = 5.7875E-01 foh_stress = 1.0000E+00 - ralpne = 6.8940E-02 + f_nd_alpha_electron = 6.8940E-02 ftaulimit = 1.0000E+00 \ No newline at end of file diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index df1e5e61e4..483bdf6301 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -265,7 +265,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/examples/plot_solutions.ipynb b/examples/plot_solutions.ipynb index 2be40c1f24..11ef22c5ae 100644 --- a/examples/plot_solutions.ipynb +++ b/examples/plot_solutions.ipynb @@ -107,7 +107,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -129,7 +129,7 @@ "0 dene 1.0756 fwalld 0.50758 ffuspow ... \n", "\n", " itvar041_name xcm041 itvar042_name xcm042 itvar043_name xcm043 \\\n", - "0 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", + "0 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", "\n", " itvar044_name xcm044 itvar045_name xcm045 \n", "0 fimp(13) 1.5039 dr_tf_wp 1.0083 \n", @@ -241,7 +241,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -265,7 +265,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -289,8 +289,8 @@ "1 dene 1.0756 fwalld 0.51758 ffuspow ... \n", "\n", " itvar041_name xcm041 itvar042_name xcm042 itvar043_name xcm043 \\\n", - "0 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", - "1 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", + "0 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", + "1 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", "\n", " itvar044_name xcm044 itvar045_name xcm045 \n", "0 fimp(13) 1.5039 dr_tf_wp 1.0083 \n", @@ -402,7 +402,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -426,7 +426,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -450,8 +450,8 @@ "1 dene 1.0756 fwalld 0.51758 ffuspow ... \n", "\n", " itvar041_name xcm041 itvar042_name xcm042 itvar043_name xcm043 \\\n", - "0 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", - "1 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", + "0 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", + "1 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", "\n", " itvar044_name xcm044 itvar045_name xcm045 \n", "0 fimp(13) 1.5039 dr_tf_wp 1.0083 \n", @@ -559,7 +559,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -583,7 +583,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -607,7 +607,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -633,9 +633,9 @@ "2 dene 1.0756 fwalld 0.50758 ffuspow ... \n", "\n", " itvar041_name xcm041 itvar042_name xcm042 itvar043_name xcm043 \\\n", - "0 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", - "1 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", - "2 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", + "0 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", + "1 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", + "2 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", "\n", " itvar044_name xcm044 itvar045_name xcm045 \n", "0 fimp(13) 1.5039 dr_tf_wp 1.0083 \n", @@ -749,7 +749,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -773,7 +773,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -797,7 +797,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -821,7 +821,7 @@ " ...\n", " cpttf\n", " 1.3815\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.83954\n", " oh_steel_frac\n", " 0.64835\n", @@ -849,10 +849,10 @@ "3 dene 1.0756 fwalld 0.50758 ffuspow ... \n", "\n", " itvar041_name xcm041 itvar042_name xcm042 itvar043_name xcm043 \\\n", - "0 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", - "1 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", - "2 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", - "3 cpttf 1.3815 ralpne 0.83954 oh_steel_frac 0.64835 \n", + "0 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", + "1 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", + "2 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", + "3 cpttf 1.3815 f_nd_alpha_electron 0.83954 oh_steel_frac 0.64835 \n", "\n", " itvar044_name xcm044 itvar045_name xcm045 \n", "0 fimp(13) 1.5039 dr_tf_wp 1.0083 \n", @@ -969,7 +969,7 @@ " ...\n", " cpttf\n", " 0.99182\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.67908\n", " oh_steel_frac\n", " 0.5455\n", @@ -993,7 +993,7 @@ " ...\n", " cpttf\n", " 0.99182\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.67908\n", " oh_steel_frac\n", " 0.5455\n", @@ -1017,7 +1017,7 @@ " ...\n", " cpttf\n", " 0.99182\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.67908\n", " oh_steel_frac\n", " 0.5455\n", @@ -1041,7 +1041,7 @@ " ...\n", " cpttf\n", " 0.99182\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.67908\n", " oh_steel_frac\n", " 0.5455\n", @@ -1069,10 +1069,10 @@ "3 dene 0.071381 fwalld 0.40709 ffuspow ... \n", "\n", " itvar041_name nitvar041 itvar042_name nitvar042 itvar043_name nitvar043 \\\n", - "0 cpttf 0.99182 ralpne 0.67908 oh_steel_frac 0.5455 \n", - "1 cpttf 0.99182 ralpne 0.67908 oh_steel_frac 0.5455 \n", - "2 cpttf 0.99182 ralpne 0.67908 oh_steel_frac 0.5455 \n", - "3 cpttf 0.99182 ralpne 0.67908 oh_steel_frac 0.5455 \n", + "0 cpttf 0.99182 f_nd_alpha_electron 0.67908 oh_steel_frac 0.5455 \n", + "1 cpttf 0.99182 f_nd_alpha_electron 0.67908 oh_steel_frac 0.5455 \n", + "2 cpttf 0.99182 f_nd_alpha_electron 0.67908 oh_steel_frac 0.5455 \n", + "3 cpttf 0.99182 f_nd_alpha_electron 0.67908 oh_steel_frac 0.5455 \n", "\n", " itvar044_name nitvar044 itvar045_name nitvar045 \n", "0 fimp(13) 0.057148 dr_tf_wp 0.0651 \n", @@ -1186,7 +1186,7 @@ " ...\n", " cpttf\n", " 89795.0\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.083954\n", " oh_steel_frac\n", " 0.51868\n", @@ -1210,7 +1210,7 @@ " ...\n", " cpttf\n", " 89795.0\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.083954\n", " oh_steel_frac\n", " 0.51868\n", @@ -1234,7 +1234,7 @@ " ...\n", " cpttf\n", " 88795.0\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.081954\n", " oh_steel_frac\n", " 0.52868\n", @@ -1258,7 +1258,7 @@ " ...\n", " cpttf\n", " 89795.0\n", - " ralpne\n", + " f_nd_alpha_electron\n", " 0.083954\n", " oh_steel_frac\n", " 0.51868\n", @@ -1286,10 +1286,10 @@ "3 dene 8.366700e+19 fwalld 0.55758 ffuspow ... \n", "\n", " itvar041_name itvar041 itvar042_name itvar042 itvar043_name itvar043 \\\n", - "0 cpttf 89795.0 ralpne 0.083954 oh_steel_frac 0.51868 \n", - "1 cpttf 89795.0 ralpne 0.083954 oh_steel_frac 0.51868 \n", - "2 cpttf 88795.0 ralpne 0.081954 oh_steel_frac 0.52868 \n", - "3 cpttf 89795.0 ralpne 0.083954 oh_steel_frac 0.51868 \n", + "0 cpttf 89795.0 f_nd_alpha_electron 0.083954 oh_steel_frac 0.51868 \n", + "1 cpttf 89795.0 f_nd_alpha_electron 0.083954 oh_steel_frac 0.51868 \n", + "2 cpttf 88795.0 f_nd_alpha_electron 0.081954 oh_steel_frac 0.52868 \n", + "3 cpttf 89795.0 f_nd_alpha_electron 0.083954 oh_steel_frac 0.51868 \n", "\n", " itvar044_name itvar044 itvar045_name itvar045 \n", "0 fimp(13) 0.000571 dr_tf_wp 0.50416 \n", diff --git a/process/current_drive.py b/process/current_drive.py index 4ebda40d95..1bba854472 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -1313,7 +1313,7 @@ def iternb(self): current_drive_variables.beam_energy / physics_variables.m_beam_amu, physics_variables.te, physics_variables.dene, - physics_variables.ralpne, + physics_variables.f_nd_alpha_electron, physics_variables.rncne, physics_variables.rnone, physics_variables.rnfene, @@ -1583,7 +1583,7 @@ def culnbi(self): current_drive_variables.beam_energy / physics_variables.m_beam_amu, physics_variables.te, physics_variables.dene, - physics_variables.ralpne, + physics_variables.f_nd_alpha_electron, physics_variables.rncne, physics_variables.rnone, physics_variables.rnfene, diff --git a/process/impurity_radiation.py b/process/impurity_radiation.py index 8da39b5f34..370bbeb284 100644 --- a/process/impurity_radiation.py +++ b/process/impurity_radiation.py @@ -6,7 +6,6 @@ import numpy as np from scipy import integrate -from process.fortran import constants from process.fortran import constants, error_handling, impurity_radiation_module diff --git a/process/init.py b/process/init.py index 6ef434acf4..0c6d98f4e0 100644 --- a/process/init.py +++ b/process/init.py @@ -330,7 +330,7 @@ def check_process(): if fortran.impurity_radiation_module.fimp[1] != 0.1: raise ProcessValidationError( - "The thermal alpha/electron density ratio should be controlled using ralpne (itv 109) and not fimp(2)." + "The thermal alpha/electron density ratio should be controlled using f_nd_alpha_electron (itv 109) and not fimp(2)." "fimp(2) should be removed from the input file, or set to the default value 0.1D0." ) diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index f787ec7035..b907739f36 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -78,7 +78,7 @@ "htpmw", "pnetelmw", "wallmw", - "ralpne", + "f_nd_alpha_electron", "p_plasma_inner_rad_mw", "p_plasma_rad_mw", "pnucblkt", @@ -133,7 +133,7 @@ "taueff", "hfact", "tauelaw", - "ralpne", + "f_nd_alpha_electron", "wallmw", "p_plasma_inner_rad_mw", "pden_plasma_sync_mw*vol_plasma", @@ -227,7 +227,7 @@ "pnetelmw", "wallmw", "pflux_fw_rad_mw", - "ralpne", + "f_nd_alpha_electron", "p_plasma_inner_rad_mw", "p_plasma_rad_mw", "bootstrap_current_fraction", diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 6d02a7624a..bf1c252b8c 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -44,7 +44,7 @@ class VariableMetadata: description="Effective energy confinement time", units="s", ), - "ralpne": VariableMetadata( + "f_nd_alpha_electron": VariableMetadata( latex=r"$f_\mathrm{\alpha}$", description="Alpha particle heating fraction", units="", diff --git a/process/physics.py b/process/physics.py index 5b55f26d44..e59e724918 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2420,14 +2420,6 @@ def physics(self): * physics_variables.pdivt / build_variables.fwarea ) - (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) - * physics_variables.p_plasma_rad_mw - / build_variables.fwarea - + (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) - * physics_variables.rad_fraction_sol - * physics_variables.pdivt - / build_variables.fwarea - ) constraint_variables.pflux_fw_rad_max_mw = ( physics_variables.pflux_fw_rad_mw * constraint_variables.f_fw_rad_max @@ -2707,7 +2699,9 @@ def plasma_composition() -> None: """ # Alpha ash portion - physics_variables.nd_alphas = physics_variables.dene * physics_variables.ralpne + physics_variables.nd_alphas = ( + physics_variables.dene * physics_variables.f_nd_alpha_electron + ) # Protons # This calculation will be wrong on the first call as the particle @@ -2779,7 +2773,7 @@ def plasma_composition() -> None: physics_variables.f_helium3 * physics_variables.deni / physics_variables.dene - + physics_variables.ralpne + + physics_variables.f_nd_alpha_electron ) # Total impurity density @@ -4051,8 +4045,8 @@ def outplas(self): po.ovarre( self.outfile, "Helium ion density (thermalised ions only) / electron density", - "(ralpne)", - physics_variables.ralpne, + "(f_nd_alpha_electron)", + physics_variables.f_nd_alpha_electron, ) po.oblnkl(self.outfile) @@ -7604,17 +7598,29 @@ def pthresh( # Snipes et al (2000) scaling with mass correction # Nominal, upper and lower - snipes_2000 = 1.42 + snipes_2000 = ( + 1.42 * dnla20**0.58 * bt**0.82 * rmajor * rminor**0.81 * (2.0 / m_ions_total_amu) + ) snipes_2000_ub = ( - 1.547 * dnla20**0.615 * bt**0.851 * rmajor**1.089 * rminor**0.876 * (2.0 / m_ions_total_amu) + 1.547 + * dnla20**0.615 + * bt**0.851 + * rmajor**1.089 + * rminor**0.876 + * (2.0 / m_ions_total_amu) ) snipes_2000_lb = ( - 1.293 * dnla20**0.545 * bt**0.789 * rmajor**0.911 * rminor**0.744 * (2.0 / m_ions_total_amu) + 1.293 + * dnla20**0.545 + * bt**0.789 + * rmajor**0.911 + * rminor**0.744 + * (2.0 / m_ions_total_amu) ) # Snipes et al (2000) scaling (closed divertor) with mass correction diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 4cedc123dc..84a70e6fa9 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -309,7 +309,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) ftar, plasma_res_factor, f_sync_reflect, rnbeam, beta, neped, hfact, beta_norm_max, & fgwsep, rhopedn, tratio, q0, i_plasma_geometry, i_plasma_shape, fne0, ignite, f_tritium, & i_beta_fast_alpha, tauee_in, alphaj, alphat, i_plasma_current, q, ti, tesep, rli, triang, & - itart, ralpne, iprofile, triang95, rad_fraction_sol, betbm0, f_nd_protium_electrons, & + itart, f_nd_alpha_electron, iprofile, triang95, rad_fraction_sol, betbm0, f_nd_protium_electrons, & teped, f_helium3, iwalld, gamma, f_alpha_plasma, fgwped, tbeta, i_bootstrap_current, & iradloss, te, alphan, rmajor, plasma_square, kappa, iinvqd, fkzohm, beamfus0, & tauratio, i_density_limit, bt, i_plasma_wall_gap, ipnlaws, beta_max, beta_min, & @@ -714,8 +714,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('rad_fraction_sol') call parse_real_variable('rad_fraction_sol', rad_fraction_sol, 0.0D0, 1.0D0, & 'SoL radiation fraction') - case ('ralpne') - call parse_real_variable('ralpne', ralpne, 1.0D-12, 1.0D0, & + case ('f_nd_alpha_electron') + call parse_real_variable('f_nd_alpha_electron', f_nd_alpha_electron, 1.0D-12, 1.0D0, & 'Thermal alpha density / electron density') case ('f_nd_protium_electrons') call parse_real_variable('f_nd_protium_electrons', f_nd_protium_electrons, 0.0D0, 1.0D0, & diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index 21b96ed632..99d208640f 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -2363,25 +2363,25 @@ end subroutine set_itv_108 !--------------------------------- subroutine init_itv_109 - !!
  • (109) ralpne: thermal alpha density / electron density + !!
  • (109) f_nd_alpha_electron: thermal alpha density / electron density use numerics, only: lablxc, boundl, boundu implicit none - lablxc(109) = 'ralpne ' + lablxc(109) = 'f_nd_alpha_electron ' boundl(109) = 0.050D0 boundu(109) = 0.150D0 end subroutine init_itv_109 real(kind(1.d0)) function itv_109() - use physics_variables, only: ralpne + use physics_variables, only: f_nd_alpha_electron implicit none - itv_109 = ralpne + itv_109 = f_nd_alpha_electron end function itv_109 subroutine set_itv_109(ratio) - use physics_variables, only: ralpne + use physics_variables, only: f_nd_alpha_electron implicit none real(kind(1.d0)) :: ratio - ralpne = ratio + f_nd_alpha_electron = ratio end subroutine set_itv_109 !--------------------------------- diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 0724b5ceef..aa9c56dfe5 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -310,7 +310,7 @@ module numerics !!
  • (106) ftmargoh (f-value for equation 60) !!
  • (107) favail (f-value for equation 61) !!
  • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4) - !!
  • (109) ralpne: thermal alpha density / electron density + !!
  • (109) f_nd_alpha_electron: thermal alpha density / electron density !!
  • (110) ftaulimit: Lower limit on taup/taueff the ratio of alpha !!
  • (111) fniterpump: f-value for constraint that number !!
  • (112) fzeffmax: f-value for max Zeff (f-value for equation 64) diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 6e6ccdabd4..508c3a6991 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -809,7 +809,7 @@ module physics_variables real(dp) :: rad_fraction_total !! Radiation fraction total = SoL + LCFS radiation / total power deposited in plasma - real(dp) :: ralpne + real(dp) :: f_nd_alpha_electron !! thermal alpha density/electron density (`iteration variable 109`) real(dp) :: f_nd_protium_electrons @@ -1128,7 +1128,7 @@ subroutine init_physics_variables qstar = 0.0D0 rad_fraction_sol = 0.8D0 rad_fraction_total = 0.0D0 - ralpne = 0.10D0 + f_nd_alpha_electron = 0.10D0 f_nd_protium_electrons = 0.0D0 rli = 0.9D0 rlp = 0.0D0 diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index 82e3c2d358..161c59a102 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -196,7 +196,7 @@ subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar) dr_tf_wp, b_crit_upper_nbti use fwbs_variables, only: tpeak use physics_variables, only: q, aspect, p_plasma_rad_mw, dene, fusion_power, btot, tesep, & - pdivt, ralpne, ten, beta_poloidal, hfac, teped, alpha_power_beams, q95_min, rmajor, wallmw, & + pdivt, f_nd_alpha_electron, ten, beta_poloidal, hfac, teped, alpha_power_beams, q95_min, rmajor, wallmw, & beta, beta_max, bt, plasma_current use global_variables, only: verbose, maxcal, runtitle, run_tests use constants, only: nout @@ -275,7 +275,7 @@ subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar) outvar(56,iscan) = acond outvar(57,iscan) = tfareain/n_tf outvar(58,iscan) = taulimit - outvar(66,iscan) = ralpne + outvar(66,iscan) = f_nd_alpha_electron outvar(69,iscan) = fimp(1) outvar(70,iscan) = fimp(2) outvar(71,iscan) = fimp(3) diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 3422ee619c..7a22d0df05 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -377,7 +377,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.3954E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0392E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.3954E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1454,7 +1454,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 25f3323668..c0f88d4904 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -378,7 +378,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.3954E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0392E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.3954E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1455,7 +1455,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 260028add0..b5563ea76c 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -378,7 +378,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.3954E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0392E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.3954E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1455,7 +1455,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 6372857115..35ac4250f2 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -378,7 +378,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4445E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4445E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3954E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.3954E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0392E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.3954E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1455,7 +1455,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 53d7874948..838e0942b0 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -265,7 +265,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index e4a2ac28c9..875ad16076 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -374,7 +374,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3950E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3950E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3422E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.3422E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0490E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.3422E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1456,7 +1456,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index d1a875f0ec..8c6092dd97 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -69,7 +69,7 @@ boundu(59) = 0.94 ixc = 60 * cpttf boundl(60) = 65000.0 boundu(60) = 90000.0 -ixc = 109 * ralpne +ixc = 109 * f_nd_alpha_electron boundu(109) = 0.1 ixc = 122 * oh_steel_frac ixc = 135 * fimp(13) @@ -345,7 +345,7 @@ i_plasma_geometry = 0 * switch for plasma cross-sectional shape calculation; kappa = 1.85 * plasma separatrix elongation (calculated if `i_plasma_geometry = 1-5; 7 or 9-10`) q = 3.7339078193128556 * Safety factor 'near' plasma edge (`iteration variable 18`) equal to q95 q0 = 1.0 * safety factor on axis -ralpne = 0.060238763988650204 * thermal alpha density/electron density (`iteration variable 109`) +f_nd_alpha_electron = 0.060238763988650204 * thermal alpha density/electron density (`iteration variable 109`) rmajor = 8.0 * plasma major radius (m) (`iteration variable 3`) i_single_null = 1 * switch for single null / double null plasma; f_sync_reflect = 0.6 * synchrotron wall reflectivity factor diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index cdde1ed273..15421c2ad3 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -89,7 +89,7 @@ ixc = 54 * ftmargtf ixc = 106 * ftmargoh ixc = 122 * oh_steel_frac ixc = 123 * foh_stress -ixc = 109 * ralpne +ixc = 109 * f_nd_alpha_electron ixc = 110 * ftaulimit *isweep = 3 @@ -372,5 +372,5 @@ t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) ftmargoh = 1.0000E+00 oh_steel_frac = 5.7875E-01 foh_stress = 1.0000E+00 - ralpne = 6.8940E-02 + f_nd_alpha_electron = 6.8940E-02 ftaulimit = 1.0000E+00 \ No newline at end of file diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 580900be4d..f7ee151441 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -379,7 +379,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4167E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4167E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4551E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.4551E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2359E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.4551E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1542,7 +1542,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4453E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4453E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4161E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.4161E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2419E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.4161E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -2705,7 +2705,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4676E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4676E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4201E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.4201E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2370E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.4201E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -3868,7 +3868,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4348E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4348E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4833E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.4833E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2215E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.4833E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -5031,7 +5031,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4323E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4323E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4490E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.4490E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2308E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.4490E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -6194,7 +6194,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4072E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4072E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.3847E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.3847E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2457E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.3847E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -7357,7 +7357,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3766E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3766E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4443E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.4443E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2304E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.4443E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -8520,7 +8520,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3843E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3843E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4434E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.4434E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2275E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.4434E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -9683,7 +9683,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3714E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3714E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.4369E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.4369E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2265E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.4369E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -10846,7 +10846,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3618E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3618E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.5160E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.5160E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2073E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.5160E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -12009,7 +12009,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3850E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3850E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.5300E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.5300E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2058E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.5300E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -13172,7 +13172,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3790E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3790E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.5178E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.5178E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.2108E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.5178E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -14335,7 +14335,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3655E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3655E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.5926E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.5926E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.1926E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.5926E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -15498,7 +15498,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3931E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3931E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.6262E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.6262E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.1835E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.6262E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -16661,7 +16661,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.4220E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.4220E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 7.6613E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 7.6613E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.1741E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 7.6613E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -17741,7 +17741,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 7a4bcb39a3..db395f32c6 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -233,7 +233,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -1228,7 +1228,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -2223,7 +2223,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -3218,7 +3218,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -4213,7 +4213,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -5208,7 +5208,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -6203,7 +6203,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -7198,7 +7198,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -8193,7 +8193,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 6.5650E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.8780E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 6.8388E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 6.8388E-02 ITV H__concentration________________________________________________________ (fimp(01)_____________________ 8.4302E-01 OP He_concentration________________________________________________________ (fimp(02)_____________________ 6.8388E-02 Be_concentration________________________________________________________ (fimp(03)_____________________ 0.0000E+00 @@ -9068,7 +9068,7 @@ ixc = 54 * ftmargtf ixc = 106 * ftmargoh ixc = 122 * oh_steel_frac ixc = 123 * foh_stress -ixc = 109 * ralpne +ixc = 109 * f_nd_alpha_electron ixc = 110 * ftaulimit isweep = 9 @@ -9352,5 +9352,5 @@ t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) ftmargoh = 1.0000E+00 oh_steel_frac = 5.7875E-01 foh_stress = 1.0000E+00 - ralpne = 6.8940E-02 + f_nd_alpha_electron = 6.8940E-02 ftaulimit = 1.0000E+00 \ No newline at end of file diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 79132d1482..c16eba5660 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -89,7 +89,7 @@ ixc = 54 * ftmargtf ixc = 106 * ftmargoh ixc = 122 * oh_steel_frac ixc = 123 * foh_stress -ixc = 109 * ralpne +ixc = 109 * f_nd_alpha_electron ixc = 110 * ftaulimit *isweep = 3 @@ -372,5 +372,5 @@ t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) ftmargoh = 1.0000E+00 oh_steel_frac = 5.7875E-01 foh_stress = 1.0000E+00 - ralpne = 6.8940E-02 + f_nd_alpha_electron = 6.8940E-02 ftaulimit = 1.0000E+00 \ No newline at end of file diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 20c36335fc..c6236d680a 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -89,7 +89,7 @@ ixc = 54 * ftmargtf ixc = 106 * ftmargoh ixc = 122 * oh_steel_frac ixc = 123 * foh_stress -ixc = 109 * ralpne +ixc = 109 * f_nd_alpha_electron ixc = 110 * ftaulimit *isweep = 3 @@ -372,5 +372,5 @@ t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) ftmargoh = 1.0000E+00 oh_steel_frac = 5.7875E-01 foh_stress = 1.0000E+00 - ralpne = 6.8940E-02 + f_nd_alpha_electron = 6.8940E-02 ftaulimit = 1.0000E+00 \ No newline at end of file diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 48909a2908..1925c9180b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3760,7 +3760,7 @@ ], "radial_array": 0.0, "radp": null, - "ralpne": 0.1, + "f_nd_alpha_electron": 0.1, "rat": 1.3e-08, "rb": 0.0, "rbld": 0.0, @@ -9962,8 +9962,8 @@ "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)\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(t_current_ramp_up), 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 fbeta_min)\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_poloidal_eps (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) beam_energy\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) fbeta_max (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) fbeta_poloidal (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)fr_conducting_wall (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
    • (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) fbeta_min (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_poloidal_eps (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) t_between_pulse\n
      • (18) q\n
      • (19) beam_energy\n
      • (20) tcpav\n
      • (21) ft_burn (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) fbeta_max (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) t_current_ramp_up\n
      • (66) ft_current_ramp_up (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)fr_conducting_wall (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
      • (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) fbeta_min (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_poloidal_eps (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) beam_energy\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) fbeta_max (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) fbeta_poloidal (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)fr_conducting_wall (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) f_nd_alpha_electron: 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
        • (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) fbeta_min (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_poloidal_eps (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) t_between_pulse\n
          • (18) q\n
          • (19) beam_energy\n
          • (20) tcpav\n
          • (21) ft_burn (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) fbeta_max (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) t_current_ramp_up\n
          • (66) ft_current_ramp_up (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)fr_conducting_wall (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) f_nd_alpha_electron: 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
          • (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) fbeta_min (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]", @@ -10487,7 +10487,7 @@ "rad_ob": "", "radctf": "radius of arc i (m)", "radial_array": "Array refining the radii of the stress calculations arrays", - "ralpne": "thermal alpha density/electron density (`iteration variable 109`) (calculated if `ipedestal=3`)", + "f_nd_alpha_electron": "thermal alpha density/electron density (`iteration variable 109`) (calculated if `ipedestal=3`)", "rat": "plasma chamber wall outgassing rate (Pa-m/s)", "rb": "outer radius of coil i (m)", "rbld": "sum of thicknesses to the major radius (m)", @@ -14059,7 +14059,7 @@ "lb": 0.0, "ub": 1.0 }, - "ralpne": { + "f_nd_alpha_electron": { "lb": 1e-12, "ub": 1.0 }, @@ -15624,7 +15624,7 @@ "lb": 0.001, "ub": 10.0 }, - "ralpne": { + "f_nd_alpha_electron": { "lb": 0.05, "ub": 0.15 }, @@ -15842,7 +15842,7 @@ "q": 3.0, "qtargettotal": 5000000.0, "r_cp_top": 0.0, - "ralpne": 0.1, + "f_nd_alpha_electron": 0.1, "rcool": 0.005, "rebco_thickness": 1e-06, "rmajor": 8.14, @@ -15911,7 +15911,7 @@ }, "109": { "lb": 0.05, - "name": "ralpne", + "name": "f_nd_alpha_electron", "ub": 0.15 }, "11": { @@ -16674,7 +16674,7 @@ "106": "ftmargoh", "107": "favail", "108": "breeder_f", - "109": "ralpne", + "109": "f_nd_alpha_electron", "11": "pheat", "110": "ftaulimit", "111": "fniterpump", @@ -16955,7 +16955,7 @@ "q": "18", "qtargettotal": "124", "r_cp_top": "162", - "ralpne": "109", + "f_nd_alpha_electron": "109", "rcool": "69", "rebco_thickness": "138", "rmajor": "3", @@ -19235,7 +19235,7 @@ "qstar", "rad_fraction_sol", "rad_fraction_total", - "ralpne", + "f_nd_alpha_electron", "f_nd_protium_electrons", "rli", "rlp", @@ -20656,7 +20656,7 @@ "qtargettotal": "real_variable", "r_cp_top": "real_variable", "rad_fraction_sol": "real_variable", - "ralpne": "real_variable", + "f_nd_alpha_electron": "real_variable", "rat": "real_variable", "rbrt": "real_variable", "rbvfac": "real_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 5828946293..0addef0f8f 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -265,7 +265,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 630609bffe..da6f197d43 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -247,7 +247,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 3982a4f2dc..dcb3ee4e3c 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -69,7 +69,7 @@ boundu(59) = 0.94 ixc = 60 * cpttf boundl(60) = 65000.0 boundu(60) = 90000.0 -ixc = 109 * ralpne +ixc = 109 * f_nd_alpha_electron boundu(109) = 0.1 ixc = 122 * oh_steel_frac ixc = 135 * fimp(13) @@ -345,7 +345,7 @@ i_plasma_geometry = 0 * switch for plasma cross-sectional shape calculation; kappa = 1.85 * plasma separatrix elongation (calculated if `i_plasma_geometry = 1-5; 7 or 9-10`) q = 3.7339078193128556 * Safety factor 'near' plasma edge (`iteration variable 18`) equal to q95 q0 = 1.0 * safety factor on axis -ralpne = 0.060238763988650204 * thermal alpha density/electron density (`iteration variable 109`) +f_nd_alpha_electron = 0.060238763988650204 * thermal alpha density/electron density (`iteration variable 109`) rmajor = 8.0 * plasma major radius (m) (`iteration variable 3`) i_single_null = 1 * switch for single null / double null plasma; f_sync_reflect = 0.6 * synchrotron wall reflectivity factor diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 1b2dc66d8a..9826bf90d3 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -261,7 +261,7 @@ boundu(9) = 1.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ixc = 109 -ralpne = 0.2 +f_nd_alpha_electron = 0.2 boundl(109) = 0.001 boundu(109) = 1.0 * DESCRIPTION: Thermal alpha density / electron density diff --git a/tests/regression/input_files/stellarator.IN.DAT b/tests/regression/input_files/stellarator.IN.DAT index 8d608a65e2..b551ecc672 100644 --- a/tests/regression/input_files/stellarator.IN.DAT +++ b/tests/regression/input_files/stellarator.IN.DAT @@ -76,7 +76,7 @@ ixc = 169 * itv_te0ecrh boundl(169) = 4. boundu(169) = 35. *12 -ixc = 109 * itv_ralpne +ixc = 109 * itv_f_nd_alpha_electron ftaulimit = 1. boundl(109) = 0.0001 boundu(109) = 0.4 @@ -90,7 +90,7 @@ ftoroidalgap = 1. * f value for toroidal gap between coils fbeta_max = 1. * f value for beta limit ffuspow = 1.0 f_alpha_plasma = 0.95 * fast particle fraction -ralpne = 0.144 * thermal alpha density / electron density +f_nd_alpha_electron = 0.144 * thermal alpha density / electron density fradpwr = 1 * needed to control radiation power epsfcn = 0.0001 * convergence important to start with 10^-4, 10^-3 is NOT sufficient to match the constraint resonably well!! taulimit = 6 * tau_He/tau_E diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index da57a85903..693f434c9d 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -265,7 +265,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index cce6e8c1dd..6afdba7386 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -374,7 +374,7 @@ Hot_beam_density_(/m3)__________________________________________________ (nd_beam_ions)______________________ 0.0000E+00 OP Density_limit_from_scaling_(/m3)________________________________________ (dnelimt)_____________________ 7.3950E+19 OP Density_limit_(enforced)_(/m3)__________________________________________ (boundu(9)*dnelimt)___________ 7.3950E+19 OP - Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (ralpne)______________________ 8.3422E-02 ITV + Helium_ion_density_(thermalised_ions_only)_/_electron_density___________ (f_nd_alpha_electron)______________________ 8.3422E-02 ITV H__concentration________________________________________________________ (fimp(01))____________________ 8.0490E-01 OP He_concentration________________________________________________________ (fimp(02))____________________ 8.3422E-02 Be_concentration________________________________________________________ (fimp(03))____________________ 0.0000E+00 @@ -1456,7 +1456,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 cpttf = 65000.0 -* Helium fraction (ralpne) +* Helium fraction (f_nd_alpha_electron) ixc = 109 boundu(109) = 0.1 diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 1dcb8cf56b..0a1200bfe8 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1159,7 +1159,7 @@ class PlasmaCompositionParam(NamedTuple): f_alpha_ion: Any = None - ralpne: Any = None + f_nd_alpha_electron: Any = None dlamee: Any = None @@ -1301,7 +1301,7 @@ class PlasmaCompositionParam(NamedTuple): rncne=0, rnone=0, f_alpha_ion=0, - ralpne=0.10000000000000001, + f_nd_alpha_electron=0.10000000000000001, dlamee=0, rnbeam=0, zeff=0, @@ -1419,7 +1419,7 @@ class PlasmaCompositionParam(NamedTuple): rncne=0, rnone=0, f_alpha_ion=0.3154069116809366, - ralpne=0.10000000000000001, + f_nd_alpha_electron=0.10000000000000001, dlamee=17.510652035055571, rnbeam=0, zeff=2.0909945616489103, @@ -1561,7 +1561,11 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): physics_variables, "f_alpha_ion", plasmacompositionparam.f_alpha_ion ) - monkeypatch.setattr(physics_variables, "ralpne", plasmacompositionparam.ralpne) + monkeypatch.setattr( + physics_variables, + "f_nd_alpha_electron", + plasmacompositionparam.f_nd_alpha_electron, + ) monkeypatch.setattr(physics_variables, "dlamee", plasmacompositionparam.dlamee) diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index b624e374f0..7c0e5ad19f 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -118,7 +118,7 @@ class ProcessTracker: "triang95", "p_plasma_inner_rad_mw", "tesep", - "ralpne", + "f_nd_alpha_electron", "wallmw", "aspect", "rminor", From 6f7a9f4bdd828213d0863584df3db983a6ededaf Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 14:59:09 +0000 Subject: [PATCH 37/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rnbeam'=20to=20'?= =?UTF-8?q?f=5Fnd=5Fbeam=5Felectron'=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20in=20calculations=20and=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fusion_reactions/beam_reactions.md | 2 +- .../physics-models/plasma_composition.md | 6 ++--- process/init.py | 4 ++-- process/physics.py | 2 +- source/fortran/input.f90 | 6 ++--- source/fortran/iteration_variables.f90 | 12 +++++----- source/fortran/numerics.f90 | 2 +- source/fortran/physics_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 24 +++++++++---------- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_physics.py | 12 ++++++---- 11 files changed, 40 insertions(+), 36 deletions(-) diff --git a/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md b/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md index e11ab9ea28..a0d94fa449 100644 --- a/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md +++ b/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md @@ -385,7 +385,7 @@ Please see the [H&CD section](../../eng-models/heating_and_current_drive/heating This constraint can be activated by stating `icc = 7` in the input file. -The desired value of the hot ion beam density calculated from the code (`beam_density_out`) can be constrained using the input variable, `rnbeam`. Which is the ratio of the beam density to the plasma electron density. It can be set as an iteration variable by setting `ixc = 7`. +The desired value of the hot ion beam density calculated from the code (`beam_density_out`) can be constrained using the input variable, `f_nd_beam_electron`. Which is the ratio of the beam density to the plasma electron density. It can be set as an iteration variable by setting `ixc = 7`. [^1]: J. W. Sheffield, “The physics of magnetic fusion reactors,” vol. 66, no. 3, pp. 1015–1103,Jul. 1994, doi: https://doi.org/10.1103/revmodphys.66.1015. [^2]: Deng Baiquan and G. A. Emmert, “Fast ion pressure in fusion plasma,” Nuclear Fusion and Plasma Physics,vol. 9, no. 3, pp. 136–141, 2022, Available: https://fti.neep.wisc.edu/fti.neep.wisc.edu/pdf/fdm718.pdf diff --git a/documentation/proc-pages/physics-models/plasma_composition.md b/documentation/proc-pages/physics-models/plasma_composition.md index ed8260a86f..5c9b93b2fa 100644 --- a/documentation/proc-pages/physics-models/plasma_composition.md +++ b/documentation/proc-pages/physics-models/plasma_composition.md @@ -48,11 +48,11 @@ All of the plasma composites are normally given as a fraction of the volume aver 3. **Beam Hot Ion Component** - - Calculate the number density of beam ions (`nd_beam_ions`), using the electron density (`dene`) and the beam ion to electron ratio (`rnbeam`). If the plasma is ignited, set it to zero. - - `rnbeam` can be set as an iteration variable (`ixc = 7`) or set directly. + - Calculate the number density of beam ions (`nd_beam_ions`), using the electron density (`dene`) and the beam ion to electron ratio (`f_nd_beam_electron`). If the plasma is ignited, set it to zero. + - `f_nd_beam_electron` can be set as an iteration variable (`ixc = 7`) or set directly. $$ - \mathtt{nd\_beam\_ions} | n_{\text{beam}} = \mathtt{rnbeam} \times n_{\text{e}} + \mathtt{nd\_beam\_ions} | n_{\text{beam}} = \mathtt{f_nd_beam_electron} \times n_{\text{e}} $$ 4. **Sum of charge number density for all impurity ions** diff --git a/process/init.py b/process/init.py index 0c6d98f4e0..53bc345a90 100644 --- a/process/init.py +++ b/process/init.py @@ -990,9 +990,9 @@ def check_process(): fortran.current_drive_variables.iefrf != 5 and fortran.current_drive_variables.iefrf != 8 ): - fortran.physics_variables.rnbeam = 0.0 + fortran.physics_variables.f_nd_beam_electron = 0.0 else: - fortran.physics_variables.rnbeam = 0.0 + fortran.physics_variables.f_nd_beam_electron = 0.0 # Set inboard blanket thickness to zero if no inboard blanket switch # used (Issue #732) diff --git a/process/physics.py b/process/physics.py index e59e724918..f7fb2c0dc0 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2725,7 +2725,7 @@ def plasma_composition() -> None: # If ignited, prevent beam fusion effects if physics_variables.ignite == 0: physics_variables.nd_beam_ions = ( - physics_variables.dene * physics_variables.rnbeam + physics_variables.dene * physics_variables.f_nd_beam_electron ) else: physics_variables.nd_beam_ions = 0.0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 84a70e6fa9..541bcd4ba8 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -306,7 +306,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use physics_variables, only: ipedestal, taumax, i_single_null, fvsbrnni, & rhopedt, f_vol_plasma, f_deuterium, ffwal, i_beta_component, itartpf, ilhthresh, & fpdivlim, beta_poloidal_eps_max, isc, kappa95, aspect, f_r_conducting_wall, nesep, c_beta, csawth, dene, & - ftar, plasma_res_factor, f_sync_reflect, rnbeam, beta, neped, hfact, beta_norm_max, & + ftar, plasma_res_factor, f_sync_reflect, f_nd_beam_electron, beta, neped, hfact, beta_norm_max, & fgwsep, rhopedn, tratio, q0, i_plasma_geometry, i_plasma_shape, fne0, ignite, f_tritium, & i_beta_fast_alpha, tauee_in, alphaj, alphat, i_plasma_current, q, ti, tesep, rli, triang, & itart, f_nd_alpha_electron, iprofile, triang95, rad_fraction_sol, betbm0, f_nd_protium_electrons, & @@ -733,8 +733,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('rmajor') call parse_real_variable('rmajor', rmajor, 0.1D0, 50.0D0, & 'Plasma major radius (m)') - case ('rnbeam') - call parse_real_variable('rnbeam', rnbeam, 0.0D0, 1.0D0, & + case ('f_nd_beam_electron') + call parse_real_variable('f_nd_beam_electron', f_nd_beam_electron, 0.0D0, 1.0D0, & 'Hot beam density / electron density') case ('i_single_null') call parse_int_variable('i_single_null', i_single_null, 0, 1, & diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index 99d208640f..b67e882ce5 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -168,25 +168,25 @@ end subroutine set_itv_6 !--------------------------------- subroutine init_itv_7 - !!
          • ( 7) rnbeam + !!
          • ( 7) f_nd_beam_electron use numerics, only: lablxc, boundl, boundu implicit none - lablxc(7) = 'rnbeam ' + lablxc(7) = 'f_nd_beam_electron ' boundl(7) = 1.00D-6 boundu(7) = 1.000D0 end subroutine init_itv_7 real(kind(1.d0)) function itv_7() - use physics_variables, only: rnbeam + use physics_variables, only: f_nd_beam_electron implicit none - itv_7 = rnbeam + itv_7 = f_nd_beam_electron end function itv_7 subroutine set_itv_7(ratio) - use physics_variables, only: rnbeam + use physics_variables, only: f_nd_beam_electron implicit none real(kind(1.d0)) :: ratio - rnbeam = ratio + f_nd_beam_electron = ratio end subroutine set_itv_7 !--------------------------------- diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index aa9c56dfe5..f4be00191c 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -208,7 +208,7 @@ module numerics !!
          • ( 4) te !!
          • ( 5) beta !!
          • ( 6) dene - !!
          • ( 7) rnbeam + !!
          • ( 7) f_nd_beam_electron !!
          • ( 8) fbeta_poloidal_eps (f-value for equation 6) !!
          • ( 9) fdene (f-value for equation 5) !!
          • (10) hfact diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 508c3a6991..ac68374171 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -827,7 +827,7 @@ module physics_variables real(dp) :: rminor !! plasma minor radius (m) - real(dp) :: rnbeam + real(dp) :: f_nd_beam_electron !! hot beam density / n_e (`iteration variable 7`) real(dp) :: rncne @@ -1134,7 +1134,7 @@ subroutine init_physics_variables rlp = 0.0D0 rmajor = 8.14D0 rminor = 0.0D0 - rnbeam = 0.005D0 + f_nd_beam_electron = 0.005D0 rncne = 0.0D0 rndfuel = 0.0D0 rnfene = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 1925c9180b..1706ec4a8f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4247,7 +4247,7 @@ "rminor_star": 0.0, "rmpe_": "mp_/me_", "rmu0": 1.256637062e-06, - "rnbeam": 0.005, + "f_nd_beam_electron": 0.005, "rncne": 0.0, "rndfuel": 0.0, "rnfene": 0.0, @@ -9962,8 +9962,8 @@ "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)\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(t_current_ramp_up), 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 fbeta_min)\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_poloidal_eps (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) beam_energy\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) fbeta_max (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) fbeta_poloidal (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)fr_conducting_wall (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) f_nd_alpha_electron: 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
            • (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) fbeta_min (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_poloidal_eps (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) t_between_pulse\n
              • (18) q\n
              • (19) beam_energy\n
              • (20) tcpav\n
              • (21) ft_burn (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) fbeta_max (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) t_current_ramp_up\n
              • (66) ft_current_ramp_up (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)fr_conducting_wall (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) f_nd_alpha_electron: 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
              • (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) fbeta_min (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) f_nd_beam_electron\n
                • ( 8) fbeta_poloidal_eps (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) beam_energy\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) fbeta_max (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) fbeta_poloidal (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)fr_conducting_wall (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) f_nd_alpha_electron: 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
                • (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) fbeta_min (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) f_nd_beam_electron\n
                  • ( 8) fbeta_poloidal_eps (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) t_between_pulse\n
                  • (18) q\n
                  • (19) beam_energy\n
                  • (20) tcpav\n
                  • (21) ft_burn (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) fbeta_max (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) t_current_ramp_up\n
                  • (66) ft_current_ramp_up (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)fr_conducting_wall (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) f_nd_alpha_electron: 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
                  • (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) fbeta_min (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]", @@ -10557,7 +10557,7 @@ "rminor_star": "", "rmpe_": "", "rmu0": "permeability of free space [H/m]", - "rnbeam": "hot beam density / n_e (`iteration variable 7`)", + "f_nd_beam_electron": "hot beam density / n_e (`iteration variable 7`)", "rncne": "n_carbon / n_e", "rndfuel": "fuel burnup rate (reactions/second)", "rnfene": "n_highZ / n_e", @@ -14167,7 +14167,7 @@ "lb": 0.1, "ub": 50.0 }, - "rnbeam": { + "f_nd_beam_electron": { "lb": 0.0, "ub": 1.0 }, @@ -15640,7 +15640,7 @@ "lb": 0.1, "ub": 50.0 }, - "rnbeam": { + "f_nd_beam_electron": { "lb": 1e-06, "ub": 1.0 }, @@ -15846,7 +15846,7 @@ "rcool": 0.005, "rebco_thickness": 1e-06, "rmajor": 8.14, - "rnbeam": 0.005, + "f_nd_beam_electron": 0.005, "rrin": 6.0, "scrapli": 0.14, "scraplo": 0.15, @@ -16536,7 +16536,7 @@ }, "7": { "lb": 1e-06, - "name": "rnbeam", + "name": "f_nd_beam_electron", "ub": 1.0 }, "70": { @@ -16799,7 +16799,7 @@ "67": "ftcycl", "68": "fptemp", "69": "rcool", - "7": "rnbeam", + "7": "f_nd_beam_electron", "70": "vcool", "71": "fq", "72": "fipir", @@ -16959,7 +16959,7 @@ "rcool": "69", "rebco_thickness": "138", "rmajor": "3", - "rnbeam": "7", + "f_nd_beam_electron": "7", "rrin": "156", "scrapli": "73", "scraplo": "74", @@ -19241,7 +19241,7 @@ "rlp", "rmajor", "rminor", - "rnbeam", + "f_nd_beam_electron", "rncne", "rndfuel", "rnfene", @@ -20684,7 +20684,7 @@ "rlenmax": "real_variable", "rli": "real_variable", "rmajor": "real_variable", - "rnbeam": "real_variable", + "f_nd_beam_electron": "real_variable", "robotics_h": "real_variable", "robotics_l": "real_variable", "robotics_w": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 9826bf90d3..1e905a8de4 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2851,7 +2851,7 @@ feffcd = 1.0 * VARIABLES: ignite,nd_beam_ions Rest calculated in-situ *ixc = 7 -*rnbeam = +*f_nd_beam_electron = *boundl(7) = *boundu(7) = * DESCRIPTION: Hot beam density / ne diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 0a1200bfe8..970ecd0606 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1163,7 +1163,7 @@ class PlasmaCompositionParam(NamedTuple): dlamee: Any = None - rnbeam: Any = None + f_nd_beam_electron: Any = None zeff: Any = None @@ -1303,7 +1303,7 @@ class PlasmaCompositionParam(NamedTuple): f_alpha_ion=0, f_nd_alpha_electron=0.10000000000000001, dlamee=0, - rnbeam=0, + f_nd_beam_electron=0, zeff=0, nd_impurities=0, pcoef=0, @@ -1421,7 +1421,7 @@ class PlasmaCompositionParam(NamedTuple): f_alpha_ion=0.3154069116809366, f_nd_alpha_electron=0.10000000000000001, dlamee=17.510652035055571, - rnbeam=0, + f_nd_beam_electron=0, zeff=2.0909945616489103, nd_impurities=28875000000000004, pcoef=1.0521775929921553, @@ -1569,7 +1569,11 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): monkeypatch.setattr(physics_variables, "dlamee", plasmacompositionparam.dlamee) - monkeypatch.setattr(physics_variables, "rnbeam", plasmacompositionparam.rnbeam) + monkeypatch.setattr( + physics_variables, + "f_nd_beam_electron", + plasmacompositionparam.f_nd_beam_electron, + ) monkeypatch.setattr(physics_variables, "zeff", plasmacompositionparam.zeff) From 5ed2d6e980ba21bb53f3e42772381c8320453aaf Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 16:10:45 +0000 Subject: [PATCH 38/48] =?UTF-8?q?=F0=9F=94=84=20Rename=20'deni'=20to=20'nd?= =?UTF-8?q?=5Ffuel=5Fions'=20for=20clarity=20and=20consistency=20across=20?= =?UTF-8?q?code=20and=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fusion_reactions/beam_reactions.md | 4 +- .../physics-models/plasma_composition.md | 117 +++++++++--------- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +-- process/current_drive.py | 12 +- process/io/plot_proc.py | 10 +- process/physics.py | 44 ++++--- process/physics_functions.py | 34 ++--- process/stellarator.py | 10 +- source/fortran/physics_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++--- tests/integration/data/scan_MFILE.DAT | 18 +-- tests/integration/ref_dicts.json | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_neoclassics.py | 8 +- tests/unit/test_physics.py | 28 +++-- tests/unit/test_physics_functions.py | 2 +- 26 files changed, 192 insertions(+), 175 deletions(-) diff --git a/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md b/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md index a0d94fa449..f1ef3da249 100644 --- a/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md +++ b/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md @@ -103,8 +103,8 @@ Please see the [H&CD section](../../eng-models/heating_and_current_drive/heating 3. **Set the plasma tritium and ion densities** $$ - \mathtt{deuterium\_density = deni * f\_deuterium\_plasma} \\ - \mathtt{tritium\_density = deni * f\_tritium\_plasma} + \mathtt{deuterium\_density = nd_fuel_ions * f\_deuterium\_plasma} \\ + \mathtt{tritium\_density = nd_fuel_ions * f\_tritium\_plasma} $$ 4. **Calculate the beam alpha powers, density and deposited energy** diff --git a/documentation/proc-pages/physics-models/plasma_composition.md b/documentation/proc-pages/physics-models/plasma_composition.md index 5c9b93b2fa..e6a511505c 100644 --- a/documentation/proc-pages/physics-models/plasma_composition.md +++ b/documentation/proc-pages/physics-models/plasma_composition.md @@ -6,10 +6,46 @@ $$ n_{\text{e}} = \underbrace{Z_{\text{fuel}}n_{\text{i}}}_{\text{Fuel Ions}} + \underbrace{2n_{\text{e}}f_{\alpha}}_{\text{Alpha particles}} + \underbrace{n_{\text{e}}f_{\text{beam}}}_{\text{Neutral beams}} + \underbrace{\sum_j Z_j n_{\text{e}} f_j}_{\text{Impurities}} $$ -* Only deuterium and tritium can be put into the beams so charge is always 1 +* Since only deuterium and tritium can be placed into the beams the charge coefficient on the $n_{\text{e}}f_{\text{beam}}$ is just 1. -------------------- +## Setting the impurity composition + + + +The impurity number density fractions relative to the electron density are constant and are set +using input array `fimp(1,...,14)`. The available species are as follows: + + +- `fimp(1)`: Hydrogen isotopes (fraction calculated by code) +- `fimp(2)`: Helium (fraction calculated by code) +- `fimp(3)`: Beryllium +- `fimp(4)`: Carbon +- `fimp(5)`: Nitrogen +- `fimp(6)`: Oxygen +- `fimp(7)`: Neon +- `fimp(8)`: Silicon +- `fimp(9)`: Argon +- `fimp(10)`: Iron +- `fimp(11)`: Nickel +- `fimp(12)`: Krypton +- `fimp(13)`: Xenon +- `fimp(14)`: Tungsten + +As stated above, the number density fractions for hydrogen (all isotopes) and +helium need not be set, as they are calculated by the code to ensure +plasma quasi-neutrality taking into account the fuel ratios +`f_deuterium`, `f_tritium` and `f_helium3`, and the alpha particle fraction `f_nd_alpha_electron` which may +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.** + +---------------- + ## Plasma Composition Calculation | `plasma_composition()` This function sets the fractional makeups and determines the relative density and charges of different plasma species. @@ -22,37 +58,36 @@ All of the plasma composites are normally given as a fraction of the volume aver - `f_nd_alpha_electron` can be set as an iteration variable (`ixc = 109`) or set directly. $$ - n_{\alpha} = \mathtt{f_nd_alpha_electron}\times n_{\text{e}} + n_{\alpha} = \mathtt{f\_nd\_alpha\_electron}\times n_{\text{e}} $$ - 2. **Protons Calculation** - The calculation of proton density (`nd_protons`) depends on whether the alpha rate density has been calculated. This should only happen in the first function call as the rates are calculated later on in the code. - ```python - if physics_variables.alpha_rate_density_total < 1.0e-6: - physics_variables.nd_protons = max( - physics_variables.f_nd_protium_electrons * physics_variables.dene, - physics_variables.nd_alphas * (physics_variables.f_helium3 + 1.0e-3), - ) - else: - physics_variables.nd_protons = max( - physics_variables.f_nd_protium_electrons * physics_variables.dene, - physics_variables.nd_alphas - * physics_variables.proton_rate_density - / physics_variables.alpha_rate_density_total, - ) - ``` + - If the alpha rate density is not yet calculated, use a rough estimate. + + $$ + \texttt{nd_protons} | n_{\text{p}} = \\ + \text{max}\left[\texttt{f_nd_protium_electrons} \times n_{\text{e}}, n_{\alpha}\times \left(f_{\text{3He}} + 0.001\right)\right] + $$ + - Otherwise, use the calculated proton rate density. + $$ + \texttt{nd_protons} | n_{\text{p}} = \\ + \text{max}\left[\texttt{f_nd_protium_electrons} \times n_{\text{e}}, n_{\alpha}\times \frac{r_{\text{p}}}{r_{\alpha,\text{total}}}\right] + $$ + + where $r_{\text{p}}$ is the rate of proton production and $r_{\alpha,\text{total}}$ is the rate of total alpha particle production, which includes beam fusion (if present). + 3. **Beam Hot Ion Component** - Calculate the number density of beam ions (`nd_beam_ions`), using the electron density (`dene`) and the beam ion to electron ratio (`f_nd_beam_electron`). If the plasma is ignited, set it to zero. - `f_nd_beam_electron` can be set as an iteration variable (`ixc = 7`) or set directly. $$ - \mathtt{nd\_beam\_ions} | n_{\text{beam}} = \mathtt{f_nd_beam_electron} \times n_{\text{e}} + \mathtt{nd\_beam\_ions} | n_{\text{beam}} = \mathtt{f\_nd\_beam\_electron} \times n_{\text{e}} $$ 4. **Sum of charge number density for all impurity ions** @@ -73,10 +108,10 @@ All of the plasma composites are normally given as a fraction of the volume aver 6. **Fuel Ion Density Calculation** $$ - \mathtt{deni} | n_{\text{i}} = \frac{\mathtt{znfuel}}{1+f_{\text{3He}}} + \mathtt{nd_fuel_ions} | n_{\text{i}} = \frac{\mathtt{znfuel}}{1+f_{\text{3He}}} $$ - - Calculate the fuel ion density (`deni`). + - Calculate the fuel ion density (`nd_fuel_ions`). 7. **Set Hydrogen and Helium Impurity Fractions** @@ -87,7 +122,7 @@ All of the plasma composites are normally given as a fraction of the volume aver $$ $$ - \frac{n_{\text{He}}}{n_{\text{e}}} = f_{\text{3He}}n_{\text{i}}+\mathtt{f_nd_alpha_electron} + \frac{n_{\text{He}}}{n_{\text{e}}} = f_{\text{3He}}n_{\text{i}}+\mathtt{f\_nd\_alpha\_electron} $$ 8. **Total Impurity Density Calculation** @@ -186,42 +221,6 @@ All of the plasma composites are normally given as a fraction of the volume aver --------------- -The impurity radiation model in PROCESS uses a multi-impurity model which -integrates the radiation contributions over an arbitrary choice of density and -temperature profiles[^1] - -The impurity number density fractions relative to the electron density are constant and are set -using input array `fimp(1,...,14)`. The available species are as follows: - -| `fimp` | Species | -| :-: | - | -| 1 | Hydrogen isotopes (fraction calculated by code) | -| 2 | Helium (fraction calculated by code) | -| 3 | Beryllium | -| 4 | Carbon | -| 5 | Nitrogen | -| 6 | Oxygen | -| 7 | Neon | -| 8 | Silicon | -| 9 | Argon | -| 10 | Iron | -| 11 | Nickel | -| 12 | Krypton | -| 13 | Xenon | -| 14 | Tungsten | - -As stated above, the number density fractions for hydrogen (all isotopes) and -helium need not be set, as they are calculated by the code to ensure -plasma quasi-neutrality taking into account the fuel ratios -`f_deuterium`, `f_tritium` and `f_helium3`, and the alpha particle fraction `f_nd_alpha_electron` which may -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. - - ------------------- ## Key Constraints @@ -230,11 +229,9 @@ The impurity fraction to be varied can be set simply with `fimp(i) = `, w This constraint can be activated by stating `icc = 78` in the input file. - +The minimum impurity fraction required from the Reinke module can be set with, `fzmin` The scaling value `freinke` can be varied also. - - [^1]: H. Lux, R. Kemp, D.J. Ward, M. Sertoli, Impurity radiation in DEMO systems modelling, Fusion Engineering and Design, Volume 101, 2015, Pages 42-51, ISSN 0920-3796, https://doi.org/10.1016/j.fusengdes.2015.10.002. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 2f2c1309fc..d3b2ffff15 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -370,7 +370,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9697E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2127E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5392E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.5392E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6024E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6709E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8502E+16 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index f57188b70f..1c6c8c0443 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -371,7 +371,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index ae4038a774..d37f36227c 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -371,7 +371,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 303eea8253..088e0ffaaa 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -371,7 +371,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protonstons)______________________ 1.8963E+16 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 9671f8ae36..491d9b2221 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -371,7 +371,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index a79a653be5..8d6d5ca7c8 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -226,7 +226,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -1221,7 +1221,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -2216,7 +2216,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -3211,7 +3211,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -4206,7 +4206,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -5201,7 +5201,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -6196,7 +6196,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -7191,7 +7191,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -8186,7 +8186,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP diff --git a/process/current_drive.py b/process/current_drive.py index 1bba854472..3c248b12a7 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -1327,8 +1327,10 @@ def iternb(self): fshine = max(fshine, 1e-20) # Deuterium and tritium beam densities - dend = physics_variables.deni * (1.0 - current_drive_variables.f_tritium_beam) - dent = physics_variables.deni * current_drive_variables.f_tritium_beam + dend = physics_variables.nd_fuel_ions * ( + 1.0 - current_drive_variables.f_tritium_beam + ) + dent = physics_variables.nd_fuel_ions * current_drive_variables.f_tritium_beam # Power split to ions / electrons fpion = self.cfnbi( @@ -1600,8 +1602,10 @@ def culnbi(self): # Deuterium and tritium beam densities - dend = physics_variables.deni * (1.0e0 - current_drive_variables.f_tritium_beam) - dent = physics_variables.deni * current_drive_variables.f_tritium_beam + dend = physics_variables.nd_fuel_ions * ( + 1.0e0 - current_drive_variables.f_tritium_beam + ) + dent = physics_variables.nd_fuel_ions * current_drive_variables.f_tritium_beam # Power split to ions / electrons diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index c51b58f810..1ee5ddc6bb 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -647,11 +647,11 @@ def plot_nprofile(prof, demo_ranges): if ipedestal == 1: rhocore = np.linspace(0, rhopedn) necore = neped + (ne0 - neped) * (1 - rhocore**2 / rhopedn**2) ** alphan - nicore = necore * (deni / dene) + nicore = necore * (nd_fuel_ions / dene) rhosep = np.linspace(rhopedn, 1) neesep = nesep + (neped - nesep) * (1 - rhosep) / (1 - min(0.9999, rhopedn)) - nisep = neesep * (deni / dene) + nisep = neesep * (nd_fuel_ions / dene) rho = np.append(rhocore, rhosep) ne = np.append(necore, neesep) @@ -705,7 +705,7 @@ def plot_nprofile(prof, demo_ranges): rf"$\hspace{{4}} \alpha_{{\text{{n}}}}$: {alphan:.3f}\n", rf"$n_{{\text{{e,ped}}}}$: {neped:.3e} m$^{{-3}}$" r"$ \hspace{3} \frac{\langle n_i \rangle}{\langle n_e \rangle}$: " - f"{deni / dene:.3f}", + f"{nd_fuel_ions / dene:.3f}", rf"$f_{{\text{{GW e,ped}}}}$: {fgwped_out:.3f}", rf"$\rho_{{\text{{ped,n}}}}$: {rhopedn:.3f}\n", rf"$n_{{\text{{e,sep}}}}$: {nesep:.3e} m$^{{-3}}$", @@ -3453,7 +3453,7 @@ def main(args=None): global alphan global alphat global ne0 - global deni + global nd_fuel_ions global dene global te0 global ti @@ -3473,7 +3473,7 @@ def main(args=None): alphan = m_file.data["alphan"].get_scan(scan) alphat = m_file.data["alphat"].get_scan(scan) ne0 = m_file.data["ne0"].get_scan(scan) - deni = m_file.data["deni"].get_scan(scan) + nd_fuel_ions = m_file.data["nd_fuel_ions"].get_scan(scan) dene = m_file.data["dene"].get_scan(scan) te0 = m_file.data["te0"].get_scan(scan) ti = m_file.data["ti"].get_scan(scan) diff --git a/process/physics.py b/process/physics.py index f7fb2c0dc0..b8727374d2 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2018,7 +2018,7 @@ def physics(self): physics_variables.bt, current_drive_variables.beam_current, physics_variables.dene, - physics_variables.deni, + physics_variables.nd_fuel_ions, physics_variables.dlamie, current_drive_variables.beam_energy, physics_variables.f_deuterium, @@ -2085,7 +2085,7 @@ def physics(self): physics_variables.bp, physics_variables.bt, physics_variables.dene, - physics_variables.deni, + physics_variables.nd_fuel_ions, physics_variables.nd_ions_total, physics_variables.ten, physics_variables.tin, @@ -2330,7 +2330,7 @@ def physics(self): ) = self.phyaux( physics_variables.aspect, physics_variables.dene, - physics_variables.deni, + physics_variables.nd_fuel_ions, physics_variables.fusion_rate_density_total, physics_variables.alpha_rate_density_total, physics_variables.plasma_current, @@ -2751,10 +2751,10 @@ def plasma_composition() -> None: - znimp ) - # Fuel ion density, deni - # For D-T-He3 mix, deni = nD + nT + nHe3, while znfuel = nD + nT + 2*nHe3 - # So deni = znfuel - nHe3 = znfuel - f_helium3*deni - physics_variables.deni = znfuel / (1.0 + physics_variables.f_helium3) + # Fuel ion density, nd_fuel_ions + # For D-T-He3 mix, nd_fuel_ions = nD + nT + nHe3, while znfuel = nD + nT + 2*nHe3 + # So nd_fuel_ions = znfuel - nHe3 = znfuel - f_helium3*nd_fuel_ions + physics_variables.nd_fuel_ions = znfuel / (1.0 + physics_variables.f_helium3) # Set hydrogen and helium impurity fractions for # radiation calculations @@ -2763,7 +2763,7 @@ def plasma_composition() -> None: ] = ( physics_variables.nd_protons + (physics_variables.f_deuterium + physics_variables.f_tritium) - * physics_variables.deni + * physics_variables.nd_fuel_ions + physics_variables.nd_beam_ions ) / physics_variables.dene @@ -2771,7 +2771,7 @@ def plasma_composition() -> None: impurity_radiation.element2index("He") ] = ( physics_variables.f_helium3 - * physics_variables.deni + * physics_variables.nd_fuel_ions / physics_variables.dene + physics_variables.f_nd_alpha_electron ) @@ -2787,7 +2787,7 @@ def plasma_composition() -> None: # Total ion density physics_variables.nd_ions_total = ( - physics_variables.deni + physics_variables.nd_fuel_ions + physics_variables.nd_alphas + physics_variables.nd_protons + physics_variables.nd_beam_ions @@ -2862,7 +2862,7 @@ def plasma_composition() -> None: # Density weighted mass physics_variables.m_ions_total_amu = ( - (physics_variables.m_fuel_amu * physics_variables.deni) + (physics_variables.m_fuel_amu * physics_variables.nd_fuel_ions) + (constants.m_alpha_amu * physics_variables.nd_alphas) + (physics_variables.nd_protons * constants.m_proton_amu) + (physics_variables.m_beam_amu * physics_variables.nd_beam_ions) @@ -2884,18 +2884,18 @@ def plasma_composition() -> None: physics_variables.zeffai = ( ( physics_variables.f_deuterium - * physics_variables.deni + * physics_variables.nd_fuel_ions / constants.m_deuteron_amu ) + ( physics_variables.f_tritium - * physics_variables.deni + * physics_variables.nd_fuel_ions / constants.m_triton_amu ) + ( 4.0 * physics_variables.f_helium3 - * physics_variables.deni + * physics_variables.nd_fuel_ions / constants.m_helion_amu ) + (4.0 * physics_variables.nd_alphas / constants.m_alpha_amu) @@ -2926,7 +2926,7 @@ def plasma_composition() -> None: def phyaux( aspect, dene, - deni, + nd_fuel_ions, fusion_rate_density_total, alpha_rate_density_total, plasma_current, @@ -2939,7 +2939,7 @@ def phyaux( author: P J Knight, CCFE, Culham Science Centre aspect : input real : plasma aspect ratio dene : input real : electron density (/m3) - deni : input real : fuel ion density (/m3) + nd_fuel_ions : input real : fuel ion density (/m3) nd_alphas : input real : alpha ash density (/m3) fusion_rate_density_total : input real : fusion reaction rate from plasma and beams (/m3/s) alpha_rate_density_total : input real : alpha particle production rate (/m3/s) @@ -2987,7 +2987,11 @@ def phyaux( # initial fuel ion-pairs/m3 = burnt fuel ion-pairs/m3 + unburnt fuel-ion pairs/m3 # Remember that unburnt fuel-ion pairs/m3 = 0.5 * unburnt fuel-ions/m3 if physics_variables.burnup_in <= 1.0e-9: - burnup = nd_alphas / (nd_alphas + 0.5 * deni) / physics_variables.tauratio + burnup = ( + nd_alphas + / (nd_alphas + 0.5 * nd_fuel_ions) + / physics_variables.tauratio + ) else: burnup = physics_variables.burnup_in # Fuel burnup rate (reactions/second) (previously Amps) @@ -3988,7 +3992,11 @@ def outplas(self): "OP ", ) po.ovarre( - self.outfile, "Fuel density (/m3)", "(deni)", physics_variables.deni, "OP " + self.outfile, + "Fuel density (/m3)", + "(nd_fuel_ions)", + physics_variables.nd_fuel_ions, + "OP ", ) po.ovarre( self.outfile, diff --git a/process/physics_functions.py b/process/physics_functions.py index 6d80fdff34..ff6b08af1e 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -232,8 +232,8 @@ def dt_reaction(self) -> None: fusion_power_density = ( sigmav * reaction_energy - * (physics_variables.f_deuterium * physics_variables.deni) - * (physics_variables.f_tritium * physics_variables.deni) + * (physics_variables.f_deuterium * physics_variables.nd_fuel_ions) + * (physics_variables.f_tritium * physics_variables.nd_fuel_ions) ) # Power densities for different particles [MW/m^3] @@ -301,8 +301,8 @@ def dhe3_reaction(self) -> None: fusion_power_density = ( sigmav * reaction_energy - * (physics_variables.f_deuterium * physics_variables.deni) - * (physics_variables.f_helium3 * physics_variables.deni) + * (physics_variables.f_deuterium * physics_variables.nd_fuel_ions) + * (physics_variables.f_helium3 * physics_variables.nd_fuel_ions) ) # Power densities for different particles [MW/m^3] @@ -374,8 +374,8 @@ def dd_helion_reaction(self) -> None: sigmav * reaction_energy * (1.0 - self.f_dd_branching_trit) - * (physics_variables.f_deuterium * physics_variables.deni) - * (physics_variables.f_deuterium * physics_variables.deni) + * (physics_variables.f_deuterium * physics_variables.nd_fuel_ions) + * (physics_variables.f_deuterium * physics_variables.nd_fuel_ions) ) # Power densities for different particles [MW/m^3] @@ -447,8 +447,8 @@ def dd_triton_reaction(self) -> None: sigmav * reaction_energy * self.f_dd_branching_trit - * (physics_variables.f_deuterium * physics_variables.deni) - * (physics_variables.f_deuterium * physics_variables.deni) + * (physics_variables.f_deuterium * physics_variables.nd_fuel_ions) + * (physics_variables.f_deuterium * physics_variables.nd_fuel_ions) ) # Power densities for different particles [MW/m^3] @@ -909,7 +909,7 @@ def fast_alpha_beta( bp: float, bt: float, dene: float, - deni: float, + nd_fuel_ions: float, nd_ions_total: float, ten: float, tin: float, @@ -926,7 +926,7 @@ def fast_alpha_beta( bp (float): Poloidal field (T). bt (float): Toroidal field on axis (T). dene (float): Electron density (m^-3). - deni (float): Fuel ion density (m^-3). + nd_fuel_ions (float): Fuel ion density (m^-3). nd_ions_total (float): Total ion density (m^-3). ten (float): Density-weighted electron temperature (keV). tin (float): Density-weighted ion temperature (keV). @@ -964,14 +964,16 @@ def fast_alpha_beta( # jlion: This "fact" model is heavily flawed for smaller temperatures! It is unphysical for a stellarator (high n low T) # IPDG89 fast alpha scaling if i_beta_fast_alpha == 0: - fact = min(0.3, 0.29 * (deni / dene) ** 2 * ((ten + tin) / 20.0 - 0.37)) + fact = min( + 0.3, 0.29 * (nd_fuel_ions / dene) ** 2 * ((ten + tin) / 20.0 - 0.37) + ) # Modified scaling, D J Ward else: fact = min( 0.30, 0.26 - * (deni / dene) ** 2 + * (nd_fuel_ions / dene) ** 2 * np.sqrt(max(0.0, ((ten + tin) / 20.0 - 0.65))), ) @@ -992,7 +994,7 @@ def beam_fusion( bt: float, beam_current: float, dene: float, - deni: float, + nd_fuel_ions: float, ion_electron_coulomb_log: float, beam_energy: float, f_deuterium_plasma: float, @@ -1017,7 +1019,7 @@ def beam_fusion( bt (float): Toroidal field on axis (T). beam_current (float): Neutral beam current (A). dene (float): Electron density (m^-3). - deni (float): Fuel ion density (m^-3). + nd_fuel_ions (float): Fuel ion density (m^-3). ion_electron_coulomb_log (float): Ion-electron coulomb logarithm. beam_energy (float): Neutral beam energy (keV). f_deuterium_plasma (float): Deuterium fraction of main plasma. @@ -1082,8 +1084,8 @@ def beam_fusion( ) # Deuterium and tritium ion densities - deuterium_density = deni * f_deuterium_plasma - tritium_density = deni * f_tritium_plasma + deuterium_density = nd_fuel_ions * f_deuterium_plasma + tritium_density = nd_fuel_ions * f_tritium_plasma ( deuterium_beam_alpha_power, diff --git a/process/stellarator.py b/process/stellarator.py index a8e84ee970..06c4f269ec 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4184,7 +4184,7 @@ def stphys(self, output): physics_variables.bt, current_drive_variables.beam_current, physics_variables.dene, - physics_variables.deni, + physics_variables.nd_fuel_ions, physics_variables.dlamie, current_drive_variables.beam_energy, physics_variables.f_deuterium, @@ -4251,7 +4251,7 @@ def stphys(self, output): physics_variables.bp, physics_variables.bt, physics_variables.dene, - physics_variables.deni, + physics_variables.nd_fuel_ions, physics_variables.nd_ions_total, physics_variables.ten, physics_variables.tin, @@ -4474,7 +4474,7 @@ def stphys(self, output): ) = self.physics.phyaux( physics_variables.aspect, physics_variables.dene, - physics_variables.deni, + physics_variables.nd_fuel_ions, physics_variables.fusion_rate_density_total, physics_variables.alpha_rate_density_total, physics_variables.plasma_current, @@ -5373,8 +5373,8 @@ def neoclassics_calc_nu_star_fromT(self, iota): ) density = np.array([ physics_variables.dene, - physics_variables.deni * physics_variables.f_deuterium, - physics_variables.deni * (1 - physics_variables.f_deuterium), + physics_variables.nd_fuel_ions * physics_variables.f_deuterium, + physics_variables.nd_fuel_ions * (1 - physics_variables.f_deuterium), physics_variables.nd_alphas, ]) diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index ac68374171..5eb463fe90 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -135,7 +135,7 @@ module physics_variables real(dp) :: dene !! electron density (/m3) (`iteration variable 6`) - real(dp) :: deni + real(dp) :: nd_fuel_ions !! fuel ion density (/m3) real(dp) :: dlamee @@ -986,7 +986,7 @@ subroutine init_physics_variables f_vol_plasma = 1.0D0 f_r_conducting_wall = 1.35D0 dene = 9.8D19 - deni = 0.0D0 + nd_fuel_ions = 0.0D0 dlamee = 0.0D0 dlamie = 0.0D0 dlimit = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 7a22d0df05..8768bc988c 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -370,7 +370,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index c0f88d4904..12efdbeceb 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -371,7 +371,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index b5563ea76c..3cc6e67093 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -371,7 +371,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 35ac4250f2..24ecdbb674 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -371,7 +371,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9334E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1669E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4831E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.4831E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6503E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.7723E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8963E+16 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 875ad16076..484a98a267 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -367,7 +367,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8740E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1228E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4478E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.4478E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6305E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8769E+16 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index f7ee151441..c7e8558a2a 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -372,7 +372,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9000E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2224E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6171E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.6171E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.5133E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9913E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6531E+16 OP @@ -1535,7 +1535,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9344E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2520E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6475E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.6475E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.5610E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9829E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6508E+16 OP @@ -2698,7 +2698,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9611E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2702E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6635E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.6635E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6426E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0041E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6567E+16 OP @@ -3861,7 +3861,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9217E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2309E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6217E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.6217E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6633E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0286E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6696E+16 OP @@ -5024,7 +5024,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9187E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2331E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6270E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.6270E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6208E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9989E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6614E+16 OP @@ -6187,7 +6187,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8886E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.2154E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.6165E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.6165E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.5724E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9271E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6415E+16 OP @@ -7350,7 +7350,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8519E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1782E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5769E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.5769E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6030E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9503E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6542E+16 OP @@ -8513,7 +8513,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8612E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1834E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5815E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.5815E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6582E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9558E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6557E+16 OP @@ -9676,7 +9676,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8457E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1695E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5692E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.5692E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6882E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9402E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6513E+16 OP @@ -10839,7 +10839,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8342E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1513E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5453E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.5453E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.7315E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 5.9956E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6731E+16 OP @@ -12002,7 +12002,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8619E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1736E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5647E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.5647E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.7253E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0256E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6815E+16 OP @@ -13165,7 +13165,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8548E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1709E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5634E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.5634E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6792E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0110E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6774E+16 OP @@ -14328,7 +14328,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8386E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1493E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5369E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.5369E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.7179E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.0597E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.6975E+16 OP @@ -15491,7 +15491,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8717E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1714E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5540E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.5540E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.7754E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1093E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.7114E+16 OP @@ -16654,7 +16654,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.9064E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1948E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.5721E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.5721E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.8337E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.1614E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.7260E+16 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index db395f32c6..d9665f4060 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -226,7 +226,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -1221,7 +1221,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -2216,7 +2216,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -3211,7 +3211,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -4206,7 +4206,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -5201,7 +5201,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -6196,7 +6196,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -7191,7 +7191,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP @@ -8186,7 +8186,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 7.8780E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 6.4863E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 5.9955E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 5.9955E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 2.8906E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 4.8649E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.4050E+16 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 1706ec4a8f..a37bcc9e84 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1625,7 +1625,7 @@ "dene": 9.8e+19, "denh2o": 985.0, "denhe": 5.4, - "deni": 0.0, + "nd_fuel_ions": 0.0, "denpbli": 9839.0, "densbreed": 0.0, "densin": 0.0, @@ -9280,7 +9280,7 @@ "dene": "electron density (/m3) (`iteration variable 6`) (calculated if `ipedestal=3`)", "denh2o": "density of water (kg/m3)", "denhe": "", - "deni": "fuel ion density (/m3)", + "nd_fuel_ions": "fuel ion density (/m3)", "denpbli": "", "densbreed": "density of breeder material (kg/m3) (`iblanket=2` (KIT HCPB))", "densin": "density at plate (on separatrix) (10**20 /m3)", @@ -19089,7 +19089,7 @@ "f_vol_plasma", "f_r_conducting_wall", "dene", - "deni", + "nd_fuel_ions", "dlamee", "dlamie", "dlimit", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 6afdba7386..f48a68a2af 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -367,7 +367,7 @@ Line-averaged_electron_density_(/m3)____________________________________ (dnla)________________________ 8.8740E+19 OP Line-averaged_electron_density_/_Greenwald_density______________________ (dnla_gw)_____________________ 1.2000E+00 OP Ion_density_(/m3)_______________________________________________________ (nd_ions_total)______________________ 7.1228E+19 OP - Fuel_density_(/m3)______________________________________________________ (deni)________________________ 6.4478E+19 OP + Fuel_density_(/m3)______________________________________________________ (nd_fuel_ions)________________________ 6.4478E+19 OP Total_impurity_density_with_Z_>_2_(no_He)_(/m3)_________________________ (nd_impurities)_________________________ 4.6305E+16 OP Helium_ion_density_(thermalised_ions_only)_(/m3)________________________ (nd_alphas)_______________________ 6.6846E+18 OP Proton_density_(/m3)____________________________________________________ (nd_protons)______________________ 1.8769E+16 OP diff --git a/tests/unit/test_neoclassics.py b/tests/unit/test_neoclassics.py index 18266a99bf..fe616855e6 100644 --- a/tests/unit/test_neoclassics.py +++ b/tests/unit/test_neoclassics.py @@ -32,7 +32,7 @@ class InitNeoclassicsParam(NamedTuple): te: Any = None ti: Any = None dene: Any = None - deni: Any = None + nd_fuel_ions: Any = None densities: Any = None temperatures: Any = None dr_densities: Any = None @@ -81,7 +81,7 @@ class InitNeoclassicsParam(NamedTuple): te=6.0190000000000001, ti=5.7180500000000007, dene=2.07086e20, - deni=1.47415411616e20, + nd_fuel_ions=1.47415411616e20, densities=np.array( np.array((0, 0, 0, 0), order="F"), order="F" ).transpose(), @@ -989,7 +989,9 @@ def test_init_neoclassics(initneoclassicsparam, monkeypatch, neoclassics): monkeypatch.setattr(physics_variables, "te", initneoclassicsparam.te) monkeypatch.setattr(physics_variables, "ti", initneoclassicsparam.ti) monkeypatch.setattr(physics_variables, "dene", initneoclassicsparam.dene) - monkeypatch.setattr(physics_variables, "deni", initneoclassicsparam.deni) + monkeypatch.setattr( + physics_variables, "nd_fuel_ions", initneoclassicsparam.nd_fuel_ions + ) monkeypatch.setattr(neoclassics_module, "densities", initneoclassicsparam.densities) monkeypatch.setattr( neoclassics_module, "temperatures", initneoclassicsparam.temperatures diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 970ecd0606..519e2997d9 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1143,7 +1143,7 @@ class PlasmaCompositionParam(NamedTuple): f_tritium: Any = None - deni: Any = None + nd_fuel_ions: Any = None m_ions_total_amu: Any = None @@ -1225,7 +1225,7 @@ class PlasmaCompositionParam(NamedTuple): expected_m_fuel_amu: Any = None - expected_deni: Any = None + expected_nd_fuel_ions: Any = None expected_m_ions_total_amu: Any = None @@ -1293,7 +1293,7 @@ class PlasmaCompositionParam(NamedTuple): f_alpha_electron=0, m_fuel_amu=0, f_tritium=0.5, - deni=0, + nd_fuel_ions=0, m_ions_total_amu=0, nd_ions_total=0, f_nd_protium_electrons=0, @@ -1349,7 +1349,7 @@ class PlasmaCompositionParam(NamedTuple): ], expected_f_alpha_electron=0.6845930883190634, expected_m_fuel_amu=2.5145269632339478, - expected_deni=5.8589175702454272e19, + expected_nd_fuel_ions=5.8589175702454272e19, expected_m_ions_total_amu=2.7395439636787726, expected_nd_ions_total=6.6125550702454276e19, expected_zeffai=0.43046641789338563, @@ -1411,7 +1411,7 @@ class PlasmaCompositionParam(NamedTuple): f_alpha_electron=0.6845930883190634, m_fuel_amu=2.5, f_tritium=0.5, - deni=5.8589175702454272e19, + nd_fuel_ions=5.8589175702454272e19, m_ions_total_amu=2.7395439636787726, nd_ions_total=6.6125550702454276e19, f_nd_protium_electrons=0, @@ -1467,7 +1467,7 @@ class PlasmaCompositionParam(NamedTuple): ), expected_f_alpha_electron=0.73096121787894142, expected_m_fuel_amu=2.5145269632339478, - expected_deni=5.8576156204039725e19, + expected_nd_fuel_ions=5.8576156204039725e19, expected_m_ions_total_amu=2.739245767577763, expected_nd_ions_total=6.6125550702454276e19, expected_zeffai=0.43056686748101997, @@ -1535,7 +1535,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): physics_variables, "f_tritium", plasmacompositionparam.f_tritium ) - monkeypatch.setattr(physics_variables, "deni", plasmacompositionparam.deni) + monkeypatch.setattr( + physics_variables, "nd_fuel_ions", plasmacompositionparam.nd_fuel_ions + ) monkeypatch.setattr( physics_variables, "m_ions_total_amu", plasmacompositionparam.m_ions_total_amu @@ -1667,7 +1669,9 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): plasmacompositionparam.expected_m_fuel_amu ) - assert physics_variables.deni == pytest.approx(plasmacompositionparam.expected_deni) + assert physics_variables.nd_fuel_ions == pytest.approx( + plasmacompositionparam.expected_nd_fuel_ions + ) assert physics_variables.m_ions_total_amu == pytest.approx( plasmacompositionparam.expected_m_ions_total_amu @@ -1834,7 +1838,7 @@ class PhyauxParam(NamedTuple): dene: Any = None - deni: Any = None + nd_fuel_ions: Any = None nd_alphas: Any = None @@ -1873,7 +1877,7 @@ class PhyauxParam(NamedTuple): burnup_in=0, aspect=3, dene=7.5e19, - deni=5.8589175702454272e19, + nd_fuel_ions=5.8589175702454272e19, nd_alphas=7.5e18, fusion_rate_density_total=1.9852091609123786e17, alpha_rate_density_total=1.973996644759543e17, @@ -1894,7 +1898,7 @@ class PhyauxParam(NamedTuple): burnup_in=0, aspect=3, dene=7.5e19, - deni=5.8576156204039725e19, + nd_fuel_ions=5.8576156204039725e19, nd_alphas=7.5e18, fusion_rate_density_total=1.9843269653375773e17, alpha_rate_density_total=1.9731194318497056e17, @@ -1932,7 +1936,7 @@ def test_phyaux(phyauxparam, monkeypatch, physics): burnup, dntau, figmer, fusrat, qfuel, rndfuel, taup = physics.phyaux( aspect=phyauxparam.aspect, dene=phyauxparam.dene, - deni=phyauxparam.deni, + nd_fuel_ions=phyauxparam.nd_fuel_ions, nd_alphas=phyauxparam.nd_alphas, fusion_rate_density_total=phyauxparam.fusion_rate_density_total, alpha_rate_density_total=phyauxparam.alpha_rate_density_total, diff --git a/tests/unit/test_physics_functions.py b/tests/unit/test_physics_functions.py index 08b305ee16..01b4f3751b 100644 --- a/tests/unit/test_physics_functions.py +++ b/tests/unit/test_physics_functions.py @@ -23,7 +23,7 @@ class SetFusionPowersParam(NamedTuple): dene: Any = None - deni: Any = None + nd_fuel_ions: Any = None nd_ions_total: Any = None From bc8832ffca19dae520261660504335e35c33fabe Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 16:25:46 +0000 Subject: [PATCH 39/48] :art: Update ion density labels for clarity and consistency in output --- process/physics.py | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/process/physics.py b/process/physics.py index b8727374d2..f1b4932ef5 100644 --- a/process/physics.py +++ b/process/physics.py @@ -3986,35 +3986,35 @@ def outplas(self): po.ovarre( self.outfile, - "Ion density (/m3)", + "Total Ion number density (/m3)", "(nd_ions_total)", physics_variables.nd_ions_total, "OP ", ) po.ovarre( self.outfile, - "Fuel density (/m3)", + "Fuel ion number density (/m3)", "(nd_fuel_ions)", physics_variables.nd_fuel_ions, "OP ", ) po.ovarre( self.outfile, - "Total impurity density with Z > 2 (no He) (/m3)", + "Total impurity number density with Z > 2 (no He) (/m3)", "(nd_impurities)", physics_variables.nd_impurities, "OP ", ) po.ovarre( self.outfile, - "Helium ion density (thermalised ions only) (/m3)", + "Helium ion number density (thermalised ions only) (/m3)", "(nd_alphas)", physics_variables.nd_alphas, "OP ", ) po.ovarre( self.outfile, - "Proton density (/m3)", + "Proton number density (/m3)", "(nd_protons)", physics_variables.nd_protons, "OP ", @@ -4099,10 +4099,9 @@ def outplas(self): self.outfile, "Effective charge", "(zeff)", physics_variables.zeff, "OP " ) - # Issue #487. No idea what zeffai is. - # I haven't removed it as it is used in subroutine rether, - # (routine to find the equilibration power between the ions and electrons) - # po.ovarrf(self.outfile,'Mass weighted effective charge','(zeffai)',zeffai, 'OP ') + po.ovarrf( + self.outfile, "Mass-weighted Effective charge", "(zeffai)", physics_variables.zeffai, "OP " + ) po.ovarrf( self.outfile, "Density profile factor", "(alphan)", physics_variables.alphan @@ -4308,13 +4307,12 @@ def outplas(self): "(f_tritium)", physics_variables.f_tritium, ) - if physics_variables.f_helium3 > 1.0e-3: - po.ovarrf( - self.outfile, - "3-Helium fuel fraction", - "(f_helium3)", - physics_variables.f_helium3, - ) + po.ovarrf( + self.outfile, + "3-Helium fuel fraction", + "(f_helium3)", + physics_variables.f_helium3, + ) po.osubhd(self.outfile, "Fusion Powers :") po.ocmmnt( From 09f29ad4b72e1918e07342d29cfd84184f296545 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 16:31:21 +0000 Subject: [PATCH 40/48] :fire: Remove the ATOMIC_MASS_DEUTERIUM and ATOMIC_MASS_TRITIUM from physics_functions.py and use new values from constants.f90 --- process/physics.py | 6 +++++- process/physics_functions.py | 28 +++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/process/physics.py b/process/physics.py index f1b4932ef5..20f5e455f0 100644 --- a/process/physics.py +++ b/process/physics.py @@ -4100,7 +4100,11 @@ def outplas(self): ) po.ovarrf( - self.outfile, "Mass-weighted Effective charge", "(zeffai)", physics_variables.zeffai, "OP " + self.outfile, + "Mass-weighted Effective charge", + "(zeffai)", + physics_variables.zeffai, + "OP ", ) po.ovarrf( diff --git a/process/physics_functions.py b/process/physics_functions.py index ff6b08af1e..25af336079 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -10,12 +10,6 @@ logger = logging.getLogger(__name__) -# https://physics.nist.gov/cgi-bin/cuu/Value?mdu|search_for=deuteron -ATOMIC_MASS_DEUTERIUM = 2.013553212544 - -# https://physics.nist.gov/cgi-bin/cuu/Value?mtu|search_for=triton -ATOMIC_MASS_TRITIUM = 3.01550071597 - REACTION_CONSTANTS_DT = { "bg": 34.3827, "mrc2": 1.124656e6, @@ -1061,8 +1055,8 @@ def beam_fusion( beam_slow_time = ( 1.99e19 * ( - ATOMIC_MASS_DEUTERIUM * (1.0 - f_tritium_beam) - + (ATOMIC_MASS_TRITIUM * f_tritium_beam) + constants.m_deuteron_amu * (1.0 - f_tritium_beam) + + (constants.m_triton_amu * f_tritium_beam) ) * (ten**1.5 / dene) / ion_electron_coulomb_log @@ -1073,14 +1067,14 @@ def beam_fusion( # Taken from J.W Sheffield, “The physics of magnetic fusion reactors,” critical_energy_deuterium = ( 14.8 - * ATOMIC_MASS_DEUTERIUM + * constants.m_deuteron_amu * ten * zeffai ** (2 / 3) * (ion_electron_coulomb_log + 4.0) / ion_electron_coulomb_log ) critical_energy_tritium = critical_energy_deuterium * ( - ATOMIC_MASS_TRITIUM / ATOMIC_MASS_DEUTERIUM + constants.m_triton_amu / constants.m_deuteron_amu ) # Deuterium and tritium ion densities @@ -1231,7 +1225,7 @@ def beamcalc( 2.0 * constants.kiloelectron_volt * critical_energy_deuterium - / (constants.atomic_mass_unit * ATOMIC_MASS_DEUTERIUM) + / (constants.atomic_mass_unit * constants.m_deuteron_amu) ) # Find the speed of the tritium particle when it has the critical energy. @@ -1240,7 +1234,7 @@ def beamcalc( 2.0 * constants.kiloelectron_volt * critical_energy_tritium - / (constants.atomic_mass_unit * ATOMIC_MASS_TRITIUM) + / (constants.atomic_mass_unit * constants.m_triton_amu) ) # Source term representing the number of ions born per unit time per unit volume. @@ -1252,7 +1246,7 @@ def beamcalc( source_tritium = beam_current_tritium / (constants.electron_charge * vol_plasma) pressure_coeff_deuterium = ( - ATOMIC_MASS_DEUTERIUM + constants.m_deuteron_amu * constants.atomic_mass_unit * beam_slow_time * deuterium_critical_energy_speed**2 @@ -1260,7 +1254,7 @@ def beamcalc( / (constants.kiloelectron_volt * 3.0) ) pressure_coeff_tritium = ( - ATOMIC_MASS_TRITIUM + constants.m_triton_amu * constants.atomic_mass_unit * beam_slow_time * tritium_critical_energy_speed**2 @@ -1288,11 +1282,11 @@ def beamcalc( ) / hot_beam_density hot_deuterium_rate = 1e-4 * beam_reaction_rate( - ATOMIC_MASS_DEUTERIUM, deuterium_critical_energy_speed, beam_energy + constants.m_deuteron_amu, deuterium_critical_energy_speed, beam_energy ) hot_tritium_rate = 1e-4 * beam_reaction_rate( - ATOMIC_MASS_TRITIUM, tritium_critical_energy_speed, beam_energy + constants.m_triton_amu, tritium_critical_energy_speed, beam_energy ) deuterium_beam_alpha_power = alpha_power_beam( @@ -1527,7 +1521,7 @@ def _beam_fusion_cross_section(vrelsq: float) -> float: a5 = 4.09e2 # Beam kinetic energy - beam_energy = 0.5 * ATOMIC_MASS_DEUTERIUM * vrelsq + beam_energy = 0.5 * constants.m_deuteron_amu * vrelsq # Set limits on cross-section at low and high beam energies if beam_energy < 10.0: From daad9e0ebb6ef96f74393ea196fa0a62c8c83ebb Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 17:10:03 +0000 Subject: [PATCH 41/48] :memo: Add output for average mass of fuel and beam ions in physics calculations --- process/physics.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/process/physics.py b/process/physics.py index 20f5e455f0..0c5bceaf30 100644 --- a/process/physics.py +++ b/process/physics.py @@ -4089,11 +4089,21 @@ def outplas(self): physics_variables.m_ions_total_amu, "OP ", ) - # MDK Say which impurity is varied, if iteration variable fimpvar (102) is turned on - # if (any(ixc == 102)) : - # call ovarst(self.outfile,'Impurity used as an iteration variable' , '', '"' // impurity_arr(impvar)%label // '"') - # po.ovarre(self.outfile,'Fractional density of variable impurity (ion / electron density)','(fimpvar)',fimpvar) - # + po.ovarre( + self.outfile, + "Average mass of all fuel ions (amu)", + "(m_fuel_amu)", + physics_variables.m_fuel_amu, + "OP ", + ) + po.ovarre( + self.outfile, + "Average mass of all beam ions (amu)", + "(m_beam_amu)", + physics_variables.m_beam_amu, + "OP ", + ) + po.oblnkl(self.outfile) po.ovarrf( self.outfile, "Effective charge", "(zeff)", physics_variables.zeff, "OP " From e12e24cd4a8efbde053ec99076c67e387951dcd4 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 17:18:39 +0000 Subject: [PATCH 42/48] =?UTF-8?q?=F0=9F=9A=9A=20Move=20density=20limit=20o?= =?UTF-8?q?utput=20to=20correct=20section?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/physics.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/process/physics.py b/process/physics.py index 0c5bceaf30..d375dd94c2 100644 --- a/process/physics.py +++ b/process/physics.py @@ -4034,21 +4034,6 @@ def outplas(self): physics_variables.nd_beam_ions, "OP ", ) - po.ovarre( - self.outfile, - "Density limit from scaling (/m3)", - "(dnelimt)", - physics_variables.dnelimt, - "OP ", - ) - if (numerics.ioptimz > 0) and (numerics.active_constraints[4]): - po.ovarre( - self.outfile, - "Density limit (enforced) (/m3)", - "(boundu(9)*dnelimt)", - numerics.boundu[8] * physics_variables.dnelimt, - "OP ", - ) po.ovarre( self.outfile, @@ -4307,6 +4292,21 @@ def outplas(self): physics_variables.dlimit[7], "OP ", ) + po.ovarre( + self.outfile, + "Density limit from scaling (/m3)", + "(dnelimt)", + physics_variables.dnelimt, + "OP ", + ) + if (numerics.ioptimz > 0) and (numerics.active_constraints[4]): + po.ovarre( + self.outfile, + "Density limit (enforced) (/m3)", + "(boundu(9)*dnelimt)", + numerics.boundu[8] * physics_variables.dnelimt, + "OP ", + ) po.osubhd(self.outfile, "Fuel Constituents :") po.ovarrf( From 9693f6d4644dd91377c91a4879618f6794d914d7 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 17:40:39 +0000 Subject: [PATCH 43/48] :art: Update output labels for electron and ion densities for clarity and consistency --- process/physics.py | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/process/physics.py b/process/physics.py index d375dd94c2..5c873eb64d 100644 --- a/process/physics.py +++ b/process/physics.py @@ -3912,7 +3912,7 @@ def outplas(self): po.osubhd(self.outfile, "Temperature and Density (volume averaged) :") po.ovarrf( - self.outfile, "Electron temperature (keV)", "(te)", physics_variables.te + self.outfile, "Volume averaged electron temperature (keV)", "(te)", physics_variables.te ) po.ovarrf( self.outfile, @@ -3944,18 +3944,18 @@ def outplas(self): "OP ", ) po.ovarre( - self.outfile, "Electron density (/m3)", "(dene)", physics_variables.dene + self.outfile, "Volume averaged electron number density (/m3)", "(dene)", physics_variables.dene ) po.ovarre( self.outfile, - "Electron density on axis (/m3)", + "Electron number density on axis (/m3)", "(ne0)", physics_variables.ne0, "OP ", ) po.ovarre( self.outfile, - "Line-averaged electron density (/m3)", + "Line-averaged electron number density (/m3)", "(dnla)", physics_variables.dnla, "OP ", @@ -4012,6 +4012,12 @@ def outplas(self): physics_variables.nd_alphas, "OP ", ) + po.ovarre( + self.outfile, + "Helium ion density (thermalised ions only) / electron number density", + "(f_nd_alpha_electron)", + physics_variables.f_nd_alpha_electron, + ) po.ovarre( self.outfile, "Proton number density (/m3)", @@ -4019,28 +4025,29 @@ def outplas(self): physics_variables.nd_protons, "OP ", ) - if physics_variables.f_nd_protium_electrons > 1.0e-10: - po.ovarre( - self.outfile, - "Seeded f_nd_protium_electrons density / electron density", - "(f_nd_protium_electrons)", - physics_variables.f_nd_protium_electrons, - ) + po.ovarre( + self.outfile, + "Proton number density / electron number density", + "(f_nd_protium_electrons)", + physics_variables.f_nd_protium_electrons, + "OP ", + ) po.ovarre( self.outfile, - "Hot beam density (/m3)", + "Hot beam ion number density (/m3)", "(nd_beam_ions)", physics_variables.nd_beam_ions, "OP ", ) - po.ovarre( self.outfile, - "Helium ion density (thermalised ions only) / electron density", - "(f_nd_alpha_electron)", - physics_variables.f_nd_alpha_electron, + "Hot beam ion number density / electron density", + "(f_nd_beam_electron)", + physics_variables.f_nd_beam_electron, + "OP ", ) + po.oblnkl(self.outfile) po.ocmmnt(self.outfile, "Impurities") From c072d63271f44b5d5511c3f852809bf059fe674e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 17:49:25 +0000 Subject: [PATCH 44/48] :art: Add new variable mappings for peak factor, impurities, and beam electrons in obsolete_vars.py --- process/io/obsolete_vars.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index f4eae8d980..e597eded2c 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -153,6 +153,13 @@ "cwrmax": "f_r_conducting_wall", "ishape": "i_plasma_geometry", "iscrp": "i_plasma_wall_gap", + "peakfactrad": "f_fw_rad_max", + "nimp": "n_impurities", + "ssync": "f_sync_reflect", + "rnbeam": "f_nd_beam_electron", + "ralpne": "f_nd_alpha_electron", + "protium": "f_nd_protium_electrons", + } OBS_VARS_HELP = { From a1c90fcb98e3cef28bbbe28a4819b8e9442c8a31 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 18:05:56 +0000 Subject: [PATCH 45/48] :art: Clean up obsolete_vars.py and add separators in physics.py for better readability --- process/io/obsolete_vars.py | 1 - process/physics.py | 46 +++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index e597eded2c..57f1fd10ce 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -159,7 +159,6 @@ "rnbeam": "f_nd_beam_electron", "ralpne": "f_nd_alpha_electron", "protium": "f_nd_protium_electrons", - } OBS_VARS_HELP = { diff --git a/process/physics.py b/process/physics.py index 5c873eb64d..e6a8ec248a 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2703,6 +2703,8 @@ def plasma_composition() -> None: physics_variables.dene * physics_variables.f_nd_alpha_electron ) + # ====================================================================== + # Protons # This calculation will be wrong on the first call as the particle # production rates are evaluated later in the calling sequence @@ -2721,6 +2723,8 @@ def plasma_composition() -> None: / physics_variables.alpha_rate_density_total, ) + # ====================================================================== + # Beam hot ion component # If ignited, prevent beam fusion effects if physics_variables.ignite == 0: @@ -2730,6 +2734,8 @@ def plasma_composition() -> None: else: physics_variables.nd_beam_ions = 0.0 + # ====================================================================== + # Sum of Zi.ni for all impurity ions (those with charge > helium) znimp = 0.0 for imp in range(impurity_radiation_module.n_impurities): @@ -2741,6 +2747,8 @@ def plasma_composition() -> None: * physics_variables.dene ) + # ====================================================================== + # Fuel portion - conserve charge neutrality # znfuel is the sum of Zi.ni for the three fuel ions znfuel = ( @@ -2751,11 +2759,15 @@ def plasma_composition() -> None: - znimp ) + # ====================================================================== + # Fuel ion density, nd_fuel_ions # For D-T-He3 mix, nd_fuel_ions = nD + nT + nHe3, while znfuel = nD + nT + 2*nHe3 # So nd_fuel_ions = znfuel - nHe3 = znfuel - f_helium3*nd_fuel_ions physics_variables.nd_fuel_ions = znfuel / (1.0 + physics_variables.f_helium3) + # ====================================================================== + # Set hydrogen and helium impurity fractions for # radiation calculations impurity_radiation_module.impurity_arr_frac[ @@ -2776,6 +2788,8 @@ def plasma_composition() -> None: + physics_variables.f_nd_alpha_electron ) + # ====================================================================== + # Total impurity density physics_variables.nd_impurities = 0.0 for imp in range(impurity_radiation_module.n_impurities): @@ -2785,6 +2799,8 @@ def plasma_composition() -> None: * physics_variables.dene ) + # ====================================================================== + # Total ion density physics_variables.nd_ions_total = ( physics_variables.nd_fuel_ions @@ -2794,7 +2810,9 @@ def plasma_composition() -> None: + physics_variables.nd_impurities ) - # Set some (obsolescent) impurity fraction variables + # ====================================================================== + + # Set some impurity fraction variables # for the benefit of other routines physics_variables.rncne = impurity_radiation_module.impurity_arr_frac[ impurity_radiation.element2index("C_") @@ -2811,6 +2829,8 @@ def plasma_composition() -> None: ] ) + # ====================================================================== + # Effective charge # Calculation should be sum(ni.Zi^2) / sum(ni.Zi), # but ne = sum(ni.Zi) through quasineutrality @@ -2824,6 +2844,8 @@ def plasma_composition() -> None: ** 2 ) + # ====================================================================== + # Fraction of alpha energy to ions and electrons # From Max Fenstermacher # (used with electron and ion power balance equations only) @@ -2847,6 +2869,8 @@ def plasma_composition() -> None: ) physics_variables.f_alpha_ion = 1.0 - physics_variables.f_alpha_electron + # ====================================================================== + # Average atomic masses of injected fuel species physics_variables.m_fuel_amu = ( (constants.m_deuteron_amu * physics_variables.f_deuterium) @@ -2854,13 +2878,17 @@ def plasma_composition() -> None: + (constants.m_helion_amu * physics_variables.f_helium3) ) + # ====================================================================== + # Average atomic masses of injected fuel species in the neutral beams # Only deuterium and tritium in the beams physics_variables.m_beam_amu = ( constants.m_deuteron_amu * (1.0 - current_drive_variables.f_tritium_beam) ) + (constants.m_triton_amu * current_drive_variables.f_tritium_beam) - # Density weighted mass + # ====================================================================== + + # Average mass of all ions physics_variables.m_ions_total_amu = ( (physics_variables.m_fuel_amu * physics_variables.nd_fuel_ions) + (constants.m_alpha_amu * physics_variables.nd_alphas) @@ -2879,6 +2907,8 @@ def plasma_composition() -> None: physics_variables.m_ions_total_amu / physics_variables.nd_ions_total ) + # ====================================================================== + # Mass weighted plasma effective charge # Sum of (Zi^2*n_i) / m_i physics_variables.zeffai = ( @@ -2922,6 +2952,8 @@ def plasma_composition() -> None: / impurity_radiation_module.impurity_arr_amass[imp] ) + # ====================================================================== + @staticmethod def phyaux( aspect, @@ -3912,7 +3944,10 @@ def outplas(self): po.osubhd(self.outfile, "Temperature and Density (volume averaged) :") po.ovarrf( - self.outfile, "Volume averaged electron temperature (keV)", "(te)", physics_variables.te + self.outfile, + "Volume averaged electron temperature (keV)", + "(te)", + physics_variables.te, ) po.ovarrf( self.outfile, @@ -3944,7 +3979,10 @@ def outplas(self): "OP ", ) po.ovarre( - self.outfile, "Volume averaged electron number density (/m3)", "(dene)", physics_variables.dene + self.outfile, + "Volume averaged electron number density (/m3)", + "(dene)", + physics_variables.dene, ) po.ovarre( self.outfile, From ae33c608a098f54772b19771e840458b62ef448f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 24 Jan 2025 18:10:44 +0000 Subject: [PATCH 46/48] :art: Enhance plasma composition documentation with impurity species indices and iteration variables --- .../physics-models/plasma_composition.md | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_composition.md b/documentation/proc-pages/physics-models/plasma_composition.md index e6a511505c..1c4cb46479 100644 --- a/documentation/proc-pages/physics-models/plasma_composition.md +++ b/documentation/proc-pages/physics-models/plasma_composition.md @@ -15,23 +15,23 @@ $$ The impurity number density fractions relative to the electron density are constant and are set -using input array `fimp(1,...,14)`. The available species are as follows: +using input array `fimp(1,...,14)`. The available species along with their `fimp()` index and iteration variable number are as follows: - `fimp(1)`: Hydrogen isotopes (fraction calculated by code) - `fimp(2)`: Helium (fraction calculated by code) -- `fimp(3)`: Beryllium -- `fimp(4)`: Carbon -- `fimp(5)`: Nitrogen -- `fimp(6)`: Oxygen -- `fimp(7)`: Neon -- `fimp(8)`: Silicon -- `fimp(9)`: Argon -- `fimp(10)`: Iron -- `fimp(11)`: Nickel -- `fimp(12)`: Krypton -- `fimp(13)`: Xenon -- `fimp(14)`: Tungsten +- `fimp(3)`: Beryllium, (`ixc = 125`) +- `fimp(4)`: Carbon, (`ixc = 126`) +- `fimp(5)`: Nitrogen, (`ixc = 127`) +- `fimp(6)`: Oxygen, (`ixc = 128`) +- `fimp(7)`: Neon, (`ixc = 129`) +- `fimp(8)`: Silicon, (`ixc = 130`) +- `fimp(9)`: Argon, (`ixc = 131`) +- `fimp(10)`: Iron, (`ixc = 132`) +- `fimp(11)`: Nickel, (`ixc = 133`) +- `fimp(12)`: Krypton, (`ixc = 134`) +- `fimp(13)`: Xenon, (`ixc = 135`) +- `fimp(14)`: Tungsten, (`ixc = 136`) As stated above, the number density fractions for hydrogen (all isotopes) and helium need not be set, as they are calculated by the code to ensure From fecf4a80a63e37b824e1ed36dc0a425fa993407a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 27 Jan 2025 16:11:48 +0000 Subject: [PATCH 47/48] Requested review changes --- .../physics-models/plasma_composition.md | 4 ++-- process/physics.py | 17 +++++------------ process/physics_functions.py | 4 ++-- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_composition.md b/documentation/proc-pages/physics-models/plasma_composition.md index 1c4cb46479..882abf8f6b 100644 --- a/documentation/proc-pages/physics-models/plasma_composition.md +++ b/documentation/proc-pages/physics-models/plasma_composition.md @@ -34,7 +34,7 @@ using input array `fimp(1,...,14)`. The available species along with their `fimp - `fimp(14)`: Tungsten, (`ixc = 136`) As stated above, the number density fractions for hydrogen (all isotopes) and -helium need not be set, as they are calculated by the code to ensure +helium should not be set, as they are calculated by the code. This is to ensure plasma quasi-neutrality taking into account the fuel ratios `f_deuterium`, `f_tritium` and `f_helium3`, and the alpha particle fraction `f_nd_alpha_electron` which may be input by the user or selected as an iteration variable. @@ -108,7 +108,7 @@ All of the plasma composites are normally given as a fraction of the volume aver 6. **Fuel Ion Density Calculation** $$ - \mathtt{nd_fuel_ions} | n_{\text{i}} = \frac{\mathtt{znfuel}}{1+f_{\text{3He}}} + \mathtt{nd\_fuel\_ions} | n_{\text{i}} = \frac{\mathtt{znfuel}}{1+f_{\text{3He}}} $$ - Calculate the fuel ion density (`nd_fuel_ions`). diff --git a/process/physics.py b/process/physics.py index e6a8ec248a..dfab8b8002 100644 --- a/process/physics.py +++ b/process/physics.py @@ -7575,27 +7575,16 @@ def res_diff_time(rmajor, res_plasma, kappa95): def pthresh( - dene, - dnla, - bt, - rmajor, - rminor, - kappa, - a_plasma_surface, - m_ions_total_amu, - aspect, - plasma_current, -, ): """L-mode to H-mode power threshold calculation @@ -7647,7 +7636,11 @@ def pthresh( # Martin et al (2008) for recent ITER scaling, with mass correction # and 95% confidence limits martin = ( - 0.0488 * dnla20**0.717 * bt**0.803 * a_plasma_surface**0.941 * (2.0 / m_ions_total_amu) + 0.0488 + * dnla20**0.717 + * bt**0.803 + * a_plasma_surface**0.941 + * (2.0 / m_ions_total_amu) ) martin_error = ( np.sqrt( diff --git a/process/physics_functions.py b/process/physics_functions.py index 25af336079..ea7de870e9 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -607,10 +607,10 @@ def psync_albajar_fidone() -> float: References: - F. Albajar, J. Johner, and G. Granata, “Improved calculation of synchrotron radiation losses in realistic tokamak plasmas,” - Nuclear Fusion, vol. 41, no. 6, pp. 665–678, Jun. 2001, doi: https://doi.org/10.1088/0029-5515/41/6/301. + Nuclear Fusion, vol. 41, no. 6, pp. 665-678, Jun. 2001, doi: https://doi.org/10.1088/0029-5515/41/6/301. ‌ - I. Fidone, G Giruzzi, and G. Granata, “Synchrotron radiation loss in tokamaks of arbitrary geometry,” - Nuclear Fusion, vol. 41, no. 12, pp. 1755–1758, Dec. 2001, doi: https://doi.org/10.1088/0029-5515/41/12/102. + Nuclear Fusion, vol. 41, no. 12, pp. 1755-1758, Dec. 2001, doi: https://doi.org/10.1088/0029-5515/41/12/102. ‌ """ From 924826de5780c98702707449528e2ac8a05f958e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 29 Jan 2025 08:40:39 +0000 Subject: [PATCH 48/48] :art: Refactor total calculation in Power class for improved readability --- process/power.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/process/power.py b/process/power.py index 334495d61c..0ac6924aac 100644 --- a/process/power.py +++ b/process/power.py @@ -1601,7 +1601,9 @@ def power2(self, output: bool): physics_variables.pscalingmw + physics_variables.p_plasma_inner_rad_mw, "OP ", ) - total = physics_variables.pscalingmw + physics_variables.p_plasma_inner_rad_mw + total = ( + physics_variables.pscalingmw + physics_variables.p_plasma_inner_rad_mw + ) elif physics_variables.iradloss == 2: po.ocmmnt( self.outfile,