From 0f3df38a3c4883c315794012b8a87f188cc2a466 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 13:21:30 +0000 Subject: [PATCH 01/13] =?UTF-8?q?=F0=9F=94=84=20Rename=20pcoreradpv=20to?= =?UTF-8?q?=20pden=5Fplasma=5Fcore=5Frad=5Fmw=20for=20clarity=20and=20cons?= =?UTF-8?q?istency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/physics-models/error.txt | 2 +- process/physics.py | 18 +++++----- process/physics_functions.py | 10 +++--- process/stellarator.py | 16 +++++---- source/fortran/constraint_equations.f90 | 12 +++---- source/fortran/physics_variables.f90 | 4 +-- tests/integration/ref_dicts.json | 6 ++-- tests/unit/test_physics.py | 36 +++++++++---------- tests/unit/test_stellarator.py | 12 ++++--- 9 files changed, 62 insertions(+), 54 deletions(-) diff --git a/documentation/proc-pages/physics-models/error.txt b/documentation/proc-pages/physics-models/error.txt index 7c53d04b71..7915a391db 100644 --- a/documentation/proc-pages/physics-models/error.txt +++ b/documentation/proc-pages/physics-models/error.txt @@ -999,7 +999,7 @@ radiation \texttt{i_rad_loss\ =\ 1} -- Total power lost is scaling power plus core radiation only -\texttt{pscaling\ +\ pcoreradpv\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ pinjmw/vol_plasma} +\texttt{pscaling\ +\ pden_plasma_core_rad_mw\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ pinjmw/vol_plasma} \texttt{i_rad_loss\ =\ 2} -- Total power lost is scaling power only, with no additional allowance for radiation. This is not recommended for power diff --git a/process/physics.py b/process/physics.py index eadcc389b8..664d9569f8 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2178,12 +2178,12 @@ def physics(self): radpwrdata = physics_funcs.calculate_radiation_powers(self.plasma_profile) physics_variables.pden_plasma_sync_mw = radpwrdata.pden_plasma_sync_mw - physics_variables.pcoreradpv = radpwrdata.pcoreradpv + physics_variables.pden_plasma_core_rad_mw = radpwrdata.pden_plasma_core_rad_mw physics_variables.pedgeradpv = radpwrdata.pedgeradpv 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 + physics_variables.pden_plasma_core_rad_mw * physics_variables.vol_plasma ) physics_variables.p_plasma_outer_rad_mw = ( physics_variables.pedgeradpv * physics_variables.vol_plasma @@ -2313,7 +2313,7 @@ def physics(self): physics_variables.non_alpha_charged_power, current_drive_variables.pinjmw, physics_variables.plasma_current, - physics_variables.pcoreradpv, + physics_variables.pden_plasma_core_rad_mw, physics_variables.rmajor, physics_variables.rminor, physics_variables.ten, @@ -5885,7 +5885,7 @@ def output_confinement_comparison(self, istell: int) -> None: physics_variables.non_alpha_charged_power, current_drive_variables.pinjmw, physics_variables.plasma_current, - physics_variables.pcoreradpv, + physics_variables.pden_plasma_core_rad_mw, physics_variables.rmajor, physics_variables.rminor, physics_variables.ten, @@ -6685,7 +6685,7 @@ def fhz(hfact: float) -> float: physics_variables.non_alpha_charged_power, current_drive_variables.pinjmw, physics_variables.plasma_current, - physics_variables.pcoreradpv, + physics_variables.pden_plasma_core_rad_mw, physics_variables.rmajor, physics_variables.rminor, physics_variables.ten, @@ -6716,7 +6716,7 @@ def fhz(hfact: float) -> float: if physics_variables.i_rad_loss == 0: fhz_value += physics_variables.pden_plasma_rad_mw elif physics_variables.i_rad_loss == 1: - fhz_value += physics_variables.pcoreradpv + fhz_value += physics_variables.pden_plasma_core_rad_mw return fhz_value @@ -6740,7 +6740,7 @@ def calculate_confinement_time( non_alpha_charged_power: float, pinjmw: float, plasma_current: float, - pcoreradpv: float, + pden_plasma_core_rad_mw: float, rmajor: float, rminor: float, ten: float, @@ -6769,7 +6769,7 @@ def calculate_confinement_time( :param non_alpha_charged_power: Non-alpha charged particle fusion power (MW) :param pinjmw: Auxiliary power to ions and electrons (MW) :param plasma_current: Plasma current (A) - :param pcoreradpv: Total core radiation power (MW/m3) + :param pden_plasma_core_rad_mw: Total core radiation power (MW/m3) :param q95: Edge safety factor (tokamaks), or rotational transform iotabar (stellarators) :param qstar: Equivalent cylindrical edge safety factor :param rmajor: Plasma major radius (m) @@ -6809,7 +6809,7 @@ def calculate_confinement_time( ) elif physics_variables.i_rad_loss == 1: p_plasma_loss_mw = ( - p_plasma_loss_mw - pcoreradpv * vol_plasma + p_plasma_loss_mw - pden_plasma_core_rad_mw * vol_plasma ) # shouldn't this be vol_core instead of vol_plasma? # else do not adjust p_plasma_loss_mw for radiation diff --git a/process/physics_functions.py b/process/physics_functions.py index ea7de870e9..8528dffab5 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -550,7 +550,7 @@ class RadpwrData: """DataClass which holds the output of the function radpwr""" pden_plasma_sync_mw: float - pcoreradpv: float + pden_plasma_core_rad_mw: float pedgeradpv: float pden_plasma_rad_mw: float @@ -569,7 +569,7 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: Returns: RadpwrData: A dataclass containing the following radiation power densities: - 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). + - pden_plasma_core_rad_mw (float): Total core radiation power per unit volume (MW/m^3). - pedgeradpv (float): Edge radiation power per unit volume (MW/m^3). - pden_plasma_rad_mw (float): Total radiation power per unit volume (MW/m^3). @@ -585,12 +585,14 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: pden_plasma_sync_mw = psync_albajar_fidone() # Total core radiation power/volume. - pcoreradpv = imp_rad.radcore + pden_plasma_sync_mw + pden_plasma_core_rad_mw = imp_rad.radcore + pden_plasma_sync_mw # Total radiation power/volume. pden_plasma_rad_mw = imp_rad.radtot + pden_plasma_sync_mw - return RadpwrData(pden_plasma_sync_mw, pcoreradpv, pedgeradpv, pden_plasma_rad_mw) + return RadpwrData( + pden_plasma_sync_mw, pden_plasma_core_rad_mw, pedgeradpv, pden_plasma_rad_mw + ) def psync_albajar_fidone() -> float: diff --git a/process/stellarator.py b/process/stellarator.py index 3eceb1b9d5..e18c443843 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4310,15 +4310,17 @@ def stphys(self, output): # Calculate radiation power radpwr_data = physics_funcs.calculate_radiation_powers(self.plasma_profile) physics_variables.pden_plasma_sync_mw = radpwr_data.pden_plasma_sync_mw - physics_variables.pcoreradpv = radpwr_data.pcoreradpv + physics_variables.pden_plasma_core_rad_mw = radpwr_data.pden_plasma_core_rad_mw physics_variables.pedgeradpv = radpwr_data.pedgeradpv physics_variables.pden_plasma_rad_mw = radpwr_data.pden_plasma_rad_mw - physics_variables.pcoreradpv = max(physics_variables.pcoreradpv, 0.0e0) + physics_variables.pden_plasma_core_rad_mw = max( + physics_variables.pden_plasma_core_rad_mw, 0.0e0 + ) physics_variables.pedgeradpv = max(physics_variables.pedgeradpv, 0.0e0) physics_variables.p_plasma_inner_rad_mw = ( - physics_variables.pcoreradpv * physics_variables.vol_plasma + physics_variables.pden_plasma_core_rad_mw * physics_variables.vol_plasma ) # Should probably be vol_core physics_variables.p_plasma_outer_rad_mw = ( physics_variables.pedgeradpv * physics_variables.vol_plasma @@ -4441,7 +4443,7 @@ def stphys(self, output): physics_variables.non_alpha_charged_power, current_drive_variables.pinjmw, physics_variables.plasma_current, - physics_variables.pcoreradpv, + physics_variables.pden_plasma_core_rad_mw, physics_variables.rmajor, physics_variables.rminor, physics_variables.ten, @@ -4701,7 +4703,7 @@ def calc_neoclassics(self): ( physics_variables.f_alpha_plasma * physics_variables.alpha_power_density_total - - physics_variables.pcoreradpv + - physics_variables.pden_plasma_core_rad_mw ) * physics_variables.vol_plasma / physics_variables.a_plasma_surface @@ -4711,7 +4713,7 @@ def calc_neoclassics(self): ( physics_variables.f_alpha_plasma * physics_variables.alpha_power_density_total - - physics_variables.pcoreradpv + - physics_variables.pden_plasma_core_rad_mw ) * physics_variables.vol_plasma / physics_variables.a_plasma_surface @@ -4848,7 +4850,7 @@ def st_calc_eff_chi(self): nominator = ( physics_variables.f_alpha_plasma * physics_variables.alpha_power_density_total - - physics_variables.pcoreradpv + - physics_variables.pden_plasma_core_rad_mw ) * volscaling # in fortran there was a 0*alphan term which I have removed for obvious reasons diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index d55242194b..16183e7f06 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) !! pden_electron_transport_loss_mw : input real : electron transport power per volume (MW/m3) !! pden_ion_transport_loss_mw : input real : ion transport 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) + !! pden_plasma_core_rad_mw : 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) !! charged_power_density : input real : non-alpha charged particle fusion power per volume (MW/m3) @@ -459,7 +459,7 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! vol_plasma : input real : plasma volume (m3) use physics_variables, only: i_rad_loss, ignite, pden_electron_transport_loss_mw, pden_ion_transport_loss_mw, pden_plasma_rad_mw, & - pcoreradpv, f_alpha_plasma, alpha_power_density_total, charged_power_density, & + pden_plasma_core_rad_mw, f_alpha_plasma, alpha_power_density_total, charged_power_density, & pden_plasma_ohmic_mw, vol_plasma use current_drive_variables, only: pinjmw @@ -480,7 +480,7 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) if (i_rad_loss == 0) then pnumerator = pscaling + pden_plasma_rad_mw else if (i_rad_loss == 1) then - pnumerator = pscaling + pcoreradpv + pnumerator = pscaling + pden_plasma_core_rad_mw else pnumerator = pscaling end if @@ -569,13 +569,13 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !!
  • = 1 assume ignited (but include auxiliary power in costs) !! pden_electron_transport_loss_mw : input real : electron transport 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) + !! pden_plasma_core_rad_mw : 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) !! piepv : input real : ion/electron equilibration power per volume (MW/m3) !! pinjemw : input real : auxiliary injected power to electrons (MW) !! vol_plasma : input real : plasma volume (m3) - use physics_variables, only: i_rad_loss, ignite, pden_electron_transport_loss_mw, pcoreradpv, f_alpha_plasma, & + use physics_variables, only: i_rad_loss, ignite, pden_electron_transport_loss_mw, pden_plasma_core_rad_mw, f_alpha_plasma, & alpha_power_electron_density, piepv, vol_plasma, pden_plasma_rad_mw use current_drive_variables, only: pinjemw implicit none @@ -593,7 +593,7 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) if (i_rad_loss == 0) then pnumerator = pscaling + pden_plasma_rad_mw else if (i_rad_loss == 1) then - pnumerator = pscaling + pcoreradpv + pnumerator = pscaling + pden_plasma_core_rad_mw else pnumerator = pscaling end if diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 3b30a00398..fca5d23c43 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -591,7 +591,7 @@ module physics_variables real(dp) :: p_plasma_inner_rad_mw !! radiation power from inner zone (MW) - real(dp) :: pcoreradpv + real(dp) :: pden_plasma_core_rad_mw !! total core radiation power per volume (MW/m3) real(dp) :: dd_power @@ -1030,7 +1030,7 @@ subroutine init_physics_variables charged_power_density = 0.0D0 pcoef = 0.0D0 p_plasma_inner_rad_mw = 0.0D0 - pcoreradpv = 0.0D0 + pden_plasma_core_rad_mw = 0.0D0 dd_power = 0.0D0 dhe3_power = 0.0D0 pdivt = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 219ded77e0..5b5bbbb06c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3484,7 +3484,7 @@ "non_alpha_charged_power": 0.0, "charged_power_density": 0.0, "pcoef": 0.0, - "pcoreradpv": 0.0, + "pden_plasma_core_rad_mw": 0.0, "pcoresystems": 0.0, "dd_power": 0.0, "dhe3_power": 0.0, @@ -10243,7 +10243,7 @@ "non_alpha_charged_power": "non-alpha charged particle fusion power (MW)", "charged_power_density": "non-alpha charged particle fusion power per volume (MW/m3)", "pcoef": "profile factor (= n-weighted T / average T)", - "pcoreradpv": "total core radiation power per volume (MW/m3)", + "pden_plasma_core_rad_mw": "total core radiation power per volume (MW/m3)", "pcoresystems": "", "dd_power": "deuterium-deuterium fusion power (MW)", "dhe3_power": "deuterium-helium3 fusion power (MW)", @@ -19170,7 +19170,7 @@ "charged_power_density", "pcoef", "p_plasma_inner_rad_mw", - "pcoreradpv", + "pden_plasma_core_rad_mw", "dd_power", "dhe3_power", "pdivt", diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 2bbc0069ab..f44d667a39 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -2244,7 +2244,7 @@ class ConfinementTimeParam(NamedTuple): plasma_current: Any = None - pcoreradpv: Any = None + pden_plasma_core_rad_mw: Any = None q95: Any = None @@ -2309,7 +2309,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2351,7 +2351,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2393,7 +2393,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2435,7 +2435,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2477,7 +2477,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2519,7 +2519,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2561,7 +2561,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2603,7 +2603,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2645,7 +2645,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2687,7 +2687,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2729,7 +2729,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2771,7 +2771,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2813,7 +2813,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2855,7 +2855,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2897,7 +2897,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -2939,7 +2939,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power=1.2453296074483358, pinjmw=75.397788712812741, plasma_current=16616203.759182997, - pcoreradpv=0.047757569353246924, + pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, qstar=2.9513713188821282, rmajor=8, @@ -3017,7 +3017,7 @@ def test_calculate_confinement_time(confinementtimeparam, monkeypatch, physics): non_alpha_charged_power=confinementtimeparam.non_alpha_charged_power, pinjmw=confinementtimeparam.pinjmw, plasma_current=confinementtimeparam.plasma_current, - pcoreradpv=confinementtimeparam.pcoreradpv, + pden_plasma_core_rad_mw=confinementtimeparam.pden_plasma_core_rad_mw, q95=confinementtimeparam.q95, qstar=confinementtimeparam.qstar, rmajor=confinementtimeparam.rmajor, diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index e7909469d7..25bae82cbd 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -2706,7 +2706,7 @@ class StCalcEffChiParam(NamedTuple): alpha_power_density_total: Any = None - pcoreradpv: Any = None + pden_plasma_core_rad_mw: Any = None alphan: Any = None @@ -2735,7 +2735,7 @@ class StCalcEffChiParam(NamedTuple): ne0=3.4479000000000007e20, f_alpha_plasma=0.95000000000000007, alpha_power_density_total=1.2629524018077414, - pcoreradpv=0.10762698429338043, + pden_plasma_core_rad_mw=0.10762698429338043, alphan=0.35000000000000003, alphat=1.2, vol_plasma=1385.8142655379029, @@ -2752,7 +2752,7 @@ class StCalcEffChiParam(NamedTuple): ne0=3.4479000000000007e20, f_alpha_plasma=0.95000000000000007, alpha_power_density_total=1.0570658694225301, - pcoreradpv=0.1002475669217598, + pden_plasma_core_rad_mw=0.1002475669217598, alphan=0.35000000000000003, alphat=1.2, vol_plasma=1385.8142655379029, @@ -2793,7 +2793,11 @@ def test_st_calc_eff_chi(stcalceffchiparam, monkeypatch, stellarator): stcalceffchiparam.alpha_power_density_total, ) - monkeypatch.setattr(physics_variables, "pcoreradpv", stcalceffchiparam.pcoreradpv) + monkeypatch.setattr( + physics_variables, + "pden_plasma_core_rad_mw", + stcalceffchiparam.pden_plasma_core_rad_mw, + ) monkeypatch.setattr(physics_variables, "alphan", stcalceffchiparam.alphan) From e2da35f651d2f0cf1ec38af93d26230598318a12 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 13:23:04 +0000 Subject: [PATCH 02/13] =?UTF-8?q?=F0=9F=94=84=20Rename=20pedgeradpv=20to?= =?UTF-8?q?=20pden=5Fplasma=5Fouter=5Frad=5Fmw=20for=20clarity=20and=20con?= =?UTF-8?q?sistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/physics.py | 4 ++-- process/physics_functions.py | 11 +++++++---- process/stellarator.py | 10 +++++++--- source/fortran/physics_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/process/physics.py b/process/physics.py index 664d9569f8..95931ae658 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2179,14 +2179,14 @@ def physics(self): radpwrdata = physics_funcs.calculate_radiation_powers(self.plasma_profile) physics_variables.pden_plasma_sync_mw = radpwrdata.pden_plasma_sync_mw physics_variables.pden_plasma_core_rad_mw = radpwrdata.pden_plasma_core_rad_mw - physics_variables.pedgeradpv = radpwrdata.pedgeradpv + physics_variables.pden_plasma_outer_rad_mw = radpwrdata.pden_plasma_outer_rad_mw physics_variables.pden_plasma_rad_mw = radpwrdata.pden_plasma_rad_mw physics_variables.p_plasma_inner_rad_mw = ( physics_variables.pden_plasma_core_rad_mw * physics_variables.vol_plasma ) physics_variables.p_plasma_outer_rad_mw = ( - physics_variables.pedgeradpv * physics_variables.vol_plasma + physics_variables.pden_plasma_outer_rad_mw * physics_variables.vol_plasma ) physics_variables.p_plasma_rad_mw = ( physics_variables.pden_plasma_rad_mw * physics_variables.vol_plasma diff --git a/process/physics_functions.py b/process/physics_functions.py index 8528dffab5..2ffb1d2bfb 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -551,7 +551,7 @@ class RadpwrData: pden_plasma_sync_mw: float pden_plasma_core_rad_mw: float - pedgeradpv: float + pden_plasma_outer_rad_mw: float pden_plasma_rad_mw: float @@ -570,7 +570,7 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: RadpwrData: A dataclass containing the following radiation power densities: - pden_plasma_sync_mw (float): Synchrotron radiation power per unit volume (MW/m^3). - pden_plasma_core_rad_mw (float): Total core radiation power per unit volume (MW/m^3). - - pedgeradpv (float): Edge radiation power per unit volume (MW/m^3). + - pden_plasma_outer_rad_mw (float): Edge radiation power per unit volume (MW/m^3). - pden_plasma_rad_mw (float): Total radiation power per unit volume (MW/m^3). Author: @@ -579,7 +579,7 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: imp_rad = impurity.ImpurityRadiation(plasma_profile) imp_rad.calculate_imprad() - pedgeradpv = imp_rad.radtot - imp_rad.radcore + pden_plasma_outer_rad_mw = imp_rad.radtot - imp_rad.radcore # Synchrotron radiation power/volume; assumed to be from core only. pden_plasma_sync_mw = psync_albajar_fidone() @@ -591,7 +591,10 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: pden_plasma_rad_mw = imp_rad.radtot + pden_plasma_sync_mw return RadpwrData( - pden_plasma_sync_mw, pden_plasma_core_rad_mw, pedgeradpv, pden_plasma_rad_mw + pden_plasma_sync_mw, + pden_plasma_core_rad_mw, + pden_plasma_outer_rad_mw, + pden_plasma_rad_mw, ) diff --git a/process/stellarator.py b/process/stellarator.py index e18c443843..7e15dfe37e 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4311,19 +4311,23 @@ def stphys(self, output): radpwr_data = physics_funcs.calculate_radiation_powers(self.plasma_profile) physics_variables.pden_plasma_sync_mw = radpwr_data.pden_plasma_sync_mw physics_variables.pden_plasma_core_rad_mw = radpwr_data.pden_plasma_core_rad_mw - physics_variables.pedgeradpv = radpwr_data.pedgeradpv + physics_variables.pden_plasma_outer_rad_mw = ( + radpwr_data.pden_plasma_outer_rad_mw + ) physics_variables.pden_plasma_rad_mw = radpwr_data.pden_plasma_rad_mw physics_variables.pden_plasma_core_rad_mw = max( physics_variables.pden_plasma_core_rad_mw, 0.0e0 ) - physics_variables.pedgeradpv = max(physics_variables.pedgeradpv, 0.0e0) + physics_variables.pden_plasma_outer_rad_mw = max( + physics_variables.pden_plasma_outer_rad_mw, 0.0e0 + ) physics_variables.p_plasma_inner_rad_mw = ( physics_variables.pden_plasma_core_rad_mw * physics_variables.vol_plasma ) # Should probably be vol_core physics_variables.p_plasma_outer_rad_mw = ( - physics_variables.pedgeradpv * physics_variables.vol_plasma + physics_variables.pden_plasma_outer_rad_mw * physics_variables.vol_plasma ) physics_variables.p_plasma_rad_mw = ( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index fca5d23c43..427977e5e4 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -621,7 +621,7 @@ module physics_variables real(dp) :: p_plasma_outer_rad_mw !! radiation power from outer zone (MW) - real(dp) :: pedgeradpv + real(dp) :: pden_plasma_outer_rad_mw !! edge radiation power per volume (MW/m3) real(dp) :: vs_plasma_internal @@ -1040,7 +1040,7 @@ subroutine init_physics_variables dt_power_total = 0.0D0 dt_power_plasma = 0.0D0 p_plasma_outer_rad_mw = 0.0D0 - pedgeradpv = 0.0D0 + pden_plasma_outer_rad_mw = 0.0D0 charged_particle_power = 0.0D0 vs_plasma_internal = 0.0D0 pflux_fw_rad_mw = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 5b5bbbb06c..520395eb2f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3503,7 +3503,7 @@ "peakpoloidalpower": 0.0, "pflux_fw_rad_max_mw": 0.0, "ped": null, - "pedgeradpv": 0.0, + "pden_plasma_outer_rad_mw": 0.0, "pfbldgm3": 20000.0, "pfcaseth": 0.0, "pfckts": 0.0, @@ -10261,7 +10261,7 @@ "peakmva": "peak MVA requirement", "peakpoloidalpower": "Peak absolute rate of change of stored energy in poloidal field (MW)", "pflux_fw_rad_max_mw": "Peak radiation wall load (MW/m^2) (`constraint equation 67`)", - "pedgeradpv": "edge radiation power per volume (MW/m3)", + "pden_plasma_outer_rad_mw": "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)", "pfckts": "number of PF coil circuits", @@ -19180,7 +19180,7 @@ "dt_power_total", "dt_power_plasma", "p_plasma_outer_rad_mw", - "pedgeradpv", + "pden_plasma_outer_rad_mw", "charged_particle_power", "vs_plasma_internal", "pflux_fw_rad_mw", From a8375495d4c63ea49212f381204667a6ced338b7 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 15:13:25 +0000 Subject: [PATCH 03/13] :sparkle: Create new p_plasma_sync_mw variable and integrate into physics --- .../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 | 9 ++++-- 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/unit/data/large_tokamak_MFILE.DAT | 2 +- 17 files changed, 55 insertions(+), 48 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index f66ca04139..c2cdb24a0c 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2665E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2665E+01 OP 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 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index d9d5b0d50c..fd47c5b663 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP 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 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 8981febd92..866665ee24 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP 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 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 38d21b4817..c3f6dc444d 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP 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 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index c5c662c1ff..c017f7632a 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP 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 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 7dad954a41..e5def19ea6 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 83fb1aedff..aad235396a 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -136,7 +136,7 @@ "f_nd_alpha_electron", "wallmw", "p_plasma_inner_rad_mw", - "pden_plasma_sync_mw*vol_plasma", + "p_plasma_sync_mw", "p_plasma_rad_mw", "pnucblkt", "pnucshld", diff --git a/process/physics.py b/process/physics.py index 95931ae658..973ce6198e 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2182,6 +2182,9 @@ def physics(self): physics_variables.pden_plasma_outer_rad_mw = radpwrdata.pden_plasma_outer_rad_mw physics_variables.pden_plasma_rad_mw = radpwrdata.pden_plasma_rad_mw + physics_variables.p_plasma_sync_mw = ( + physics_variables.pden_plasma_sync_mw * physics_variables.vol_plasma + ) physics_variables.p_plasma_inner_rad_mw = ( physics_variables.pden_plasma_core_rad_mw * physics_variables.vol_plasma ) @@ -4642,9 +4645,9 @@ def outplas(self): po.osubhd(self.outfile, "Radiation Power (excluding SOL):") po.ovarre( self.outfile, - "Synchrotron radiation power (MW)", - "(pden_plasma_sync_mw*vol_plasma)", - physics_variables.pden_plasma_sync_mw * physics_variables.vol_plasma, + "Plasma total synchrotron radiation power (MW)", + "(p_plasma_sync_mw)", + physics_variables.p_plasma_sync_mw, "OP ", ) po.ovarrf( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 427977e5e4..0915af4edc 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -681,6 +681,9 @@ module physics_variables real(dp) :: pden_plasma_sync_mw !! synchrotron radiation power per volume (MW/m3) + real(dp) :: p_plasma_sync_mw + !! Total synchrotron radiation power from plasma (MW) + integer :: i_l_h_threshold !! switch for L-H mode power threshold scaling to use (see l_h_threshold_powers for list) @@ -1061,6 +1064,7 @@ subroutine init_physics_variables proton_rate_density = 0.0D0 psolradmw = 0.0D0 pden_plasma_sync_mw = 0.0D0 + p_plasma_sync_mw = 0.0D0 i_l_h_threshold = 19 p_l_h_threshold_mw = 0.0D0 l_h_threshold_powers = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 36b22e5499..2733870025 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP 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 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index a71044ae8b..b94f7b4c08 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP 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 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 77bc68da72..0303842d06 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP 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 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index c77c972c53..cb7f93fd06 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5187E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP 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 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 3d8871cd90..41aecbe89e 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5820E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5820E+01 OP 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 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index e3015461d4..1da9b14751 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3016E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3016E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2401E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2401E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.1799E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.1799E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2108E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2108E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2740E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2740E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3375E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3375E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3724E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3724E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3060E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3060E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2401E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2401E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.2737E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2737E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3421E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3421E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.4105E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.4105E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.4480E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.4480E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3795E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3795E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.3131E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3131E+01 OP 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 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 9596ae4c34..dd07caa4b0 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 @@ -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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 2.2989E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP 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 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index a7fb917cd1..63cc0e47b9 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)________________________________________ (pden_plasma_sync_mw*vol)_________________ 1.5820E+01 OP + Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5820E+01 OP 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 From 8fac714ed6829126bcaf29ee721b4ad61b6dcb42 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 15:25:04 +0000 Subject: [PATCH 04/13] =?UTF-8?q?=F0=9F=94=84=20Rename=20maxradwallload=20?= =?UTF-8?q?to=20pflux=5Ffw=5Frad=5Fmax=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../physics-models/plasma_radiation.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 | 4 +-- source/fortran/constraint_equations.f90 | 12 ++++---- 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 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 10 +++---- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- .../stellarator_helias_once_through.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 23 files changed, 66 insertions(+), 66 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_radiation.md b/documentation/proc-pages/physics-models/plasma_radiation.md index 6491060792..9468853c71 100644 --- a/documentation/proc-pages/physics-models/plasma_radiation.md +++ b/documentation/proc-pages/physics-models/plasma_radiation.md @@ -112,7 +112,7 @@ The scaling value `fradpwr` can be varied also. 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 limiting value of $q_{\text{fw,rad}}$ in $\mathrm {MWm^{-2}}$ is be set using input parameter `pflux_fw_rad_max`. The scaling value `fradwall` can be varied also. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index c2cdb24a0c..575f8f014e 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -437,7 +437,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index fd47c5b663..1dc345aa48 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -437,7 +437,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 866665ee24..bed76681e3 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -437,7 +437,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index c3f6dc444d..08982060f2 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -437,7 +437,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index c017f7632a..c1ab2923d8 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -437,7 +437,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index e5def19ea6..63e5ccef6a 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -294,7 +294,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -1289,7 +1289,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -2284,7 +2284,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -3279,7 +3279,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -4274,7 +4274,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -5269,7 +5269,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -6264,7 +6264,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -7259,7 +7259,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -8254,7 +8254,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/process/physics.py b/process/physics.py index 973ce6198e..314e99e1fd 100644 --- a/process/physics.py +++ b/process/physics.py @@ -4723,8 +4723,8 @@ def outplas(self): po.ovarre( self.outfile, "Maximum permitted radiation wall load (MW/m^2)", - "(maxradwallload)", - constraint_variables.maxradwallload, + "(pflux_fw_rad_max)", + constraint_variables.pflux_fw_rad_max, "IP ", ) po.ovarre( diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 16183e7f06..3d85d66e0a 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2600,13 +2600,13 @@ subroutine constraint_eqn_067(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! residual error in physical units; output string; units string !! Simple upper limit on radiation wall load !! #=# physics - !! #=#=# fradwall, maxradwallload + !! #=#=# fradwall, pflux_fw_rad_max !! and hence also optional here. !! 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) + !! pflux_fw_rad_max : input real : Maximum permitted radiation wall load (MW/m^2) !! 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 + use constraint_variables, only: fradwall, pflux_fw_rad_max, pflux_fw_rad_max_mw implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -2614,9 +2614,9 @@ 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 / pflux_fw_rad_max_mw - tmp_con = maxradwallload - tmp_err = maxradwallload * tmp_cc + tmp_cc = 1.0d0 - fradwall * pflux_fw_rad_max / pflux_fw_rad_max_mw + tmp_con = pflux_fw_rad_max + tmp_err = pflux_fw_rad_max * tmp_cc tmp_symbol = '<' tmp_units = 'MW/m^2' diff --git a/source/fortran/constraint_variables.f90 b/source/fortran/constraint_variables.f90 index 0c436525ad..753415e4c4 100644 --- a/source/fortran/constraint_variables.f90 +++ b/source/fortran/constraint_variables.f90 @@ -221,7 +221,7 @@ module constraint_variables real(dp) :: gammax !! maximum current drive gamma (`constraint equation 37`) - real(dp) :: maxradwallload + real(dp) :: pflux_fw_rad_max !! Maximum permitted radiation wall load (MW/m^2) (`constraint equation 67`) real(dp) :: mvalim @@ -372,7 +372,7 @@ subroutine init_constraint_variables fwalld = 1.0D0 fzeffmax = 1.0D0 gammax = 2.0D0 - maxradwallload = 1.0D0 + pflux_fw_rad_max = 1.0D0 mvalim = 40.0D0 nbshinefmax = 1.0D-3 nflutfmax = 1.0D23 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index cff8ea301b..56fff618de 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -228,7 +228,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) workshop_l, workshop_w, workshop_h use constraint_variables, only: fl_h_threshold, fpeakb, fpsep, fdivcol, ftcycl, & beta_poloidal_max, fpsepbqar, ftmargtf, fradwall, fptfnuc, fnesep, fportsz, tbrmin, & - maxradwallload, pseprmax, fdene, fniterpump, fpinj, pnetelin, powfmax, & + pflux_fw_rad_max, pseprmax, fdene, fniterpump, fpinj, pnetelin, powfmax, & fgamcd, ftbr, mvalim, f_alpha_energy_confinement_min, walalw, fmva, fradpwr, nflutfmax, fipir, & fauxmn, fiooic,fr_conducting_wall, fjohc0, frminor, psepbqarmax, ftpeak, bigqmin, & fstrcond, fptemp, ftmargoh, fvs, fbeta_max, vvhealw, fpnetel, ft_burn, & @@ -984,8 +984,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('gammax') call parse_real_variable('gammax', gammax, 0.01D0, 10.0D0, & 'Maximum current drive gamma (A/W-m2)') - case ('maxradwallload') - call parse_real_variable('maxradwallload', maxradwallload, 0.1D0, 10.0D0, & + case ('pflux_fw_rad_max') + call parse_real_variable('pflux_fw_rad_max', pflux_fw_rad_max, 0.1D0, 10.0D0, & 'Maximum permitted radiation wall load (MW/m^2)') case ('mvalim') call parse_real_variable('mvalim', mvalim, 0.0D0, 1000.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 2733870025..cfd63001a4 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -436,7 +436,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index b94f7b4c08..e570abbe20 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -437,7 +437,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 0303842d06..71c1adfbc6 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -437,7 +437,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index cb7f93fd06..2103fc8c14 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -437,7 +437,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 41aecbe89e..e7b97df74f 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -433,7 +433,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 1da9b14751..68008e55fc 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -438,7 +438,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -1601,7 +1601,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -2764,7 +2764,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -3927,7 +3927,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -5090,7 +5090,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -6253,7 +6253,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -7416,7 +7416,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -8579,7 +8579,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -9742,7 +9742,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -10905,7 +10905,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -12068,7 +12068,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -13231,7 +13231,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -14394,7 +14394,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -15557,7 +15557,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -16720,7 +16720,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index dd07caa4b0..e463f18931 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -294,7 +294,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -1289,7 +1289,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -2284,7 +2284,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -3279,7 +3279,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -4274,7 +4274,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -5269,7 +5269,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -6264,7 +6264,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -7259,7 +7259,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 @@ -8254,7 +8254,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 520395eb2f..0897f6ecfd 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3283,7 +3283,7 @@ "maxlen": 2000.0, "maxmat": 8.0, "maxpoloidalpower": 1000.0, - "maxradwallload": 1.0, + "pflux_fw_rad_max": 1.0, "mbvfac": 2.8, "mc2_": "mc2_SI/keV_", "mc2_SI": "me_*c_**2", @@ -10057,7 +10057,7 @@ "maxlen": "", "maxmat": "Total number of materials in IFE device. Material numbers are as follows:\n
      \n
    • =0 void
      • \n
    • =1 steel
      • \n
    • =2 carbon cloth
      • \n
    • =3 FLiBe
      • \n
    • =4 lithium oxide Li2O
      • \n
    • =5 concrete
      • \n
    • =6 helium
      • \n
    • =7 xenon
      • \n
    • =8 lithium
      • \n
    ", "maxpoloidalpower": "Maximum permitted absolute rate of change of stored energy in poloidal field (MW)", - "maxradwallload": "Maximum permitted radiation wall load (MW/m^2) (`constraint equation 67`)", + "pflux_fw_rad_max": "Maximum permitted radiation wall load (MW/m^2) (`constraint equation 67`)", "mbvfac": "maintenance building volume multiplication factor", "mc2_": "", "mc2_SI": "", @@ -13689,7 +13689,7 @@ "lb": 0.0, "ub": 2000.0 }, - "maxradwallload": { + "pflux_fw_rad_max": { "lb": 0.1, "ub": 10.0 }, @@ -17437,7 +17437,7 @@ "fwalld", "fzeffmax", "gammax", - "maxradwallload", + "pflux_fw_rad_max", "mvalim", "nbshinefmax", "nflutfmax", @@ -20539,7 +20539,7 @@ "max_gyrotron_frequency": "real_variable", "maxcal": "int_variable", "maxpoloidalpower": "real_variable", - "maxradwallload": "real_variable", + "pflux_fw_rad_max": "real_variable", "mbvfac": "real_variable", "mcdriv": "real_variable", "minmax": "int_variable", diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 66e61a384f..9802f9a7a4 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -168,7 +168,7 @@ fradpwr = 0.7109311818294267 * f-value for core radiation power limit (`constra fradwall = 0.4187507268216411 * f-value for upper limit on radiation wall load (`constr; equ; 67`; `iteration variable 116`) fstrcase = 0.47408648750854704 * f-value for maximum TF coil case Tresca yield criterion fstrcond = 0.4359431939504875 * f-value for maxiumum TF coil conduit Tresca yield criterion -maxradwallload = 1.2 * Maximum permitted radiation wall load (MW/m^2) (`constraint equation 67`) +pflux_fw_rad_max = 1.2 * Maximum permitted radiation wall load (MW/m^2) (`constraint equation 67`) f_fw_rad_max = 1.0 * peaking factor for radiation wall load (`constraint equation 67`) powfmax = 2500.0 * maximum fusion power (MW) (`constraint equation 9`) pseprmax = 40.0 * maximum ratio of power crossing the separatrix to plasma major radius (Psep/R) (MW/m) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 6b7aab7876..532b778e35 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2665,7 +2665,7 @@ icc = 67 * JUSTIFICATION: To avoid melting the first wall * VARIABLES: pflux_fw_rad_max_mw calculated in-situ -maxradwallload = 1.2 +pflux_fw_rad_max = 1.2 * DESCRIPTION: Peak radiation wall load (MW/m^2) * JUSTIFICATION: diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index 4717eb05d2..019023f0e0 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -116,7 +116,7 @@ fpnetel = 1.0 * f-value for net electric power (`constraint equation 16`; `iter fptfnuc = 1 * f-value for maximum TF coil nuclear heating (`constraint equation 54`; `iteration variable 95`) fradpwr = 1 * f-value for core radiation power limit (`constraint equation 17`; `iteration variable 28`) fradwall = 1.0 * f-value for upper limit on radiation wall load (`constr; equ; 67`; `iteration variable 116`) -maxradwallload = 1 * Maximum permitted radiation wall load (MW/m^2) (`constraint equation 67`) +pflux_fw_rad_max = 1 * Maximum permitted radiation wall load (MW/m^2) (`constraint equation 67`) pnetelin = 1000 * required net electric power (MW) (`constraint equation 16`) powfmax = 500. * maximum fusion power (MW) (`constraint equation 9`) walalw = 1.0 * allowable neutron wall-load (MW/m2) (`constraint equation 8`) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 63cc0e47b9..9323efb30d 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -433,7 +433,7 @@ 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)________ (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 + Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 From 7988fe5e4b61ff278df01983e2cf058684d8f9d3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 15:27:48 +0000 Subject: [PATCH 05/13] =?UTF-8?q?=F0=9F=94=84=20Rename=20coreradius=20to?= =?UTF-8?q?=20radius=5Fplasma=5Fcore=5Fnorm=20for=20clarity=20and=20consis?= =?UTF-8?q?tency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/proc-pages/io/utilities.md | 2 +- .../proc-pages/physics-models/error.txt | 2 +- .../physics-models/plasma_radiation.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 6 +- examples/data/large_tokamak_1_MFILE.DAT | 6 +- examples/data/large_tokamak_2_MFILE.DAT | 6 +- examples/data/large_tokamak_3_MFILE.DAT | 6 +- examples/data/large_tokamak_4_MFILE.DAT | 6 +- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 38 ++++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/impurity_radiation.py | 10 +-- process/io/plot_proc.py | 6 +- process/io/plot_radial_build.py | 2 +- process/io/plot_scans.py | 2 +- process/io/variable_metadata.py | 2 +- process/physics.py | 4 +- process/power.py | 2 +- process/stellarator.py | 14 ++--- .../config_evaluate_uncertainties.json | 6 +- source/fortran/impurity_radiation.f90 | 6 +- source/fortran/input.f90 | 6 +- source/fortran/scan.f90 | 2 +- .../data/config_evaluate_uncertainties.json | 2 +- .../config_evaluate_uncertainties_nonopt.json | 2 +- .../data/large_tokamak_2_MFILE.DAT | 6 +- .../data/large_tokamak_3_MFILE.DAT | 6 +- .../data/large_tokamak_4_MFILE.DAT | 6 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 6 +- .../data/large_tokamak_once_through.IN.DAT | 2 +- .../integration/data/morris_method_output.txt | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 62 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 38 ++++++------ tests/integration/data/sobol.txt | 2 +- .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 14 ++--- tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- .../stellarator_helias_once_through.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 6 +- tests/unit/test_impurity_radiation.py | 12 ++-- tests/unit/test_stellarator.py | 10 +-- 50 files changed, 174 insertions(+), 166 deletions(-) diff --git a/documentation/proc-pages/io/utilities.md b/documentation/proc-pages/io/utilities.md index 99b249eff5..b43e9e7f1b 100644 --- a/documentation/proc-pages/io/utilities.md +++ b/documentation/proc-pages/io/utilities.md @@ -431,7 +431,7 @@ The configuration file `config_evaluate_uncertainties.json` uses the [JSON forma "Std": 0.1 }, { - "Varname": "coreradius", + "Varname": "radius_plasma_core_norm", "Errortype": "Gaussian", "Mean": 0.6, "Std": 0.15 diff --git a/documentation/proc-pages/physics-models/error.txt b/documentation/proc-pages/physics-models/error.txt index 7915a391db..964f262ea6 100644 --- a/documentation/proc-pages/physics-models/error.txt +++ b/documentation/proc-pages/physics-models/error.txt @@ -512,7 +512,7 @@ The synchrotron radiation power\footnote{Albajar, Nuclear Fusion 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 +By changing the input parameter \texttt{radius_plasma_core_norm}, the user may set the normalised radius defining the core region. Only the impurity and synchrotron radiation from the core region affects the confinement scaling. Figure 1 below shows the radiation power contributions. diff --git a/documentation/proc-pages/physics-models/plasma_radiation.md b/documentation/proc-pages/physics-models/plasma_radiation.md index 9468853c71..eecb032efa 100644 --- a/documentation/proc-pages/physics-models/plasma_radiation.md +++ b/documentation/proc-pages/physics-models/plasma_radiation.md @@ -75,7 +75,7 @@ $$ -------------------- -By changing the input parameter `coreradius`, the user may set the normalised +By changing the input parameter `radius_plasma_core_norm`, 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. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 575f8f014e..7ac8289534 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -428,7 +428,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4715E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2665E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3480E+02 OP @@ -1137,7 +1137,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1348E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.8997E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.9376E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.9376E+01 Total_(MW)______________________________________________________________ ______________________________ 3.7935E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0224E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2322E+00 @@ -1664,7 +1664,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 1dc345aa48..6c7b286c6d 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -429,7 +429,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP @@ -1132,7 +1132,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1751E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9785E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 @@ -1658,7 +1658,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index bed76681e3..5e409a5e7b 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -429,7 +429,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP @@ -1132,7 +1132,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1751E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9785E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 @@ -1658,7 +1658,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 08982060f2..0907587ae5 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -429,7 +429,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP @@ -1132,7 +1132,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1751E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9785E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 @@ -1659,7 +1659,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index c1ab2923d8..b6930da149 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -429,7 +429,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP @@ -1132,7 +1132,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1751E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9785E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 @@ -1659,7 +1659,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 4fb4347585..9c4e378909 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -469,7 +469,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 63e5ccef6a..a8fb1c119a 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -284,7 +284,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -959,7 +959,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -1279,7 +1279,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -1954,7 +1954,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -2274,7 +2274,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -2949,7 +2949,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -3269,7 +3269,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -3944,7 +3944,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -4264,7 +4264,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -4939,7 +4939,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -5259,7 +5259,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -5934,7 +5934,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -6254,7 +6254,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -6929,7 +6929,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -7249,7 +7249,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -7924,7 +7924,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -8244,7 +8244,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -8919,7 +8919,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -9177,7 +9177,7 @@ etath = 0.375D0 * thermal to electric conversion efficiency *------------Impurity Radiation Module-------------* *imprad_model = 1 * Switch for impurity radiation model; -coreradius = 0.75 * Normalised radius defining the 'core' region +radius_plasma_core_norm = 0.75 * Normalised radius defining the 'core' region coreradiationfraction = 0.6 * fraction of radiation from 'core' region that is subtracted from the loss pow fimp(1) = 1.0 fimp(2) = 0.1 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 87fe4c212c..ba3418008a 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -469,7 +469,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/process/impurity_radiation.py b/process/impurity_radiation.py index 28b56b1547..9cc75ad31d 100644 --- a/process/impurity_radiation.py +++ b/process/impurity_radiation.py @@ -321,20 +321,20 @@ def z2index(zimp): return None -def fradcore(rho, coreradius, coreradiationfraction): +def fradcore(rho, radius_plasma_core_norm, coreradiationfraction): """Finds the fraction of radiation from the core that is subtracted in impurity radiation model. :param rho: normalised minor radius :type rho: numpy.array - :param coreradius: normalised radius defining the 'core' region - :type coreradius: float + :param radius_plasma_core_norm: normalised radius defining the 'core' region + :type radius_plasma_core_norm: float :param coreradiationfraction: fraction of radiation from the core region :type coreradiationfraction: float :return: fradcore - array filled with the coreradiationfraction :rtype: numpy.array """ fradcore = np.zeros(len(rho)) - rho_mask = rho < coreradius + rho_mask = rho < radius_plasma_core_norm fradcore[rho_mask] = coreradiationfraction return fradcore @@ -541,7 +541,7 @@ def calculate_radiation_loss_profiles(self): self.rho * fradcore( self.rho, - impurity_radiation_module.coreradius, + impurity_radiation_module.radius_plasma_core_norm, impurity_radiation_module.coreradiationfraction, ) ) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 1f27920226..7429f102c4 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2732,7 +2732,11 @@ def plot_power_info(axis, mfile_data, scan): ) # Define appropriate pedestal and impurity parameters - coredescription = ("coreradius", "Normalised radius of 'core' region", "") + coredescription = ( + "radius_plasma_core_norm", + "Normalised radius of 'core' region", + "", + ) if ipedestal == 1: ped_height = ("neped", "Electron density at pedestal", "m$^{-3}$") ped_pos = ("rhopedn", "r/a at density pedestal", "") diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index 2245bd5dd8..e61dd3ec54 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -176,7 +176,7 @@ def main(args=None): "triang", "tbrmin", "bt", - "coreradius", + "radius_plasma_core_norm", "Obsolete", # Removed "f_alpha_energy_confinement_min", "epsvmc", diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py index 8a4cb2cd8e..dd79dad1fa 100644 --- a/process/io/plot_scans.py +++ b/process/io/plot_scans.py @@ -225,7 +225,7 @@ def main(args=None): 26: "triang", 27: "tbrmin", 28: "bt", - 29: "coreradius", + 29: "radius_plasma_core_norm", 30: "", # OBSOLETE 31: "f_alpha_energy_confinement_min", 32: "epsvmc", diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index cbe0c197c7..6ee2871a9c 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -207,7 +207,7 @@ class VariableMetadata: description="Maximum copper-to-area ratio", units="A m^{-2}", ), - "coreradius": VariableMetadata( + "radius_plasma_core_norm": VariableMetadata( latex=r"$r_{core} [M]$", description="Core radius", units="M" ), "fcuohsu": VariableMetadata( diff --git a/process/physics.py b/process/physics.py index 314e99e1fd..b6efb20128 100644 --- a/process/physics.py +++ b/process/physics.py @@ -4659,8 +4659,8 @@ def outplas(self): po.ovarre( self.outfile, "Normalised minor radius defining 'core'", - "(coreradius)", - impurity_radiation_module.coreradius, + "(radius_plasma_core_norm)", + impurity_radiation_module.radius_plasma_core_norm, ) po.ovarre( self.outfile, diff --git a/process/power.py b/process/power.py index 1be7434c42..fa9aeb81a7 100644 --- a/process/power.py +++ b/process/power.py @@ -1606,7 +1606,7 @@ def power2(self, output: bool): ) po.ovarrf( self.outfile, - 'Radiation power from inside "coreradius" (MW)', + 'Radiation power from inside "radius_plasma_core_norm" (MW)', "(pcoreradmw.)", physics_variables.p_plasma_inner_rad_mw, "OP ", diff --git a/process/stellarator.py b/process/stellarator.py index 7e15dfe37e..539b942c86 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4711,7 +4711,7 @@ def calc_neoclassics(self): ) * physics_variables.vol_plasma / physics_variables.a_plasma_surface - * impurity_radiation_module.coreradius + * impurity_radiation_module.radius_plasma_core_norm ) q_PROCESS_r1 = ( ( @@ -4770,7 +4770,7 @@ def calc_neoclassics(self): dndt_neo_fuel = ( (dndt_neo_D + dndt_neo_T) * physics_variables.a_plasma_surface - * impurity_radiation_module.coreradius + * impurity_radiation_module.radius_plasma_core_norm ) dmdt_neo_fuel = ( dndt_neo_fuel * physics_variables.m_fuel_amu * constants.proton_mass * 1.0e6 @@ -4779,7 +4779,7 @@ def calc_neoclassics(self): 4 * dndt_neo_e * physics_variables.a_plasma_surface - * impurity_radiation_module.coreradius + * impurity_radiation_module.radius_plasma_core_norm * physics_variables.m_fuel_amu * constants.proton_mass * 1.0e6 @@ -4835,7 +4835,7 @@ def st_calc_eff_chi(self): physics_variables.vol_plasma * st.f_r * ( - impurity_radiation_module.coreradius + impurity_radiation_module.radius_plasma_core_norm * physics_variables.rminor / stellarator_configuration.stella_config_rminor_ref ) @@ -4845,7 +4845,7 @@ def st_calc_eff_chi(self): physics_variables.a_plasma_surface * st.f_r * ( - impurity_radiation_module.coreradius + impurity_radiation_module.radius_plasma_core_norm * physics_variables.rminor / stellarator_configuration.stella_config_rminor_ref ) @@ -4869,8 +4869,8 @@ def st_calc_eff_chi(self): * physics_variables.te0 * 1e3 * physics_variables.alphat - * impurity_radiation_module.coreradius - * (1 - impurity_radiation_module.coreradius**2) + * impurity_radiation_module.radius_plasma_core_norm + * (1 - impurity_radiation_module.radius_plasma_core_norm**2) ** (physics_variables.alphan + physics_variables.alphat - 1) ) * surfacescaling diff --git a/process/uncertainties/config_evaluate_uncertainties.json b/process/uncertainties/config_evaluate_uncertainties.json index 8abc0e436a..ccab91b50d 100644 --- a/process/uncertainties/config_evaluate_uncertainties.json +++ b/process/uncertainties/config_evaluate_uncertainties.json @@ -15,7 +15,7 @@ "Std": 0.05 }, { - "Varname": "coreradius", + "Varname": "radius_plasma_core_norm", "Errortype": "Uniform", "Lowerbound": 0.6, "Upperbound": 0.9 @@ -86,7 +86,7 @@ ], "names": [ "hfact", - "coreradius", + "radius_plasma_core_norm", "kappa", "etaech", "etath", @@ -118,7 +118,7 @@ "names": [ "boundu(9)", "hfact", - "coreradius", + "radius_plasma_core_norm", "fimp(2)" ], "num_vars": 4 diff --git a/source/fortran/impurity_radiation.f90 b/source/fortran/impurity_radiation.f90 index bc65dd889c..3b1309b9ed 100644 --- a/source/fortran/impurity_radiation.f90 +++ b/source/fortran/impurity_radiation.f90 @@ -33,8 +33,8 @@ module impurity_radiation_module 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 + real(dp), public :: radius_plasma_core_norm + !! radius_plasma_core_norm /0.6/ : normalised radius defining the 'core' region real(dp), public :: coreradiationfraction !! coreradiationfraction /1.0/ : fraction of radiation from 'core' region that is subtracted from the loss power @@ -112,7 +112,7 @@ subroutine init_impurity_radiation_module !! Initialise module variables implicit none - coreradius = 0.6D0 + radius_plasma_core_norm = 0.6D0 coreradiationfraction = 1.0D0 fimp = (/ 1.0D0, 0.1D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, & 0.0D0, 0.00D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0 /) diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 56fff618de..7c5d11a32a 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -291,7 +291,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, n_impurities, & + use impurity_radiation_module, only: radius_plasma_core_norm, 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 @@ -544,8 +544,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('burnup_in') call parse_real_variable('burnup_in', burnup_in, 0.0D0, 1.0D0, & 'User input plasma fuel burnup fraction') - case ('coreradius') - call parse_real_variable('coreradius', coreradius, 0.0D0, 1.0D0, & + case ('radius_plasma_core_norm') + call parse_real_variable('radius_plasma_core_norm', radius_plasma_core_norm, 0.0D0, 1.0D0, & 'Normalised core radius') case ('coreradiationfraction') call parse_real_variable('coreradiationfraction', coreradiationfraction, 0.0D0, 1.0D0, & diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index c80fbf56ce..f3aa98a219 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -65,7 +65,7 @@ module scan_module !!
  • 26 triang !!
  • 27 tbrmin (for blktmodel > 0 only) !!
  • 28 bt - !!
  • 29 coreradius + !!
  • 29 radius_plasma_core_norm !!
  • 30 fimpvar # OBSOLETE !!
  • 31 f_alpha_energy_confinement_min !!
  • 32 epsvmc diff --git a/tests/integration/data/config_evaluate_uncertainties.json b/tests/integration/data/config_evaluate_uncertainties.json index 12705c0ab7..4e2f6f1e59 100644 --- a/tests/integration/data/config_evaluate_uncertainties.json +++ b/tests/integration/data/config_evaluate_uncertainties.json @@ -22,7 +22,7 @@ "Std": 0.1 }, { - "Varname": "coreradius", + "Varname": "radius_plasma_core_norm", "Errortype": "Gaussian", "Mean": 0.6, "Std": 0.15 diff --git a/tests/integration/data/config_evaluate_uncertainties_nonopt.json b/tests/integration/data/config_evaluate_uncertainties_nonopt.json index dfc8a1437a..78d5cdddc0 100644 --- a/tests/integration/data/config_evaluate_uncertainties_nonopt.json +++ b/tests/integration/data/config_evaluate_uncertainties_nonopt.json @@ -21,7 +21,7 @@ "Std": 0.1 }, { - "Varname": "coreradius", + "Varname": "radius_plasma_core_norm", "Errortype": "Gaussian", "Mean": 0.6, "Std": 0.15 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index e570abbe20..2f57335e23 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -429,7 +429,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP @@ -1132,7 +1132,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1751E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9785E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 @@ -1658,7 +1658,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 71c1adfbc6..dc429bc263 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -429,7 +429,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP @@ -1132,7 +1132,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1751E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9785E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 @@ -1658,7 +1658,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 2103fc8c14..3b64bf7a82 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -429,7 +429,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4609E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5187E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3482E+02 OP @@ -1132,7 +1132,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1751E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9785E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1650E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 @@ -1658,7 +1658,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 2ca5ff9023..f190c6d13c 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -468,7 +468,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index e7b97df74f..a274310b67 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -425,7 +425,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4402E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5820E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3317E+02 OP @@ -1135,7 +1135,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1713E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9729E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1277E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1277E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8856E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0698E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2675E+00 @@ -1659,7 +1659,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 288e9ca5f1..b8cacf9f8f 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -232,7 +232,7 @@ iprimshld = 1 * Switch for shield thermal power destiny; *------------Impurity Radiation Module-------------* -coreradius = 0.75 * coreradius /0;6/ ; normalised radius defining the 'core' region +radius_plasma_core_norm = 0.75 * radius_plasma_core_norm /0;6/ ; normalised radius defining the 'core' region coreradiationfraction = 0.6 * coreradiationfraction /1;0/ ; fraction of radiation from 'core' region that is subtracted from the loss power fimp(1) = 0.9 fimp(2) = 0.1 diff --git a/tests/integration/data/morris_method_output.txt b/tests/integration/data/morris_method_output.txt index e2c5118b87..ba961991c2 100644 --- a/tests/integration/data/morris_method_output.txt +++ b/tests/integration/data/morris_method_output.txt @@ -1,7 +1,7 @@ Parameter mu mu_star sigma mu_star_conf boundu(9) 0.000000 0.000000 0.000000 0.000000 hfact 254.900000 365.500000 374.992331 92.724077 -coreradius -115.410000 201.210000 394.458598 124.705534 +radius_plasma_core_norm -115.410000 201.210000 394.458598 124.705534 fimp(2) 0.000000 0.000000 0.000000 0.000000 fimp(14) 128.750000 187.450000 202.801914 50.868668 psepbqarmax 504.150000 506.550000 468.370104 163.313514 diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index b50005cec9..3b3863221d 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -198,7 +198,7 @@ etath = 0.375D0 * thermal to electric conversion efficiency *------------Impurity Radiation Module-------------* *imprad_model = 1 * Switch for impurity radiation model; -coreradius = 0.75 * Normalised radius defining the 'core' region +radius_plasma_core_norm = 0.75 * Normalised radius defining the 'core' region coreradiationfraction = 0.6 * fraction of radiation from 'core' region that is subtracted from the loss pow fimp(1) = 1.0 fimp(2) = 0.1 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 68008e55fc..e467865fc2 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -430,7 +430,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4406E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3016E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3132E+02 OP @@ -1133,7 +1133,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1424E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9249E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.7889E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.7889E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8038E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0347E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2307E+00 @@ -1593,7 +1593,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4610E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2401E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3308E+02 OP @@ -2296,7 +2296,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1614E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9493E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.8240E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.8240E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8317E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0626E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2420E+00 @@ -2756,7 +2756,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4907E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.1799E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3558E+02 OP @@ -3459,7 +3459,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1722E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9622E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.8985E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.8985E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8521E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0773E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2480E+00 @@ -3919,7 +3919,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4829E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2108E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3524E+02 OP @@ -4622,7 +4622,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1751E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9622E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.8956E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.8956E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8517E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0826E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2549E+00 @@ -5082,7 +5082,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4695E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2740E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3412E+02 OP @@ -5785,7 +5785,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1784E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9667E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.8995E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.8995E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8567E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0875E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2569E+00 @@ -6245,7 +6245,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4496E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3375E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3238E+02 OP @@ -6948,7 +6948,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1716E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9600E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.8676E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.8676E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8468E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0777E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2529E+00 @@ -7408,7 +7408,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4457E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3724E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3234E+02 OP @@ -8111,7 +8111,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1758E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9644E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.8858E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.8858E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8530E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0839E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2604E+00 @@ -8571,7 +8571,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4639E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3060E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3386E+02 OP @@ -9274,7 +9274,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1789E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9674E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.9000E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.9000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8574E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0882E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2621E+00 @@ -9734,7 +9734,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4703E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2401E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3434E+02 OP @@ -10437,7 +10437,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1711E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9602E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.8564E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.8564E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8458E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0767E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2574E+00 @@ -10897,7 +10897,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4743E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.2737E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3503E+02 OP @@ -11600,7 +11600,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1847E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9743E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 8.9158E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 8.9158E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8659E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0966E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2705E+00 @@ -12060,7 +12060,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4773E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3421E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3537E+02 OP @@ -12763,7 +12763,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1971E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9837E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.0058E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.0058E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8842E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.1149E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2780E+00 @@ -13223,7 +13223,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4622E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.4105E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3411E+02 OP @@ -13926,7 +13926,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1962E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9823E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.0074E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.0074E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8830E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.1137E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2775E+00 @@ -14386,7 +14386,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4642E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.4480E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3461E+02 OP @@ -15089,7 +15089,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.2076E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9938E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.0607E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.0607E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8998E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.1305E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2895E+00 @@ -15549,7 +15549,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4871E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3795E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3661E+02 OP @@ -16252,7 +16252,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.2189E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.0064E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1011E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1011E+01 Total_(MW)______________________________________________________________ ______________________________ 3.9165E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.1469E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2963E+00 @@ -16712,7 +16712,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.5107E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.3131E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3867E+02 OP @@ -17415,7 +17415,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.2308E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.0193E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1467E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1467E+01 Total_(MW)______________________________________________________________ ______________________________ 3.9340E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.1643E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.3034E+00 @@ -17945,7 +17945,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index e463f18931..11e0fe3665 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -284,7 +284,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -959,7 +959,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -1279,7 +1279,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -1954,7 +1954,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -2274,7 +2274,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -2949,7 +2949,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -3269,7 +3269,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -3944,7 +3944,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -4264,7 +4264,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -4939,7 +4939,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -5259,7 +5259,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -5934,7 +5934,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -6254,7 +6254,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -6929,7 +6929,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -7249,7 +7249,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -7924,7 +7924,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -8244,7 +8244,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.7753E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 2.2989E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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 Edge_radiation_power_(MW)_______________________________________________ (pedgeradmw)__________________ 1.5597E+02 OP @@ -8919,7 +8919,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.6501E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 3.2994E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 1.0500E+02 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 @@ -9177,7 +9177,7 @@ etath = 0.375D0 * thermal to electric conversion efficiency *------------Impurity Radiation Module-------------* *imprad_model = 1 * Switch for impurity radiation model; -coreradius = 0.75 * Normalised radius defining the 'core' region +radius_plasma_core_norm = 0.75 * Normalised radius defining the 'core' region coreradiationfraction = 0.6 * fraction of radiation from 'core' region that is subtracted from the loss pow fimp(1) = 1.0 fimp(2) = 0.1 diff --git a/tests/integration/data/sobol.txt b/tests/integration/data/sobol.txt index 864bd36e2d..156f8fef0b 100644 --- a/tests/integration/data/sobol.txt +++ b/tests/integration/data/sobol.txt @@ -1,6 +1,6 @@ Parameter S1 S1_conf ST ST_conf hfact 0.046432 0.029023 0.138802 0.026474 -coreradius -0.008038 0.024359 0.079318 0.026343 +radius_plasma_core_norm -0.008038 0.024359 0.079318 0.026343 kappa -0.039777 0.053110 0.316575 0.052761 cboot -0.013655 0.043692 0.251241 0.049660 bmxlim 0.148169 0.043390 0.268674 0.033680 diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 6722279d0a..2c4cd8923a 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -198,7 +198,7 @@ etath = 0.375D0 * thermal to electric conversion efficiency *------------Impurity Radiation Module-------------* *imprad_model = 1 * Switch for impurity radiation model; -coreradius = 0.75 * Normalised radius defining the 'core' region +radius_plasma_core_norm = 0.75 * Normalised radius defining the 'core' region coreradiationfraction = 0.6 * fraction of radiation from 'core' region that is subtracted from the loss pow fimp(1) = 1.0 fimp(2) = 0.1 diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 3a3826cb92..728d1a8d41 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -198,7 +198,7 @@ etath = 0.375D0 * thermal to electric conversion efficiency *------------Impurity Radiation Module-------------* *imprad_model = 1 * Switch for impurity radiation model; -coreradius = 0.75 * Normalised radius defining the 'core' region +radius_plasma_core_norm = 0.75 * Normalised radius defining the 'core' region coreradiationfraction = 0.6 * fraction of radiation from 'core' region that is subtracted from the loss pow fimp(1) = 1.0 fimp(2) = 0.1 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 0897f6ecfd..d72707f37b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1518,7 +1518,7 @@ "copperaoh_m2": 0.0, "copperaoh_m2_max": 100000000.0, "coreradiationfraction": 1.0, - "coreradius": 0.6, + "radius_plasma_core_norm": 0.6, "cost_factor_bop": 1.0, "cost_factor_buildings": 1.0, "cost_factor_fwbs": 1.0, @@ -9180,7 +9180,7 @@ "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(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", + "radius_plasma_core_norm": "radius_plasma_core_norm /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", "cost_factor_fwbs": "cost scaling factor for fwbs", @@ -10192,7 +10192,7 @@ "nre": "", "nsix": "", "nsixi": "", - "nsweep": "Switch denoting quantity to scan:", + "nsweep": "Switch denoting quantity to scan:", "nsweep_2": "nsweep_2 /3/ : switch denoting quantity to scan for 2D scan:", "nt": "", "ntype": "switch for vacuum pump type:\n", @@ -11973,7 +11973,7 @@ "lb": 0.0, "ub": 1.0 }, - "coreradius": { + "radius_plasma_core_norm": { "lb": 0.0, "ub": 1.0 }, @@ -18351,7 +18351,7 @@ ], "impurity_radiation_module": [ "n_impurities", - "coreradius", + "radius_plasma_core_norm", "coreradiationfraction", "fimp", "imp_label", @@ -19909,7 +19909,7 @@ "26": "triang", "27": "tbrmin", "28": "bt", - "29": "coreradius", + "29": "radius_plasma_core_norm", "3": "pnetelin", "31": "f_alpha_energy_confinement_min", "32": "epsvmc", @@ -20098,7 +20098,7 @@ "copperaoh_m2": "real_variable", "copperaoh_m2_max": "real_variable", "coreradiationfraction": "real_variable", - "coreradius": "real_variable", + "radius_plasma_core_norm": "real_variable", "cost_factor_bop": "real_variable", "cost_factor_buildings": "real_variable", "cost_factor_fwbs": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index 7612f6c197..9f81a1c3a1 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -142,7 +142,7 @@ etath = 0.4 *Thermal to electric conversion efficiency; if seconday_ *------------Impurity Radiation Module-------------* *imprad_model = 1 *Switch for impurity radiation model -coreradius = 0.6 *Normalised radius defining the 'core' region +radius_plasma_core_norm = 0.6 *Normalised radius defining the 'core' region fimp(1) = 1.0 *Hydrogen (fraction calculated by code) fimp(2) = 0.1 *Helium (fraction calculated by code) diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index f8dbe7054d..cb8a527d7b 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -468,7 +468,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 287c6b6603..e180f79865 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -450,7 +450,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 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 35087e33fb..2f911da8a3 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -232,7 +232,7 @@ iprimshld = 1 * Switch for shield thermal power destiny; *------------Impurity Radiation Module-------------* -coreradius = 0.75 * coreradius /0;6/ ; normalised radius defining the 'core' region +radius_plasma_core_norm = 0.75 * radius_plasma_core_norm /0;6/ ; normalised radius defining the 'core' region coreradiationfraction = 0.6 * coreradiationfraction /1;0/ ; fraction of radiation from 'core' region that is subtracted from the loss power fimp(1) = 0.9 fimp(2) = 0.1 diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 9802f9a7a4..b99c26a17d 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -256,7 +256,7 @@ iprimshld = 1 * Switch for shield thermal power destiny; *------------Impurity Radiation Module-------------* -coreradius = 0.75 * coreradius /0;6/ ; normalised radius defining the 'core' region +radius_plasma_core_norm = 0.75 * radius_plasma_core_norm /0;6/ ; normalised radius defining the 'core' region coreradiationfraction = 0.7 * coreradiationfraction /1;0/ ; fraction of radiation from 'core' region that is subtracted from the loss power fimp(1) = 1.0 fimp(2) = 0.1 diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 532b778e35..f88e4a7587 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -577,7 +577,7 @@ alphaj = 0.1 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Radiation,Fuelling & Impurities ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * DESCRIPTION: Normalised Radius Defining the 'Core' Region * JUSTIFICATION: * REFERENCE: Lux et al. (2016), Plasma Phys. Control. Fusion, 58, 075001 diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index 019023f0e0..c0dd7a25de 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -225,7 +225,7 @@ ipowerflow = 1 * switch for power flow model; *------------Impurity Radiation Module-------------* -coreradius = 0.6 * coreradius /0;6/ ; normalised radius defining the 'core' region +radius_plasma_core_norm = 0.6 * radius_plasma_core_norm /0;6/ ; normalised radius defining the 'core' region coreradiationfraction = 1. * coreradiationfraction /1;0/ ; fraction of radiation from 'core' region that is subtracted from the loss power fimp(1) = 1.0 fimp(2) = 0.1 diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 4fcbf3aaa6..cba5b8c396 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -469,7 +469,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 9323efb30d..13ccad049e 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -425,7 +425,7 @@ Line_radiation_power_(MW)_______________________________________________ (plinepv*vol)_________________ 1.4402E+02 OP Synchrotron_radiation_power_(MW)________________________________________ (p_plasma_sync_mw)_________________ 1.5820E+01 OP Synchrotron_wall_reflectivity_factor____________________________________ (f_sync_reflect)_______________________ 6.0000E-01 - Normalised_minor_radius_defining_'core'_________________________________ (coreradius)__________________ 7.5000E-01 + Normalised_minor_radius_defining_'core'_________________________________ (radius_plasma_core_norm)__________________ 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)____________________________________ (p_plasma_outer_rad_mw)_____________ 1.3317E+02 OP @@ -1135,7 +1135,7 @@ Total_High-grade_thermal_power_(MW)_____________________________________ (pthermmw)____________________ 2.1713E+03 Number_of_primary_heat_exchangers_______________________________________ (nphx)________________________ 3 OP Transport_power_from_scaling_law_(MW)___________________________________ (pscalingmw)__________________ 2.9729E+02 - Radiation_power_from_inside_"coreradius"_(MW)___________________________ (pcoreradmw.)_________________ 9.1277E+01 + Radiation_power_from_inside_"radius_plasma_core_norm"_(MW)___________________________ (pcoreradmw.)_________________ 9.1277E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8856E+02 Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0698E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2675E+00 @@ -1660,7 +1660,7 @@ pheat = 75.0 ********************** * Normalised radius defining the 'core' region -coreradius = 0.75 +radius_plasma_core_norm = 0.75 * fraction of radiation from 'core' region that is subtracted coreradiationfraction = 0.6 diff --git a/tests/unit/test_impurity_radiation.py b/tests/unit/test_impurity_radiation.py index e9df9f06f7..833ef652dd 100644 --- a/tests/unit/test_impurity_radiation.py +++ b/tests/unit/test_impurity_radiation.py @@ -85,7 +85,7 @@ def test_pimpden(): class FradcoreParam(NamedTuple): rho: np.array = np.array - coreradius: float = 0.0 + radius_plasma_core_norm: float = 0.0 coreradiationfraction: float = 0.0 expected_fradcore: np.array = np.array @@ -96,8 +96,8 @@ def test_fradcore(): :param rho: normalised minor radius :type rho: np.array - :param coreradius: normalised core radius - :type coreradius: float + :param radius_plasma_core_norm: normalised core radius + :type radius_plasma_core_norm: float :param coreradiationfraction: fraction of core radiation :type coreradiationfraction: float @@ -105,7 +105,7 @@ def test_fradcore(): """ fradcoreparam = FradcoreParam( rho=np.array([0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9]), - coreradius=0.75000000000000011, + radius_plasma_core_norm=0.75000000000000011, coreradiationfraction=0.60000000000000009, expected_fradcore=np.array([ 0.6, @@ -121,7 +121,9 @@ def test_fradcore(): ]), ) fradcore = impurity_radiation.fradcore( - fradcoreparam.rho, fradcoreparam.coreradius, fradcoreparam.coreradiationfraction + fradcoreparam.rho, + fradcoreparam.radius_plasma_core_norm, + fradcoreparam.coreradiationfraction, ) assert pytest.approx(fradcore) == fradcoreparam.expected_fradcore diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index 25bae82cbd..ef9b0404df 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -2718,7 +2718,7 @@ class StCalcEffChiParam(NamedTuple): rminor: Any = None - coreradius: Any = None + radius_plasma_core_norm: Any = None stella_config_rminor_ref: Any = None @@ -2741,7 +2741,7 @@ class StCalcEffChiParam(NamedTuple): vol_plasma=1385.8142655379029, a_plasma_surface=1926.0551116585129, rminor=1.7863900994187722, - coreradius=0.60000000000000009, + radius_plasma_core_norm=0.60000000000000009, stella_config_rminor_ref=1.80206932, f_r=0.99129932482229, expected_output=0.2620230359599852, @@ -2758,7 +2758,7 @@ class StCalcEffChiParam(NamedTuple): vol_plasma=1385.8142655379029, a_plasma_surface=1926.0551116585129, rminor=1.7863900994187722, - coreradius=0.60000000000000009, + radius_plasma_core_norm=0.60000000000000009, stella_config_rminor_ref=1.80206932, f_r=0.99129932482229, expected_output=0.2368034193234161, @@ -2812,7 +2812,9 @@ def test_st_calc_eff_chi(stcalceffchiparam, monkeypatch, stellarator): monkeypatch.setattr(physics_variables, "rminor", stcalceffchiparam.rminor) monkeypatch.setattr( - impurity_radiation_module, "coreradius", stcalceffchiparam.coreradius + impurity_radiation_module, + "radius_plasma_core_norm", + stcalceffchiparam.radius_plasma_core_norm, ) monkeypatch.setattr( From e2293247db3546561740f015d661aa5b2131c576 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 15:29:42 +0000 Subject: [PATCH 06/13] =?UTF-8?q?=F0=9F=94=84=20Rename=20palpfwmw=20to=20p?= =?UTF-8?q?=5Ffw=5Falpha=5Fmw=20for=20clarity=20and=20consistency?= 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/dcll.py | 2 +- process/hcpb.py | 2 +- process/io/sankey_funcs.py | 12 ++++---- process/physics.py | 6 ++-- process/power.py | 18 +++++------ 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_ccfe_hcpb.py | 10 ++++--- tests/unit/test_dcll.py | 8 ++--- tests/unit/test_power.py | 8 ++--- 23 files changed, 66 insertions(+), 64 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 7ac8289534..5e41f5608a 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -439,7 +439,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 6c7b286c6d..f752ff3f4f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -439,7 +439,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 5e409a5e7b..71d744f300 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -439,7 +439,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 0907587ae5..2a45c17a03 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -439,7 +439,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index b6930da149..7d4bbee94e 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -439,7 +439,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/process/dcll.py b/process/dcll.py index 75618c74ff..c593f0fe2e 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -200,7 +200,7 @@ def dcll_neutronics_and_power(self, output: bool): * build_variables.a_fw_outboard / build_variables.a_fw_total + current_drive_variables.porbitlossmw - + physics_variables.palpfwmw + + physics_variables.p_fw_alpha_mw ) fwbs_variables.psurffwi = fwbs_variables.pradfw * ( 1 - build_variables.a_fw_outboard / build_variables.a_fw_total diff --git a/process/hcpb.py b/process/hcpb.py index 2158620ea4..300e6cc2ed 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -689,7 +689,7 @@ def powerflow_calc(self, output: bool): * build_variables.a_fw_outboard / build_variables.a_fw_total + current_drive_variables.porbitlossmw - + physics_variables.palpfwmw + + physics_variables.p_fw_alpha_mw ) fwbs_variables.psurffwi = fwbs_variables.pradfw * ( 1 - build_variables.a_fw_outboard / build_variables.a_fw_total diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index b6b18d5742..fa7f0192d1 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -71,7 +71,7 @@ def plot_full_sankey( f_alpha_plasma = m_file.data["f_alpha_plasma"].get_scan( -1 ) # Fraction of alpha power deposited in plasma - palpfwmw = alpha_power_total * ( + p_fw_alpha_mw = alpha_power_total * ( 1 - f_alpha_plasma ) # Alpha particles hitting first wall (MW) p_plasma_rad_mw = m_file.data["p_plasma_rad_mw"].get_scan( @@ -193,7 +193,7 @@ def plot_full_sankey( # --------------------------------- CHARGED PARTICLES - 2 --------------------------------- # Charge P.+Ohmic, Alpha+Injected, -Divertor, -1st Wall, -Photons - chargedp = [pcharohmmw, palpinjmw, -pdivt, -palpfwmw, -p_plasma_rad_mw] + chargedp = [pcharohmmw, palpinjmw, -pdivt, -p_fw_alpha_mw, -p_plasma_rad_mw] sankey.add( flows=chargedp, # down(in), down(in), up(out), up(out), right(out) @@ -291,7 +291,7 @@ def plot_full_sankey( # ---------------------------------------- 1ST WALL - 5 --------------------------------------- # Alphas, Neutrons, Photons, Coolant Pumping, Total 1st Wall - first_wall = [palpfwmw, p_fw_nuclear_heat_total_mw, pradfw, htpmwfw, -pthermfw] + first_wall = [p_fw_alpha_mw, p_fw_nuclear_heat_total_mw, pradfw, htpmwfw, -pthermfw] sankey.add( flows=first_wall, orientations=[0, -1, 1, -1, 0], @@ -461,7 +461,7 @@ def plot_full_sankey( t.set_position((pos[0],pos[1]+0.5*(pradfw/totalplasma)+0.15)) if t == diagrams[3].texts[3]: # Charged P. t.set_horizontalalignment('left') - t.set_position((pos[0]+0.5*((pdivt+palpfwmw)/totalplasma)+0.1,pos[1]+0.05)) + t.set_position((pos[0]+0.5*((pdivt+p_fw_alpha_mw)/totalplasma)+0.1,pos[1]+0.05)) if t == diagrams[3].texts[4]: # Rad. Div. t.set_horizontalalignment('right') t.set_position((pos[0]-0.5*(praddiv/totalplasma)-0.1,pos[1])) @@ -531,7 +531,7 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia f_alpha_plasma = m_file.data["f_alpha_plasma"].get_scan( -1 ) # Fraction of alpha power deposited in plasma - palpfwmw = alpha_power_total * ( + p_fw_alpha_mw = alpha_power_total * ( 1 - f_alpha_plasma ) # Alpha power hitting 1st wall (MW) itart = m_file.data["itart"].get_scan( @@ -542,7 +542,7 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia totaldivetc = pdivt + pnucdiv + praddiv # Power deposited on Blanket (MW) totalblktetc = ( - p_fw_nuclear_heat_total_mw + pnucblkt + pnucshld + pradfw + palpfwmw - emultmw + p_fw_nuclear_heat_total_mw + pnucblkt + pnucshld + pradfw + p_fw_alpha_mw - emultmw ) if itart == 0: diff --git a/process/physics.py b/process/physics.py index b6efb20128..6140a3722f 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2267,7 +2267,7 @@ def physics(self): ) # Power transported to the first wall by escaped alpha particles - physics_variables.palpfwmw = physics_variables.alpha_power_total * ( + physics_variables.p_fw_alpha_mw = physics_variables.alpha_power_total * ( 1.0e0 - physics_variables.f_alpha_plasma ) @@ -4737,8 +4737,8 @@ def outplas(self): po.ovarre( self.outfile, "Fast alpha particle power incident on the first wall (MW)", - "(palpfwmw)", - physics_variables.palpfwmw, + "(p_fw_alpha_mw)", + physics_variables.p_fw_alpha_mw, "OP ", ) po.ovarre( diff --git a/process/power.py b/process/power.py index fa9aeb81a7..30ac357f29 100644 --- a/process/power.py +++ b/process/power.py @@ -640,7 +640,7 @@ def power1(self): + (fwbs_variables.pnucblkt * (1 - fwbs_variables.f_nuc_pow_bz_liq)) + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw - + physics_variables.palpfwmw + + physics_variables.p_fw_alpha_mw + current_drive_variables.nbshinemw ) elif fwbs_variables.icooldual == 1: @@ -651,7 +651,7 @@ def power1(self): + fwbs_variables.pnucblkt + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw - + physics_variables.palpfwmw + + physics_variables.p_fw_alpha_mw + current_drive_variables.nbshinemw ) else: @@ -661,7 +661,7 @@ def power1(self): + fwbs_variables.pnucblkt + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw - + physics_variables.palpfwmw + + physics_variables.p_fw_alpha_mw + current_drive_variables.nbshinemw ) @@ -673,7 +673,7 @@ def power1(self): + fwbs_variables.pnucblkt + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw - + physics_variables.palpfwmw + + physics_variables.p_fw_alpha_mw + current_drive_variables.nbshinemw ) @@ -684,7 +684,7 @@ def power1(self): + fwbs_variables.pradfw + heat_transport_variables.htpmw_fw + current_drive_variables.porbitlossmw - + physics_variables.palpfwmw + + physics_variables.p_fw_alpha_mw + current_drive_variables.nbshinemw ) # Total power deposited in blanket coolant (MW) (energy multiplication in fwbs_variables.pnucblkt already) @@ -771,13 +771,13 @@ def power1(self): # Secondary heat (some of it... rest calculated in POWER2) # Wall plug injection power # MDK - # heat_transport_variables.pinjwp = (current_drive_variables.pinjmw + current_drive_variables.porbitlossmw + physics_variables.palpfwmw)/etacd + # heat_transport_variables.pinjwp = (current_drive_variables.pinjmw + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw)/etacd # heat_transport_variables.pinjwp calculated in current_drive.f90 # Waste injection power if physics_variables.ignite == 0: # MDK - # pinjht = heat_transport_variables.pinjwp - current_drive_variables.pinjmw - current_drive_variables.porbitlossmw - physics_variables.palpfwmw + # pinjht = heat_transport_variables.pinjwp - current_drive_variables.pinjmw - current_drive_variables.porbitlossmw - physics_variables.p_fw_alpha_mw heat_transport_variables.pinjht = ( heat_transport_variables.pinjwp - current_drive_variables.pinjmw ) @@ -1334,14 +1334,14 @@ def power2(self, output: bool): 0.0e0, fwbs_variables.p_fw_nuclear_heat_total_mw, ) - po.dblcol(self.outfile, "palpfwmw", 0.0e0, physics_variables.palpfwmw) + po.dblcol(self.outfile, "p_fw_alpha_mw", 0.0e0, physics_variables.p_fw_alpha_mw) po.dblcol(self.outfile, "pradfw", 0.0e0, fwbs_variables.pradfw) po.dblcol(self.outfile, "htpmw_fw", 0.0e0, heat_transport_variables.htpmw_fw) primsum = ( primsum + fwbs_variables.p_fw_nuclear_heat_total_mw - + physics_variables.palpfwmw + + physics_variables.p_fw_alpha_mw + fwbs_variables.pradfw + heat_transport_variables.htpmw_fw ) diff --git a/process/stellarator.py b/process/stellarator.py index 539b942c86..79e272a885 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4378,7 +4378,7 @@ def stphys(self, output): # Power transported to the first wall by escaped alpha particles - physics_variables.palpfwmw = physics_variables.alpha_power_total * ( + physics_variables.p_fw_alpha_mw = physics_variables.alpha_power_total * ( 1.0e0 - physics_variables.f_alpha_plasma ) diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 0915af4edc..1095225143 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -561,7 +561,7 @@ module physics_variables real(dp) :: alpha_power_electron_density !! Alpha power per volume to electrons [MW/m3] - real(dp) :: palpfwmw + real(dp) :: p_fw_alpha_mw !! alpha power escaping plasma and reaching first wall (MW) real(dp) :: alpha_power_ions_density @@ -1024,7 +1024,7 @@ subroutine init_physics_variables alpha_power_density_plasma = 0.0D0 alpha_power_density_total = 0.0D0 alpha_power_electron_density = 0.0D0 - palpfwmw = 0.0D0 + p_fw_alpha_mw = 0.0D0 alpha_power_ions_density = 0.0D0 alpha_power_total = 0.0D0 alpha_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 cfd63001a4..cd8e4ccf19 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -438,7 +438,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 2f57335e23..66086103b2 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -439,7 +439,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index dc429bc263..fad89f3863 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -439,7 +439,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 3b64bf7a82..deb8c26174 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -439,7 +439,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index a274310b67..91b1f537f7 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -435,7 +435,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index e467865fc2..7e66ca3fda 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -440,7 +440,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -1603,7 +1603,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -2766,7 +2766,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -3929,7 +3929,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -5092,7 +5092,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -6255,7 +6255,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -7418,7 +7418,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -8581,7 +8581,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -9744,7 +9744,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -10907,7 +10907,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -12070,7 +12070,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -13233,7 +13233,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -14396,7 +14396,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -15559,7 +15559,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP @@ -16722,7 +16722,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 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 d72707f37b..e0653c5718 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3472,7 +3472,7 @@ "p_he": 8000000.0, "pacpmw": 0.0, "alpha_power_electron_density": 0.0, - "palpfwmw": 0.0, + "p_fw_alpha_mw": 0.0, "alpha_power_ions_density": 0.0, "alpha_power_total": 0.0, "alpha_power_beams": 0.0, @@ -10231,7 +10231,7 @@ "p_he": "pressure in FW and blanket coolant at pump exit (`primary_pumping=3`) [Pa]", "pacpmw": "total pulsed power system load (MW)", "alpha_power_electron_density": "alpha power per volume to electrons (MW/m3)", - "palpfwmw": "alpha power escaping plasma and reaching first wall (MW)", + "p_fw_alpha_mw": "alpha power escaping plasma and reaching first wall (MW)", "alpha_power_ions_density": "alpha power per volume to ions (MW/m3)", "alpha_power_total": "alpha power (MW)", "alpha_power_beams": "alpha power from hot neutral beam ions (MW)", @@ -19161,7 +19161,7 @@ "alpha_power_density_total", "alpha_power_density_plasma", "alpha_power_electron_density", - "palpfwmw", + "p_fw_alpha_mw", "alpha_power_ions_density", "alpha_power_total", "alpha_power_beams", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 13ccad049e..156a196f26 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -435,7 +435,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (p_fw_alpha_mw)____________________ 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 Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 65a059931f..47bcc5db8b 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -840,7 +840,7 @@ class PowerflowCalcParam(NamedTuple): p_plasma_rad_mw: Any = None - palpfwmw: Any = None + p_fw_alpha_mw: Any = None pdivt: Any = None @@ -909,7 +909,7 @@ class PowerflowCalcParam(NamedTuple): fpumpdiv=0.0050000000000000001, idivrt=1, p_plasma_rad_mw=287.44866938104849, - palpfwmw=19.835845058655043, + p_fw_alpha_mw=19.835845058655043, pdivt=143.6315222649435, p_he=8000000, dp_he=550000, @@ -958,7 +958,7 @@ class PowerflowCalcParam(NamedTuple): fpumpdiv=0.0050000000000000001, idivrt=1, p_plasma_rad_mw=287.44866938104849, - palpfwmw=19.829653483586444, + p_fw_alpha_mw=19.829653483586444, pdivt=143.51338080047339, p_he=8000000, dp_he=550000, @@ -1077,7 +1077,9 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): physics_variables, "p_plasma_rad_mw", powerflowcalcparam.p_plasma_rad_mw ) - monkeypatch.setattr(physics_variables, "palpfwmw", powerflowcalcparam.palpfwmw) + monkeypatch.setattr( + physics_variables, "p_fw_alpha_mw", powerflowcalcparam.p_fw_alpha_mw + ) monkeypatch.setattr(physics_variables, "pdivt", powerflowcalcparam.pdivt) diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 163468bc1a..11291ed395 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -71,7 +71,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_plasma_rad_mw: Any = None - palpfwmw: Any = None + p_fw_alpha_mw: Any = None expected_praddiv: Any = None @@ -113,7 +113,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): idivrt=1, neutron_power_total=1587.7386535917431, p_plasma_rad_mw=287.44866938104849, - palpfwmw=19.835845058655043, + p_fw_alpha_mw=19.835845058655043, expected_praddiv=33.056596978820579, expected_pnucdiv=182.58994516305046, expected_pradfw=254.39207240222791, @@ -145,7 +145,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): idivrt=1, neutron_power_total=1587.2430556964196, p_plasma_rad_mw=287.44866938104849, - palpfwmw=19.829653483586444, + p_fw_alpha_mw=19.829653483586444, expected_praddiv=33.056596978820579, expected_pnucdiv=182.53295140508826, expected_pradfw=254.39207240222791, @@ -251,7 +251,7 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl ) monkeypatch.setattr( - physics_variables, "palpfwmw", dcllneutronicsandpowerparam.palpfwmw + physics_variables, "p_fw_alpha_mw", dcllneutronicsandpowerparam.p_fw_alpha_mw ) dcll.dcll_neutronics_and_power(False) diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 69ecec8d3c..b82625ecad 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2157,7 +2157,7 @@ class Power2Param(NamedTuple): pdivt: Any = None - palpfwmw: Any = None + p_fw_alpha_mw: Any = None idivrt: Any = None @@ -2300,7 +2300,7 @@ class Power2Param(NamedTuple): p_plasma_rad_mw=287.99550050743289, itart=0, pdivt=143.03180561618876, - palpfwmw=19.833077403424262, + p_fw_alpha_mw=19.833077403424262, idivrt=1, p_plasma_ohmic_mw=0.61391840981850698, i_rad_loss=1, @@ -2402,7 +2402,7 @@ class Power2Param(NamedTuple): p_plasma_rad_mw=287.99550050743289, itart=0, pdivt=142.91368967092416, - palpfwmw=19.826887164528632, + p_fw_alpha_mw=19.826887164528632, idivrt=1, p_plasma_ohmic_mw=0.61391840981850698, i_rad_loss=1, @@ -2592,7 +2592,7 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(physics_variables, "pdivt", power2param.pdivt) - monkeypatch.setattr(physics_variables, "palpfwmw", power2param.palpfwmw) + monkeypatch.setattr(physics_variables, "p_fw_alpha_mw", power2param.p_fw_alpha_mw) monkeypatch.setattr(physics_variables, "idivrt", power2param.idivrt) From 72e92e8e7a9798484b47272cfc37a8e4600a2fb2 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 15:31:49 +0000 Subject: [PATCH 07/13] =?UTF-8?q?=F0=9F=94=84=20Rename=20wallmw=20to=20pfl?= =?UTF-8?q?ux=5Ffw=5Fneutron=5Fmw=20for=20clarity=20and=20consistency?= 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/availability.py | 16 +++++----- process/ife.py | 12 ++++---- process/io/mfile_comparison.py | 6 ++-- process/io/plot_proc.py | 2 +- process/objectives.py | 2 +- process/physics.py | 10 +++---- process/stellarator.py | 27 +++++++++-------- 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 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_availability.py | 14 +++++---- tests/unit/test_ife.py | 8 +++-- tests/unit/test_stellarator.py | 8 +++-- tracking/tracking_data.py | 2 +- 29 files changed, 112 insertions(+), 103 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 5e41f5608a..1d36f77853 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -440,7 +440,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.5907E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.9792E-01 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 9.9792E-01 OP Radiation_power_from_SoL_(MW)___________________________________________ (pradsolmw)___________________ 1.2414E+02 OP SoL_radiation_fraction_=_total_radiation_in_SoL_/_total_power_accross_se (rad_fraction_sol)____________ 8.0000E-01 IP Radiation_fraction_total_=_SoL_+_LCFS_radiation_/_total_power_deposited_ (rad_fraction_total)__________ 9.1819E-01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index f752ff3f4f..646a3d0f6f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -440,7 +440,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6182E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 71d744f300..847e49b5f3 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -440,7 +440,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6182E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 2a45c17a03..fba44acf5c 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -440,7 +440,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6182E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 7d4bbee94e..f0f5966430 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -440,7 +440,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6182E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index a8fb1c119a..9fa5055249 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -296,7 +296,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -1291,7 +1291,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -2286,7 +2286,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -3281,7 +3281,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -4276,7 +4276,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -5271,7 +5271,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -6266,7 +6266,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -7261,7 +7261,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -8256,7 +8256,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/process/availability.py b/process/availability.py index 6b8807f8d8..0e8a4ef51f 100644 --- a/process/availability.py +++ b/process/availability.py @@ -101,13 +101,15 @@ def avail(self, output: bool): # Calculate blanket lifetime using neutron fluence model (ibkt_life=0) # or DEMO fusion power model (ibkt_life=1) if cv.ibkt_life == 0: - fwbsv.bktlife = min(cv.abktflnc / pv.wallmw, cv.tlife) + fwbsv.bktlife = min(cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife) else: fwbsv.bktlife = min(cv.life_dpa / dpa_fpy, cv.tlife) # DEMO else: if cv.ibkt_life == 0: fwbsv.bktlife = min( - fwbsv.life_fw_fpy, cv.abktflnc / pv.wallmw, cv.tlife + + fwbsv.life_fw_fpy, cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife + ) else: fwbsv.bktlife = min( @@ -475,7 +477,7 @@ def calc_u_planned(self, output: bool) -> float: # Calculate blanket lifetime using neutron fluence model (ibkt_life=0) # or DEMO fusion power model (ibkt_life=1) if cv.ibkt_life == 0: - fwbsv.bktlife = min(cv.abktflnc / pv.wallmw, cv.tlife) + fwbsv.bktlife = min(cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife) else: fwbsv.bktlife = min(cv.life_dpa / dpa_fpy, cv.tlife) # DEMO @@ -1045,7 +1047,7 @@ def avail_st(self, output: bool): dpa_fpy = f_scale * ref_dpa_fpy if cv.ibkt_life == 0: - fwbsv.bktlife = min(cv.abktflnc / pv.wallmw, cv.tlife) + fwbsv.bktlife = min(cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife) else: fwbsv.bktlife = min(cv.life_dpa / dpa_fpy, cv.tlife) # DEMO @@ -1190,8 +1192,8 @@ def avail_st(self, output: bool): po.ovarre( self.outfile, "Average neutron wall load (MW/m2)", - "(wallmw)", - pv.wallmw, + "(pflux_fw_neutron_mw)", + pv.pflux_fw_neutron_mw, "OP ", ) po.ovarre( @@ -1288,7 +1290,7 @@ def cp_lifetime(): # Aluminium/Copper magnets CP lifetime # For now, we keep the original def, developed for GLIDCOP magnets ... else: - cplife = min(cv.cpstflnc / pv.wallmw, cv.tlife) + cplife = min(cv.cpstflnc / pv.pflux_fw_neutron_mw, cv.tlife) return cplife diff --git a/process/ife.py b/process/ife.py index 6632387555..43ef923093 100644 --- a/process/ife.py +++ b/process/ife.py @@ -1484,7 +1484,7 @@ def ifephy(self, output: bool = False): phi = 0.5 * np.pi + np.arctan(ife_variables.zl1 / ife_variables.r1) sang = 1.0 - np.cos(phi) - physics_variables.wallmw = ( + physics_variables.pflux_fw_neutron_mw = ( physics_variables.fusion_power * 0.5 * sang / build_variables.a_fw_total ) @@ -1496,12 +1496,12 @@ def ifephy(self, output: bool = False): sang = 1.0 - np.cos(phi) phi = np.arctan(ife_variables.flirad / ife_variables.zu1) sang = sang - (1.0 - np.cos(phi)) - physics_variables.wallmw = ( + physics_variables.pflux_fw_neutron_mw = ( physics_variables.fusion_power * 0.5 * sang / build_variables.a_fw_total ) else: - physics_variables.wallmw = ( + physics_variables.pflux_fw_neutron_mw = ( physics_variables.fusion_power / build_variables.a_fw_total ) @@ -1548,8 +1548,8 @@ def ifephy(self, output: bool = False): process_output.ovarre( self.outfile, "Neutron wall load (MW/m2)", - "(wallmw)", - physics_variables.wallmw, + "(pflux_fw_neutron_mw)", + physics_variables.pflux_fw_neutron_mw, ) def driver(self, edrive, gainve, etave): @@ -1835,7 +1835,7 @@ def ifefbs(self, output: bool = False): life = min( cost_variables.tlife, cost_variables.abktflnc - / (physics_variables.wallmw * cost_variables.cfactr), + / (physics_variables.pflux_fw_neutron_mw * cost_variables.cfactr), ) fwbs_variables.bktlife = life diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index aad235396a..0a643c5e3a 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -77,7 +77,7 @@ "pgrossmw", "htpmw", "pnetelmw", - "wallmw", + "pflux_fw_neutron_mw", "f_nd_alpha_electron", "p_plasma_inner_rad_mw", "p_plasma_rad_mw", @@ -134,7 +134,7 @@ "hfact", "tauelaw", "f_nd_alpha_electron", - "wallmw", + "pflux_fw_neutron_mw", "p_plasma_inner_rad_mw", "p_plasma_sync_mw", "p_plasma_rad_mw", @@ -225,7 +225,7 @@ "dene", "pinjmw", "pnetelmw", - "wallmw", + "pflux_fw_neutron_mw", "pflux_fw_rad_mw", "f_nd_alpha_electron", "p_plasma_inner_rad_mw", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 7429f102c4..677fcc1620 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2747,7 +2747,7 @@ def plot_power_info(axis, mfile_data, scan): crypmw = mfile_data.data["crypmw"].get_scan(scan) data = [ - ("wallmw", "Nominal neutron wall load", "MW m$^{-2}$"), + ("pflux_fw_neutron_mw", "Nominal neutron wall load", "MW m$^{-2}$"), coredescription, ped_height, ped_pos, diff --git a/process/objectives.py b/process/objectives.py index 1f2f30dc03..2f49f24605 100644 --- a/process/objectives.py +++ b/process/objectives.py @@ -65,7 +65,7 @@ def objective_function(minmax: int) -> float: case 1: objective_metric = 0.2 * physics_variables.rmajor case 3: - objective_metric = physics_variables.wallmw + objective_metric = physics_variables.pflux_fw_neutron_mw case 4: objective_metric = ( tfcoil_variables.tfcmw + 1e-3 * pf_power_variables.srcktpm diff --git a/process/physics.py b/process/physics.py index 6140a3722f..436798e276 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2141,7 +2141,7 @@ def physics(self): # Nominal mean neutron wall load on entire first wall area including divertor and beam holes # Note that 'a_fw_total' excludes these, so they have been added back in. if physics_variables.iwalld == 1: - physics_variables.wallmw = ( + physics_variables.pflux_fw_neutron_mw = ( physics_variables.ffwal * physics_variables.neutron_power_total / physics_variables.a_plasma_surface @@ -2149,14 +2149,14 @@ def physics(self): else: if physics_variables.idivrt == 2: # Double null configuration - physics_variables.wallmw = ( + physics_variables.pflux_fw_neutron_mw = ( (1.0e0 - fwbs_variables.fhcd - 2.0e0 * fwbs_variables.fdiv) * physics_variables.neutron_power_total / build_variables.a_fw_total ) else: # Single null Configuration - physics_variables.wallmw = ( + physics_variables.pflux_fw_neutron_mw = ( (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) * physics_variables.neutron_power_total / build_variables.a_fw_total @@ -4744,8 +4744,8 @@ def outplas(self): po.ovarre( self.outfile, "Nominal mean neutron load on inside surface of reactor (MW/m2)", - "(wallmw)", - physics_variables.wallmw, + "(pflux_fw_neutron_mw)", + physics_variables.pflux_fw_neutron_mw, "OP ", ) diff --git a/process/stellarator.py b/process/stellarator.py index 79e272a885..91cb0470b7 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1107,7 +1107,8 @@ def stfwbs(self, output: bool): of the plasma. """ fwbs_variables.life_fw_fpy = min( - cost_variables.abktflnc / physics_variables.wallmw, cost_variables.tlife + cost_variables.abktflnc / physics_variables.pflux_fw_neutron_mw, + cost_variables.tlife, ) # First wall inboard, outboard areas (assume 50% of total each) @@ -1878,8 +1879,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Average neutron wall load (MW/m2)", - "(wallmw)", - physics_variables.wallmw, + "(pflux_fw_neutron_mw)", + physics_variables.pflux_fw_neutron_mw, ) if fwbs_variables.blktmodel > 0: po.ovarre( @@ -2365,7 +2366,7 @@ def sctfcoil_nuclear_heating_iter90(self): coilhtmx = ( fact[0] - * physics_variables.wallmw + * physics_variables.pflux_fw_neutron_mw * coef[0, ishmat] * np.exp(-decay[5, ishmat] * (dshieq + tfcoil_variables.casthi)) ) @@ -2380,7 +2381,7 @@ def sctfcoil_nuclear_heating_iter90(self): ) ptfowp = ( fact[0] - * physics_variables.wallmw + * physics_variables.pflux_fw_neutron_mw * coef[0, ishmat] * np.exp(-decay[5, ishmat] * (dshoeq + tfcoil_variables.casthi)) * tfcoil_variables.tfsao @@ -2392,7 +2393,7 @@ def sctfcoil_nuclear_heating_iter90(self): htheci = ( fact[1] - * physics_variables.wallmw + * physics_variables.pflux_fw_neutron_mw * coef[1, ishmat] * np.exp(-decay[6, ishmat] * dshieq) ) @@ -2404,7 +2405,7 @@ def sctfcoil_nuclear_heating_iter90(self): ) pheco = ( fact[1] - * physics_variables.wallmw + * physics_variables.pflux_fw_neutron_mw * coef[1, ishmat] * np.exp(-decay[6, ishmat] * dshoeq) * tfcoil_variables.tfsao @@ -2428,7 +2429,7 @@ def sctfcoil_nuclear_heating_iter90(self): coef[2, ishmat] * fpsdt * fact[2] - * physics_variables.wallmw + * physics_variables.pflux_fw_neutron_mw * np.exp(-decay[2, ishmat] * (dshieq + tfcoil_variables.casthi)) ) @@ -2437,7 +2438,7 @@ def sctfcoil_nuclear_heating_iter90(self): nflutf = ( fpsdt * fact[3] - * physics_variables.wallmw + * physics_variables.pflux_fw_neutron_mw * coef[3, ishmat] * np.exp(-decay[3, ishmat] * (dshieq + tfcoil_variables.casthi)) ) @@ -2447,7 +2448,7 @@ def sctfcoil_nuclear_heating_iter90(self): dpacop = ( fpsdt * fact[4] - * physics_variables.wallmw + * physics_variables.pflux_fw_neutron_mw * coef[4, ishmat] * np.exp(-decay[4, ishmat] * (dshieq + tfcoil_variables.casthi)) ) @@ -4271,20 +4272,20 @@ def stphys(self, output): # Neutron wall load if physics_variables.iwalld == 1: - physics_variables.wallmw = ( + physics_variables.pflux_fw_neutron_mw = ( physics_variables.ffwal * physics_variables.neutron_power_total / physics_variables.a_plasma_surface ) else: if heat_transport_variables.ipowerflow == 0: - physics_variables.wallmw = ( + physics_variables.pflux_fw_neutron_mw = ( (1.0e0 - fwbs_variables.fhole) * physics_variables.neutron_power_total / build_variables.a_fw_total ) else: - physics_variables.wallmw = ( + physics_variables.pflux_fw_neutron_mw = ( ( 1.0e0 - fwbs_variables.fhole diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 3d85d66e0a..9e61ee3dce 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -750,9 +750,9 @@ subroutine constraint_eqn_008(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fwalld : input real : f-value for maximum wall load !! walalw : input real : allowable wall-load (MW/m2) - !! wallmw : input real : average neutron wall load (MW/m2) + !! pflux_fw_neutron_mw : input real : average neutron wall load (MW/m2) use constraint_variables, only: fwalld, walalw - use physics_variables, only: wallmw + use physics_variables, only: pflux_fw_neutron_mw implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -760,9 +760,9 @@ subroutine constraint_eqn_008(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 - fwalld * walalw/wallmw + tmp_cc = 1.0D0 - fwalld * walalw/pflux_fw_neutron_mw tmp_con = fwalld * walalw - tmp_err = fwalld * walalw - wallmw + tmp_err = fwalld * walalw - pflux_fw_neutron_mw tmp_symbol = '<' tmp_units = 'MW/m2' diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 1095225143..a4edcbbc96 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -879,7 +879,7 @@ module physics_variables real(dp) :: vs_plasma_total_required !! total V-s needed (Wb) - real(dp) :: wallmw + real(dp) :: pflux_fw_neutron_mw !! average neutron wall load (MW/m2) real(dp) :: wtgpd @@ -1121,7 +1121,7 @@ subroutine init_physics_variables vs_plasma_ind_ramp = 0.0D0 vs_plasma_res_ramp = 0.0D0 vs_plasma_total_required = 0.0D0 - wallmw = 0.0D0 + pflux_fw_neutron_mw = 0.0D0 wtgpd = 0.0D0 a_plasma_poloidal = 0.0D0 zeff = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index cd8e4ccf19..6661a79085 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -439,7 +439,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6182E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 66086103b2..a441603cd1 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -440,7 +440,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6182E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index fad89f3863..d17e1fc031 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -440,7 +440,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6182E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index deb8c26174..a387881c9f 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -440,7 +440,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6182E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0152E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2606E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 91b1f537f7..6e7fc08131 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -436,7 +436,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6157E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0136E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0136E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2824E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 7e66ca3fda..fca76e24ab 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -441,7 +441,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.5972E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0020E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0020E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2234E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -1604,7 +1604,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6119E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0112E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0112E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2371E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -2767,7 +2767,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6196E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0160E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0160E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2128E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -3930,7 +3930,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6224E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0178E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0178E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2196E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -5093,7 +5093,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6250E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0194E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0194E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2511E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -6256,7 +6256,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6199E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0162E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0162E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2724E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -7419,7 +7419,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6231E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0182E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0182E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2820E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -8582,7 +8582,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6254E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0197E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0197E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2575E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -9745,7 +9745,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6193E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0158E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0158E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2337E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -10908,7 +10908,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6298E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0224E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0224E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2479E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -12071,7 +12071,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6394E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0285E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0285E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2599E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -13234,7 +13234,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6388E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0281E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0281E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2824E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -14397,7 +14397,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6476E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0336E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0336E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2952E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -15560,7 +15560,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6563E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0390E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0390E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2804E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -16723,7 +16723,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6654E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0448E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0448E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2652E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 11e0fe3665..34730883f9 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -296,7 +296,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -1291,7 +1291,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -2286,7 +2286,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -3281,7 +3281,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -4276,7 +4276,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -5271,7 +5271,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -6266,7 +6266,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -7261,7 +7261,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP @@ -8256,7 +8256,7 @@ Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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 + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 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 Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e0653c5718..d0b9abd945 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8022,7 +8022,7 @@ "w_he": 0.0, "wa": null, "walalw": 1.0, - "wallmw": 0.0, + "pflux_fw_neutron_mw": 0.0, "wallpf": 1.21, "warm_shop_h": 10.0, "warm_shop_l": 100.0, @@ -11131,7 +11131,7 @@ "w_he": "", "wa": "", "walalw": "allowable neutron wall-load (MW/m2) (`constraint equation 8`)", - "wallmw": "average neutron wall load (MW/m2)", + "pflux_fw_neutron_mw": "average neutron wall load (MW/m2)", "wallpf": "neutron wall load peaking factor (`i_blanket_type=2` (KIT HCPB))", "warm_shop_h": "warm shop length, width, height (m)", "warm_shop_l": "warm shop length, width, height (m)", @@ -19256,7 +19256,7 @@ "vs_plasma_ind_ramp", "vs_plasma_res_ramp", "vs_plasma_total_required", - "wallmw", + "pflux_fw_neutron_mw", "wtgpd", "a_plasma_poloidal", "zeff", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index f88e4a7587..ad77f3148d 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2639,7 +2639,7 @@ f_fw_rad_max = 1.0 *icc = 8 * DESCRIPTION: Neutron wall load upper limit * JUSTIFICATION: Turned off, dot care about wall load -* VARIABLES: wallmw calculated in-situ +* VARIABLES: pflux_fw_neutron_mw calculated in-situ *iwalld = 2 * DESCRIPTION: Switch for neutron wall load calculation (default = 1) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 156a196f26..f206da043b 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -436,7 +436,7 @@ Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP 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)_______________ (p_fw_alpha_mw)____________________ 1.6157E+01 OP - Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0136E+00 OP + Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (pflux_fw_neutron_mw)______________________ 1.0136E+00 OP Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.2824E+01 OP Fraction_of_power_to_the_lower_divertor_________________________________ (ftar)________________________ 1.0000E+00 IP Outboard_side_heat_flux_decay_length_(m)________________________________ (lambdaio)____________________ 1.5700E-03 OP diff --git a/tests/unit/test_availability.py b/tests/unit/test_availability.py index 21cab2801b..46ff70f7d6 100644 --- a/tests/unit/test_availability.py +++ b/tests/unit/test_availability.py @@ -45,7 +45,7 @@ def test_avail_0(monkeypatch, availability, life_fw_fpy, ibkt_life, bktlife_exp_ monkeypatch.setattr(fwbsv, "life_fw_fpy", life_fw_fpy) monkeypatch.setattr(cv, "ibkt_life", ibkt_life) monkeypatch.setattr(cv, "abktflnc", 4.0) - monkeypatch.setattr(pv, "wallmw", 10.0) + monkeypatch.setattr(pv, "pflux_fw_neutron_mw", 10.0) monkeypatch.setattr(cv, "tlife", 30.0) monkeypatch.setattr(cv, "life_dpa", 40.0) monkeypatch.setattr(cv, "adivflnc", 8.0) @@ -151,7 +151,7 @@ def calc_u_planned_param(**kwargs): "cpstflnc": 0.0, "tlife": 30.0, "num_rh_systems": 5, - "wallmw": 1.0, + "pflux_fw_neutron_mw": 1.0, "hldiv": 10.0, "itart": 0, "expected": approx(0.3, abs=0.05), @@ -177,7 +177,7 @@ def calc_u_planned_params(): cpstflnc=20.0, tlife=30.0, num_rh_systems=4, - wallmw=1.0, + pflux_fw_neutron_mw=1.0, hldiv=1.0, itart=1, expected=approx(0.03, abs=0.005), @@ -207,7 +207,9 @@ def calc_u_planned_fix(request, monkeypatch): # Some are parameterised monkeypatch.setattr(fortran.divertor_variables, "hldiv", param["hldiv"]) monkeypatch.setattr(fortran.fwbs_variables, "bktlife", 0.0) - monkeypatch.setattr(fortran.physics_variables, "wallmw", param["wallmw"]) + monkeypatch.setattr( + fortran.physics_variables, "pflux_fw_neutron_mw", param["pflux_fw_neutron_mw"] + ) monkeypatch.setattr(fortran.physics_variables, "itart", param["itart"]) monkeypatch.setattr(cv, "tlife", param["tlife"]) monkeypatch.setattr(cv, "divlife", 0.0) @@ -568,7 +570,7 @@ def test_avail_st(monkeypatch, availability): monkeypatch.setattr(dv, "hldiv", 10.0) monkeypatch.setattr(cv, "ibkt_life", 0) monkeypatch.setattr(cv, "abktflnc", 10.0) - monkeypatch.setattr(pv, "wallmw", 10.0) + monkeypatch.setattr(pv, "pflux_fw_neutron_mw", 10.0) monkeypatch.setattr(cv, "cplife", 5.0) monkeypatch.setattr(cv, "cdrlife", 15.0) @@ -594,7 +596,7 @@ def test_cp_lifetime(monkeypatch, availability, i_tf_sup, exp): monkeypatch.setattr(ctv, "nflutfmax", 1.0e23) monkeypatch.setattr(fwbsv, "neut_flux_cp", 5.0e14) monkeypatch.setattr(cv, "cpstflnc", 20.0) - monkeypatch.setattr(pv, "wallmw", 5.0) + monkeypatch.setattr(pv, "pflux_fw_neutron_mw", 5.0) monkeypatch.setattr(cv, "tlife", 30.0) cplife = availability.cp_lifetime() diff --git a/tests/unit/test_ife.py b/tests/unit/test_ife.py index 8457105e2a..bb77da2967 100644 --- a/tests/unit/test_ife.py +++ b/tests/unit/test_ife.py @@ -1239,7 +1239,7 @@ class IfefbsParam(NamedTuple): mflibe: Any = None fbreed: Any = None ifetyp: Any = None - wallmw: Any = None + pflux_fw_neutron_mw: Any = None expected_m_fw_total: Any = None expected_whtblkt: Any = None expected_whtshld: Any = None @@ -1450,7 +1450,7 @@ class IfefbsParam(NamedTuple): mflibe=0, fbreed=0.52600000000000002, ifetyp=1, - wallmw=8.8876851857005388, + pflux_fw_neutron_mw=8.8876851857005388, expected_m_fw_total=20574.366184891722, expected_whtblkt=347956.92928704334, expected_whtshld=1067310.9593707009, @@ -1574,7 +1574,9 @@ def test_ifefbs(ifefbsparam, monkeypatch, ife): monkeypatch.setattr(ife_variables, "mflibe", ifefbsparam.mflibe) monkeypatch.setattr(ife_variables, "fbreed", ifefbsparam.fbreed) monkeypatch.setattr(ife_variables, "ifetyp", ifefbsparam.ifetyp) - monkeypatch.setattr(physics_variables, "wallmw", ifefbsparam.wallmw) + monkeypatch.setattr( + physics_variables, "pflux_fw_neutron_mw", ifefbsparam.pflux_fw_neutron_mw + ) ife.ifefbs(output=False) diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index ef9b0404df..45872a3795 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -2839,7 +2839,7 @@ class SctfcoilNuclearHeatingIter90Param(NamedTuple): dr_shld_outboard: Any = None cfactr: Any = None tlife: Any = None - wallmw: Any = None + pflux_fw_neutron_mw: Any = None casthi: Any = None i_tf_sup: Any = None tfsai: Any = None @@ -2870,7 +2870,7 @@ class SctfcoilNuclearHeatingIter90Param(NamedTuple): dr_shld_outboard=0.20000000000000001, cfactr=0.75000000000000011, tlife=40, - wallmw=0.61095969282042206, + pflux_fw_neutron_mw=0.61095969282042206, casthi=0.050000000000000003, i_tf_sup=1, tfsai=0, @@ -2941,7 +2941,9 @@ def test_sctfcoil_nuclear_heating_iter90( cost_variables, "tlife", sctfcoilnuclearheatingiter90param.tlife ) monkeypatch.setattr( - physics_variables, "wallmw", sctfcoilnuclearheatingiter90param.wallmw + physics_variables, + "pflux_fw_neutron_mw", + sctfcoilnuclearheatingiter90param.pflux_fw_neutron_mw, ) monkeypatch.setattr( tfcoil_variables, "casthi", sctfcoilnuclearheatingiter90param.casthi diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index b4798e8c39..7bd1bfa86f 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -119,7 +119,7 @@ class ProcessTracker: "p_plasma_inner_rad_mw", "tesep", "f_nd_alpha_electron", - "wallmw", + "pflux_fw_neutron_mw", "aspect", "rminor", "rmajor", From ba23f16ba020181f1f78e45c779f18f2a415ba89 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 16:01:56 +0000 Subject: [PATCH 08/13] :memo: quick doc fixes --- process/physics.py | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/process/physics.py b/process/physics.py index 436798e276..0d7f6b0502 100644 --- a/process/physics.py +++ b/process/physics.py @@ -4642,7 +4642,7 @@ def outplas(self): po.ostars(self.outfile, 110) po.oblnkl(self.outfile) - po.osubhd(self.outfile, "Radiation Power (excluding SOL):") + po.osubhd(self.outfile, "Plasma radiation powers (excluding SOL):") po.ovarre( self.outfile, "Plasma total synchrotron radiation power (MW)", @@ -4650,15 +4650,23 @@ def outplas(self): physics_variables.p_plasma_sync_mw, "OP ", ) + po.ovarre( + self.outfile, + "Plasma total synchrotron radiation power density (MW/m^3)", + "(pden_plasma_sync_mw)", + physics_variables.pden_plasma_sync_mw, + "OP ", + ) po.ovarrf( self.outfile, "Synchrotron wall reflectivity factor", "(f_sync_reflect)", physics_variables.f_sync_reflect, ) + po.oblnkl(self.outfile) po.ovarre( self.outfile, - "Normalised minor radius defining 'core'", + "Plasma normalised minor radius defining 'core' region", "(radius_plasma_core_norm)", impurity_radiation_module.radius_plasma_core_norm, ) @@ -4670,14 +4678,14 @@ def outplas(self): ) po.ovarre( self.outfile, - "Radiation power from inner zone (MW)", + "Plasma total radiation power from core region (MW)", "(p_plasma_inner_rad_mw)", physics_variables.p_plasma_inner_rad_mw, "OP ", ) po.ovarre( self.outfile, - "Radiation power from outer zone (MW)", + "Plasma total radiation power from edge region (MW)", "(p_plasma_outer_rad_mw)", physics_variables.p_plasma_outer_rad_mw, "OP ", @@ -4694,7 +4702,7 @@ def outplas(self): po.ovarre( self.outfile, - "Total radiation power from inside LCFS (MW)", + "Plasma total radiation power from inside last closed flux surface (MW)", "(p_plasma_rad_mw)", physics_variables.p_plasma_rad_mw, "OP ", @@ -4708,21 +4716,21 @@ def outplas(self): ) po.ovarre( self.outfile, - "Nominal mean radiation load on inside surface of reactor (MW/m2)", + "Nominal mean radiation load on vessel first-wall (MW/m^2)", "(pflux_fw_rad_mw)", physics_variables.pflux_fw_rad_mw, "OP ", ) po.ovarre( self.outfile, - "Peaking factor for radiation wall load", + "Peaking factor for radiation first-wall load", "(f_fw_rad_max)", constraint_variables.f_fw_rad_max, "IP ", ) po.ovarre( self.outfile, - "Maximum permitted radiation wall load (MW/m^2)", + "Maximum permitted radiation first-wall load (MW/m^2)", "(pflux_fw_rad_max)", constraint_variables.pflux_fw_rad_max, "IP ", @@ -4736,14 +4744,14 @@ def outplas(self): ) po.ovarre( self.outfile, - "Fast alpha particle power incident on the first wall (MW)", + "Fast alpha particle power incident on the first-wall (MW)", "(p_fw_alpha_mw)", physics_variables.p_fw_alpha_mw, "OP ", ) po.ovarre( self.outfile, - "Nominal mean neutron load on inside surface of reactor (MW/m2)", + "Nominal mean neutron load on vessel first-wall (MW/m^2)", "(pflux_fw_neutron_mw)", physics_variables.pflux_fw_neutron_mw, "OP ", From e4e6ba0ff0246e69d1bddd2f2cf51b8b27ba4677 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 13 Feb 2025 09:40:21 +0000 Subject: [PATCH 09/13] =?UTF-8?q?=F0=9F=94=84=20Refactor=20calculate=5Frad?= =?UTF-8?q?iation=5Fpowers=20function=20to=20accept=20additional=20paramet?= =?UTF-8?q?ers=20for=20improved=20clarity=20and=20accuracy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/physics.py | 16 ++- process/physics_functions.py | 202 +++++++++++++++++++++++++---------- 2 files changed, 159 insertions(+), 59 deletions(-) diff --git a/process/physics.py b/process/physics.py index 0d7f6b0502..513f86d12b 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2176,7 +2176,21 @@ def physics(self): # Calculate radiation power - radpwrdata = physics_funcs.calculate_radiation_powers(self.plasma_profile) + radpwrdata = physics_funcs.calculate_radiation_powers( + self.plasma_profile, + physics_variables.ne0, + physics_variables.rminor, + physics_variables.bt, + physics_variables.aspect, + physics_variables.alphan, + physics_variables.alphat, + physics_variables.tbeta, + physics_variables.te0, + physics_variables.f_sync_reflect, + physics_variables.rmajor, + physics_variables.kappa, + physics_variables.vol_plasma, + ) physics_variables.pden_plasma_sync_mw = radpwrdata.pden_plasma_sync_mw physics_variables.pden_plasma_core_rad_mw = radpwrdata.pden_plasma_core_rad_mw physics_variables.pden_plasma_outer_rad_mw = radpwrdata.pden_plasma_outer_rad_mw diff --git a/process/physics_functions.py b/process/physics_functions.py index 2ffb1d2bfb..fb98b9d1ea 100644 --- a/process/physics_functions.py +++ b/process/physics_functions.py @@ -555,7 +555,21 @@ class RadpwrData: pden_plasma_rad_mw: float -def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: +def calculate_radiation_powers( + plasma_profile: PlasmaProfile, + ne0: float, + rminor: float, + bt: float, + aspect: float, + alphan: float, + alphat: float, + tbeta: float, + te0: float, + f_sync_reflect: float, + rmajor: float, + kappa: float, + vol_plasma: float, +) -> RadpwrData: """ Calculate the radiation powers in MW/m^3 by calling relevant routines. @@ -563,18 +577,46 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: 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. + :param plasma_profile: The parameterized temperature and density profiles of the plasma. + :type plasma_profile: PlasmaProfile + :param ne0: Central electron density (m^-3). + :type ne0: float + :param rminor: Minor radius of the plasma (m). + :type rminor: float + :param bt: Toroidal magnetic field (T). + :type bt: float + :param aspect: Aspect ratio of the plasma. + :type aspect: float + :param alphan: Alpha parameter for density profile. + :type alphan: float + :param alphat: Alpha parameter for temperature profile. + :type alphat: float + :param tbeta: Beta parameter for temperature profile. + :type tbeta: float + :param te0: Central electron temperature (keV). + :type te0: float + :param f_sync_reflect: Fraction of synchrotron radiation reflected. + :type f_sync_reflect: float + :param rmajor: Major radius of the plasma (m). + :type rmajor: float + :param kappa: Elongation of the plasma. + :type kappa: float + :param vol_plasma: Plasma volume (m^3). + :type vol_plasma: float + + :returns: A dataclass containing the following radiation power densities: + - pden_plasma_sync_mw (float): Synchrotron radiation power per unit volume (MW/m^3). + - pden_plasma_core_rad_mw (float): Total core radiation power per unit volume (MW/m^3). + - pden_plasma_outer_rad_mw (float): Edge radiation power per unit volume (MW/m^3). + - pden_plasma_rad_mw (float): Total radiation power per unit volume (MW/m^3). + :rtype: RadpwrData + + :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. - Returns: - RadpwrData: A dataclass containing the following radiation power densities: - - pden_plasma_sync_mw (float): Synchrotron radiation power per unit volume (MW/m^3). - - pden_plasma_core_rad_mw (float): Total core radiation power per unit volume (MW/m^3). - - pden_plasma_outer_rad_mw (float): Edge 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 """ imp_rad = impurity.ImpurityRadiation(plasma_profile) imp_rad.calculate_imprad() @@ -582,7 +624,20 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: pden_plasma_outer_rad_mw = imp_rad.radtot - imp_rad.radcore # Synchrotron radiation power/volume; assumed to be from core only. - pden_plasma_sync_mw = psync_albajar_fidone() + pden_plasma_sync_mw = psync_albajar_fidone( + ne0, + rminor, + bt, + aspect, + alphan, + alphat, + tbeta, + te0, + f_sync_reflect, + rmajor, + kappa, + vol_plasma, + ) # Total core radiation power/volume. pden_plasma_core_rad_mw = imp_rad.radcore + pden_plasma_sync_mw @@ -598,66 +653,97 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData: ) -def psync_albajar_fidone() -> float: +def psync_albajar_fidone( + ne0: float, + rminor: float, + bt: float, + aspect: float, + alphan: float, + alphat: float, + tbeta: float, + te0: float, + f_sync_reflect: float, + rmajor: float, + kappa: float, + vol_plasma: float, +) -> float: + """ + 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. + + :param ne0: Central electron density (m^-3). + :type ne0: float + :param rminor: Minor radius of the plasma (m). + :type rminor: float + :param bt: Toroidal magnetic field (T). + :type bt: float + :param aspect: Aspect ratio of the plasma. + :type aspect: float + :param alphan: Alpha parameter for density profile. + :type alphan: float + :param alphat: Alpha parameter for temperature profile. + :type alphat: float + :param tbeta: Beta parameter for temperature profile. + :type tbeta: float + :param te0: Central electron temperature (keV). + :type te0: float + :param f_sync_reflect: Fraction of synchrotron radiation reflected. + :type f_sync_reflect: float + :param rmajor: Major radius of the plasma (m). + :type rmajor: float + :param kappa: Elongation of the plasma. + :type kappa: float + :param vol_plasma: Plasma volume (m^3). + :type vol_plasma: float + + :returns: Synchrotron radiation power per unit volume (MW/m^3). + :rtype: 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. + + - 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. """ - 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. + # Variable names are created to closely match those from the reference papers. - Returns: - float: Synchrotron radiation power per unit volume (MW/m^3). + ne0_20 = 1.0e-20 * ne0 - Notes: + p_a0 = 6.04e3 * (rminor * ne0_20) / bt - 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. - ‌ - """ + g_function = 0.93 * (1.0 + 0.85 * np.exp(-0.82 * aspect)) - # rpow is the (1-Rsyn) power dependence based on plasma shape - # (see Fidone) - - 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.aspect)) - kfun = ( - (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 + k_function = ( + (alphan + 3.87 * alphat + 1.46) ** -0.79 + * (1.98 + alphat) ** 1.36 + * tbeta**2.14 + * (tbeta**1.53 + 1.87 * alphat - 0.16) ** -1.33 ) - dum = ( - 1.0 - + 0.12 - * (physics_variables.te0 / pao**0.41) - * (1.0 - physics_variables.f_sync_reflect) ** 0.41 - ) ** -1.51 + dum = (1.0 + 0.12 * (te0 / p_a0**0.41) * (1.0 - f_sync_reflect) ** 0.41) ** -1.51 - psync = ( + p_sync_mw = ( 3.84e-8 - * (1.0 - physics_variables.f_sync_reflect) ** 0.62 - * physics_variables.rmajor - * physics_variables.rminor**1.38 - * physics_variables.kappa**0.79 - * physics_variables.bt**2.62 - * de2o**0.38 - * physics_variables.te0 - * (16.0 + physics_variables.te0) ** 2.61 + * (1.0 - f_sync_reflect) ** 0.62 + * rmajor + * rminor**1.38 + * kappa**0.79 + * bt**2.62 + * ne0_20**0.38 + * te0 + * (16.0 + te0) ** 2.61 * dum - * gfun - * kfun + * g_function + * k_function ) # pden_plasma_sync_mw should be per unit volume; Albajar gives it as total - return psync / physics_variables.vol_plasma + return p_sync_mw / vol_plasma @dataclass From 04a4ffea1fac4abbd07fd3e115a5b9e2bf7ad964 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 13 Feb 2025 14:46:32 +0000 Subject: [PATCH 10/13] :memo: Update synchrotorn docs and create enw plotting script --- .../physics-models/plasma_radiation.md | 190 ++++++++++++++---- .../psync_albajar_fidone_reflectivity.py | 48 +++++ 2 files changed, 200 insertions(+), 38 deletions(-) create mode 100644 documentation/proc-pages/scripts/plotting_scripts/psync_albajar_fidone_reflectivity.py diff --git a/documentation/proc-pages/physics-models/plasma_radiation.md b/documentation/proc-pages/physics-models/plasma_radiation.md index eecb032efa..f1785b3ef2 100644 --- a/documentation/proc-pages/physics-models/plasma_radiation.md +++ b/documentation/proc-pages/physics-models/plasma_radiation.md @@ -1,5 +1,18 @@ # Plasma Radiation +## Overview + +In `PROCESS` we have two distinct plasma radiation contributions that are calculated separately. These are the [synchrotron radiation](#synchrotron-radiation--psync_albajar_fidone) and then the [line and Bremsstrahlung radiation](#line--bremsstrahlung-radiation) combined. + +By changing the input parameter `radius_plasma_core_norm`, the user may set the normalised radius defining the 'core' region of the plasma. Anything past this normalised radius is known as the plasma 'edge'. **The synchrotron radiation loss is always deemed to come from the 'core' region.** + + +---------------- + + + +## Line & Bremsstrahlung 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]. @@ -26,36 +39,18 @@ 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` - -### 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[^8][^9] is assumed to originate from the plasma core. +The formula below is the current syncrotorn radiation loss power implemented in `PROCESS`. It is a combination of the general form given by Albajar et al. [^8] and a wall reflectivity correction given then by Fidone et al. [^9] $$ \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) +P_{\text{syn}}(\mathrm{MW})= & 3.84 \times 10^{-8}\times \frac{(1-f_{\text{reflect}})^{0.62}}{\left[1+0.12 \frac{T_{\text{e0}}}{p_{a_0}^{0.41}}\left(1.0 - f_{\text{reflect}}\right)^{0.41}\right]^{1.51}} \\ +& \times R a^{1.38} \kappa^{0.79}B_{\text{T}}^{2.62} n_{\text{e0,20}}^{0.38} T_{\text{e0}}\left(16+T_{\text{e0}}\right)^{2.61} \\ +& \times K\left(\alpha_n, \alpha_T, \beta_T\right) \\ +& \times G(A) \end{aligned} $$ @@ -66,26 +61,143 @@ K(\alpha_n, \alpha_T, \beta_T) = \left(\alpha_n +3.87\alpha_T +1.46\right)^{-0.7 $$ $$ -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_{\text{e0(20)}}}{B_{\text{T}}} $$ +where $T_{\text{e0}}$ is the central electron temperature in keV, $R$ is the plasma major radius, $a$ is the plasma minor radius, $\kappa$ is the plasma separatrix elongation, $B_{\text{T}}$ is the on axis toroidal magnetic field, $n_{\text{e0,20}}$ is the central electron density in units of $10^{20} \text{m}^{-3}$, $\alpha_n$ is the density profile peaking parameter, $\alpha_T$ is the temperature profile peaking parameter, $\beta_T$ is the [secondary temperature profile peaking parameter](./profiles/plasma_profiles.md#pedestal-profile--h-mode) and $A$ is the plasma aspect ratio. + +The original form of the synchrotron radiation formula presented by Albajar et al. [^8] is based off using multiple non-linear regression from a database consisting of 3000 complete computations of the analytical expression for synchrotron power derived by Albajar et al.[^8] to include aspect ratio and temperature profile dependence. + +The fitting variable range is: + +- $10 < T_{\text{e0}} < 100 \ \text{keV}$ +- $10^2 < p_{\text{a0}} < 1 \times 10^4$ +- $1 < \kappa < 2.5$ +- $0 < \alpha_n < 2$ +- $0 < \alpha_T < 8$ +- $1 < \beta_T < 8$ + + +The root mean square error of the fit is found to be 5.8% + +The original form also uses a fair estimation of the effect of a wall with +a reflection coefficient $f_{\text{reflect}}$ obtained from the Trubnikov approach [^10]. + $$ -p_{a_0} = 6.04 \times 10^3 \frac{a n_{e_0(20)}}{B_T} +P_{\text{syn,r}} \propto \left(1 − f_{\text{reflect}}\right)^{1/2} P_{\text{syn}} $$ --------------------- +It should also be noted that the wall reflection coefficient for the synchrotron radiation is poorly known. -By changing the input parameter `radius_plasma_core_norm`, 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 ($f_{\text{reflect}}$) may be set by the user by inputting `f_sync_reflect = `. -The wall reflection factor `f_sync_reflect` may be set by the user. +The wall reflectivity correction presented later by Fidone et al. [^9] is of the form: + +$$ +P_{\text{syn,r}} \propto \frac{\left(1 − f_{\text{reflect}}\right)^{0.62}}{\left[1+\left(1 − f_{\text{reflect}}\right)^{0.41}\right]^{1.51}} P_{\text{syn}} +$$ + +A comparison of the different reflection functions canbe seen in the graph below: + + + + + + Normalised synchrotron radiation loss vs wall reflectivity + + + + + + +
    + + + + + + +The power loss due to synchrotron radiation grows as the aspect ratio decreases. At high aspect ratios $(A > 6)$, although $P_{\text{syn}}$ increases with $R$, the normalized synchrotron loss saturates. This is due to the fact that the magnetic field inhomogeneity vanishes for large $A$. For the above reason a $G$ correction factor is implemented.This gives an root mean square error of 6.2% with respect to a secondary +dataset consisting of 640 complete computations for the same range of variables variables above and for an aspect ratio interval of $1.5 Date: Fri, 7 Mar 2025 15:35:50 +0000 Subject: [PATCH 11/13] =?UTF-8?q?=F0=9F=94=84=20Refactor=20code=20for=20im?= =?UTF-8?q?proved=20readability=20and=20maintainability=20by=20formatting?= =?UTF-8?q?=20lists=20and=20enhancing=20function=20calls=20with=20addition?= =?UTF-8?q?al=20parameters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/availability.py | 6 +++--- process/io/sankey_funcs.py | 15 +++++++++++++-- process/stellarator.py | 16 +++++++++++++++- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/process/availability.py b/process/availability.py index 0e8a4ef51f..ae5103731a 100644 --- a/process/availability.py +++ b/process/availability.py @@ -107,9 +107,9 @@ def avail(self, output: bool): else: if cv.ibkt_life == 0: fwbsv.bktlife = min( - - fwbsv.life_fw_fpy, cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife - + fwbsv.life_fw_fpy, + cv.abktflnc / pv.pflux_fw_neutron_mw, + cv.tlife, ) else: fwbsv.bktlife = min( diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index fa7f0192d1..24ccf10003 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -291,7 +291,13 @@ def plot_full_sankey( # ---------------------------------------- 1ST WALL - 5 --------------------------------------- # Alphas, Neutrons, Photons, Coolant Pumping, Total 1st Wall - first_wall = [p_fw_alpha_mw, p_fw_nuclear_heat_total_mw, pradfw, htpmwfw, -pthermfw] + first_wall = [ + p_fw_alpha_mw, + p_fw_nuclear_heat_total_mw, + pradfw, + htpmwfw, + -pthermfw, + ] sankey.add( flows=first_wall, orientations=[0, -1, 1, -1, 0], @@ -542,7 +548,12 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia totaldivetc = pdivt + pnucdiv + praddiv # Power deposited on Blanket (MW) totalblktetc = ( - p_fw_nuclear_heat_total_mw + pnucblkt + pnucshld + pradfw + p_fw_alpha_mw - emultmw + p_fw_nuclear_heat_total_mw + + pnucblkt + + pnucshld + + pradfw + + p_fw_alpha_mw + - emultmw ) if itart == 0: diff --git a/process/stellarator.py b/process/stellarator.py index 91cb0470b7..4fb62a16bd 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4309,7 +4309,21 @@ def stphys(self, output): ) # Calculate radiation power - radpwr_data = physics_funcs.calculate_radiation_powers(self.plasma_profile) + radpwr_data = physics_funcs.calculate_radiation_powers( + self.plasma_profile, + physics_variables.ne0, + physics_variables.rminor, + physics_variables.bt, + physics_variables.aspect, + physics_variables.alphan, + physics_variables.alphat, + physics_variables.tbeta, + physics_variables.te0, + physics_variables.f_sync_reflect, + physics_variables.rmajor, + physics_variables.kappa, + physics_variables.vol_plasma, + ) physics_variables.pden_plasma_sync_mw = radpwr_data.pden_plasma_sync_mw physics_variables.pden_plasma_core_rad_mw = radpwr_data.pden_plasma_core_rad_mw physics_variables.pden_plasma_outer_rad_mw = ( From cedae691b631c36242013f8edafc45e69498fc48 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 10 Mar 2025 09:39:34 +0000 Subject: [PATCH 12/13] :memo: Correct typo in synchrotron radiation documentation --- documentation/proc-pages/physics-models/plasma_radiation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/proc-pages/physics-models/plasma_radiation.md b/documentation/proc-pages/physics-models/plasma_radiation.md index f1785b3ef2..c480b49c9a 100644 --- a/documentation/proc-pages/physics-models/plasma_radiation.md +++ b/documentation/proc-pages/physics-models/plasma_radiation.md @@ -43,7 +43,7 @@ Radiation is calculated separately for the core and edge regions, except for syn ## Synchrotron radiation | `psync_albajar_fidone()` -The formula below is the current syncrotorn radiation loss power implemented in `PROCESS`. It is a combination of the general form given by Albajar et al. [^8] and a wall reflectivity correction given then by Fidone et al. [^9] +The formula below is the current synchrotron radiation loss power implemented in `PROCESS`. It is a combination of the general form given by Albajar et al. [^8] and a wall reflectivity correction given by Fidone et al. [^9] $$ \begin{aligned} From 281ad4ba4beebe4e31b0c3f3663c39acfbdc07dc Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Mar 2025 10:56:32 +0000 Subject: [PATCH 13/13] :memo: Add new obsolete variable mappings for plasma core radius and maximum radial wall load --- process/io/obsolete_vars.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index cdd849b9d4..448cce5608 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -252,6 +252,8 @@ "d_vv_top": "dz_vv_upper", "d_vv_bot": "dz_vv_lower", "divfix": "dz_divertor", + "coreradius": "radius_plasma_core_norm", + "maxradwallload": "pflux_fw_rad_max", } OBS_VARS_HELP = {