From 676e3568b230b4b77654324b32909a9be7791e2b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 30 Jan 2025 16:11:04 +0000 Subject: [PATCH 01/31] :art: Enhance vscalc function documentation with detailed parameter types and return values --- process/physics.py | 86 ++++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 34 deletions(-) diff --git a/process/physics.py b/process/physics.py index 31e3633e78..f28346d613 100644 --- a/process/physics.py +++ b/process/physics.py @@ -61,40 +61,58 @@ def rether(alphan, alphat, dene, dlamie, te, ti, zeffai): @nb.jit(nopython=True, cache=True) def vscalc( - csawth, - eps, - inductive_current_fraction, - gamma, - kappa, - rmajor, - res_plasma, - plasma_current, - t_fusion_ramp, - t_burn, - rli, - rmu0, -): - """Volt-second requirements - author: P J Knight, CCFE, Culham Science Centre - csawth : input real : coefficient for sawteeth effects - eps : input real : inverse aspect ratio - inductive_current_fraction : input real : fraction of plasma current produced inductively - gamma : input real : Ejima coeff for resistive start-up V-s component - kappa : input real : plasma elongation - plasma_current: input real : plasma current (A) - rli : input real : plasma normalised inductivity - rmajor : input real : plasma major radius (m) - res_plasma : input real : plasma resistance (ohm) - t_fusion_ramp : input real : heating time (s) - t_burn : input real : burn time (s) - phiint : output real : internal plasma volt-seconds (Wb) - rlp : output real : plasma inductance (H) - vsbrn : output real : volt-seconds needed during flat-top (heat+burn) (Wb) - vsind : output real : internal and external plasma inductance V-s (Wb) - vsres : output real : resistive losses in start-up volt-seconds (Wb) - vsstt : output real : total volt-seconds needed (Wb) - This subroutine calculates the volt-second requirements and some - other related items. + csawth: float, + eps: float, + inductive_current_fraction: float, + gamma: float, + kappa: float, + rmajor: float, + res_plasma: float, + plasma_current: float, + t_fusion_ramp: float, + t_burn: float, + rli: float, + rmu0: float, +) -> tuple[float, float, float, float, float, float]: + """Calculate the volt-second requirements and related parameters for plasma physics. + + :param csawth: Coefficient for sawteeth effects + :type csawth: float + :param eps: Inverse aspect ratio + :type eps: float + :param inductive_current_fraction: Fraction of plasma current produced inductively + :type inductive_current_fraction: float + :param gamma: Ejima coefficient for resistive start-up V-s component + :type gamma: float + :param kappa: Plasma elongation + :type kappa: float + :param rmajor: Plasma major radius (m) + :type rmajor: float + :param res_plasma: Plasma resistance (ohm) + :type res_plasma: float + :param plasma_current: Plasma current (A) + :type plasma_current: float + :param t_fusion_ramp: Heating time (s) + :type t_fusion_ramp: float + :param t_burn: Burn time (s) + :type t_burn: float + :param rli: Plasma normalized inductivity + :type rli: float + :param rmu0: Magnetic constant (H/m) + :type rmu0: float + + :return: A tuple containing: + - phiint: Internal plasma volt-seconds (Wb) + - rlp: Plasma inductance (H) + - vsbrn: Volt-seconds needed during flat-top (heat+burn) (Wb) + - vsind: Internal and external plasma inductance V-s (Wb) + - vsres: Resistive losses in start-up volt-seconds (Wb) + - vsstt: Total volt-seconds needed (Wb) + :rtype: tuple[float, float, float, float, float, float] + + :notes: + + :references: """ # Internal inductance From 09463c59a499ae1934e23d2b844561865fef4c47 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 31 Jan 2025 09:53:19 +0000 Subject: [PATCH 02/31] =?UTF-8?q?=20=F0=9F=94=84=20Refactor=20vscalc=20fun?= =?UTF-8?q?ction=20to=20calculate=5Fvolt=5Fsecond=5Frequirements=20and=20u?= =?UTF-8?q?pdate=20related=20documentation=20and=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plasma_current/inductive_plasma_current.md | 2 +- process/physics.py | 4 ++-- tests/unit/test_physics.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md b/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md index 15c914a43d..cee7a68d08 100644 --- a/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md +++ b/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md @@ -1,6 +1,6 @@ Currently in `PROCESS` the inductive current fraction from the CS is not calculated directly but is just equal to ($1 - \mathtt{fvsbrnni}$). Where $\mathtt{fvsbrnni}$ is the sum of the fractions of current driven by non inductive means. -This calculated fraction (`inductive_current_fraction`) is then used in the `vscalc()` and `burn()` functions to calculate the volt-second requirements and the burn time for a pulsed machine. +This calculated fraction (`inductive_current_fraction`) is then used in the `calculate_volt_second_requirements()` and `burn()` functions to calculate the volt-second requirements and the burn time for a pulsed machine. !!! info "Inductive plasma current fraction refactor" diff --git a/process/physics.py b/process/physics.py index f28346d613..ca07dc25c3 100644 --- a/process/physics.py +++ b/process/physics.py @@ -60,7 +60,7 @@ def rether(alphan, alphat, dene, dlamie, te, ti, zeffai): @nb.jit(nopython=True, cache=True) -def vscalc( +def calculate_volt_second_requirements( csawth: float, eps: float, inductive_current_fraction: float, @@ -2317,7 +2317,7 @@ def physics(self): physics_variables.vsind, physics_variables.vsres, physics_variables.vsstt, - ) = vscalc( + ) = calculate_volt_second_requirements( physics_variables.csawth, physics_variables.eps, physics_variables.inductive_current_fraction, diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 1208396b9b..13db701678 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -21,12 +21,12 @@ calculate_plasma_current_peng, calculate_poloidal_beta, calculate_poloidal_field, + calculate_volt_second_requirements, diamagnetic_fraction_hender, diamagnetic_fraction_scene, ps_fraction_scene, res_diff_time, rether, - vscalc, ) from process.plasma_profiles import PlasmaProfile @@ -1793,7 +1793,7 @@ class VscalcParam(NamedTuple): ) def test_vscalc(vscalcparam): """ - Automatically generated Regression Unit Test for vscalc. + Automatically generated Regression Unit Test for calculate_volt_second_requirements. This test was generated using data from tests/regression/scenarios/large-tokamak/IN.DAT. @@ -1801,7 +1801,7 @@ def test_vscalc(vscalcparam): :type vscalcparam: vscalcparam """ - phiint, rlp, vsbrn, vsind, vsres, vsstt = vscalc( + phiint, rlp, vsbrn, vsind, vsres, vsstt = calculate_volt_second_requirements( csawth=vscalcparam.csawth, eps=vscalcparam.eps, inductive_current_fraction=vscalcparam.inductive_current_fraction, From a891cf8f5ab2345399b79f194ca7b4eaaa983df0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 31 Jan 2025 09:56:38 +0000 Subject: [PATCH 03/31] =?UTF-8?q?=F0=9F=94=84=20Remove=20rmu0=20parameter?= =?UTF-8?q?=20from=20calculate=5Fvolt=5Fsecond=5Frequirements=20function?= =?UTF-8?q?=20and=20update=20related=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/physics.py | 10 +++------- tests/unit/test_physics.py | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/process/physics.py b/process/physics.py index ca07dc25c3..c3dcd9fd43 100644 --- a/process/physics.py +++ b/process/physics.py @@ -72,7 +72,6 @@ def calculate_volt_second_requirements( t_fusion_ramp: float, t_burn: float, rli: float, - rmu0: float, ) -> tuple[float, float, float, float, float, float]: """Calculate the volt-second requirements and related parameters for plasma physics. @@ -98,8 +97,6 @@ def calculate_volt_second_requirements( :type t_burn: float :param rli: Plasma normalized inductivity :type rli: float - :param rmu0: Magnetic constant (H/m) - :type rmu0: float :return: A tuple containing: - phiint: Internal plasma volt-seconds (Wb) @@ -116,13 +113,13 @@ def calculate_volt_second_requirements( """ # Internal inductance - rlpint = rmu0 * rmajor * rli / 2.0 + rlpint = constants.rmu0 * rmajor * rli / 2.0 phiint = rlpint * plasma_current # Start-up resistive component # Uses ITER formula without the 10 V-s add-on - vsres = gamma * rmu0 * plasma_current * rmajor + vsres = gamma * constants.rmu0 * plasma_current * rmajor # Hirshman, Neilson: Physics of Fluids, 29 (1986) p790 # fit for external inductance @@ -131,7 +128,7 @@ def calculate_volt_second_requirements( 2.0 + 9.25 * np.sqrt(eps) - 1.21 * eps ) beps = 0.73 * np.sqrt(eps) * (1.0 + 2.0 * eps**4 - 6.0 * eps**5 + 3.7 * eps**6) - rlpext = rmajor * rmu0 * aeps * (1.0 - eps) / (1.0 - eps + beps * kappa) + rlpext = rmajor * constants.rmu0 * aeps * (1.0 - eps) / (1.0 - eps + beps * kappa) rlp = rlpext + rlpint @@ -2329,7 +2326,6 @@ def physics(self): times_variables.t_fusion_ramp, times_variables.t_burn, physics_variables.rli, - constants.rmu0, ) # Calculate auxiliary physics related information diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 13db701678..045b30da66 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1813,7 +1813,6 @@ def test_vscalc(vscalcparam): res_plasma=vscalcparam.res_plasma, t_burn=vscalcparam.t_burn, t_fusion_ramp=vscalcparam.t_fusion_ramp, - rmu0=constants.rmu0, ) assert phiint == pytest.approx(vscalcparam.expected_phiint) From 013ac991dff3ef57fc4888bd89a230c2712086bc Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 31 Jan 2025 10:03:32 +0000 Subject: [PATCH 04/31] :art: Update documentation to include magnetic flux standards and prefix guidelines --- documentation/proc-pages/development/standards.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/documentation/proc-pages/development/standards.md b/documentation/proc-pages/development/standards.md index 1f4396fd38..8aa35a6122 100644 --- a/documentation/proc-pages/development/standards.md +++ b/documentation/proc-pages/development/standards.md @@ -313,6 +313,15 @@ This should be used for units of $\text{kg} \cdot \text{m}^{-2}\text{s}^{-1}$ --------------------- +##### Magnetic flux + +- Magnetic fluxes can start with the `web_` prefix representing Webers. + +- Since magnetic flux units are more commonly used in inductive current drive it may be more appropriate + to use the `vs_` prefix instead representing a $\text{Vs}$. + +--------------------- + ##### Frequencies - Frequencies should start with the `freq_` From 2fcf1642dc7996071a8cea06679190218b0e8438 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 31 Jan 2025 10:22:30 +0000 Subject: [PATCH 05/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'gamma'=20to=20'e?= =?UTF-8?q?jima=5Fcoeff'=20in=20multiple=20data=20files=20and=20update=20r?= =?UTF-8?q?elated=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/central-solenoid.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +- examples/data/large_tokamak_1_MFILE.DAT | 4 +- examples/data/large_tokamak_2_MFILE.DAT | 4 +- examples/data/large_tokamak_3_MFILE.DAT | 4 +- examples/data/large_tokamak_4_MFILE.DAT | 4 +- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 20 +++---- examples/data/scan_example_file_IN.DAT | 2 +- process/physics.py | 16 +++--- source/fortran/input.f90 | 6 +- source/fortran/physics_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++------ tests/integration/data/scan_MFILE.DAT | 20 +++---- .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 12 ++-- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- tests/unit/test_physics.py | 56 +++++++++---------- 29 files changed, 116 insertions(+), 114 deletions(-) diff --git a/documentation/proc-pages/eng-models/central-solenoid.md b/documentation/proc-pages/eng-models/central-solenoid.md index b7edd6266f..e5bf1971d1 100644 --- a/documentation/proc-pages/eng-models/central-solenoid.md +++ b/documentation/proc-pages/eng-models/central-solenoid.md @@ -78,7 +78,7 @@ in the case of the CS coils). 7. The stress is monotonic (since the hoop stress is always positive), and its minimum value is the residual stress (input). Default: 240 MPa. 8. The mean stress is taken into account using the [Walker](https://en.wikipedia.org/wiki/Crack_growth_equation#Walker_equation) - modification of the Paris equation, with coefficient $\gamma$=0.436 + modification of the Paris equation, with coefficient $\ejima_coeff$=0.436 9. Failure occurs when the crack dimension a equals the conduit thickness, or dimension c reaches the conductor width. 10. No safety factor is used for the number of cycles. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 58000dac76..a378b3985b 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -507,7 +507,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.6973E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3365E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0362E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.8572E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1565,7 +1565,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 10d5df6c96..b9ded73ab4 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -503,7 +503,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1559,7 +1559,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index cdeeb9d2ea..a7e2f431c9 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -503,7 +503,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1559,7 +1559,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 1f2e79d1ab..6d1e28c77d 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -503,7 +503,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1559,7 +1559,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 6f069aca94..0a3f852bbb 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -503,7 +503,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1559,7 +1559,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index bab57b4f4f..240fad8278 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -369,7 +369,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index fb7a5bd3ab..e0349e17fb 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -360,7 +360,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1355,7 +1355,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -2350,7 +2350,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -3345,7 +3345,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -4340,7 +4340,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -5335,7 +5335,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -6330,7 +6330,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -7325,7 +7325,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -8320,7 +8320,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -9236,7 +9236,7 @@ dene = 7.983e+19 * Electron density (/m3) (iteration variable 6) beta_norm_max = 3.0 * (troyon-like) coefficient for beta scaling; fkzohm = 1.0245 * Zohm elongation scaling adjustment factor (i_plasma_geometry=2; 3) fvsbrnni = 0.4434 * Fraction of the plasma current produced by -gamma = 0.3 * Ejima coefficient for resistive startup v-s formula +ejima_coeff = 0.3 * Ejima coefficient for resistive startup v-s formula hfact = 1.1 * H factor on energy confinement times (iteration variable 10) i_bootstrap_current = 4 * Switch for bootstrap current scaling; i_beta_component = 1 * Switch for beta limit scaling (constraint equation 24); diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 09ccd827e9..e445bd04b2 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -369,7 +369,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/process/physics.py b/process/physics.py index c3dcd9fd43..e5cbc79a33 100644 --- a/process/physics.py +++ b/process/physics.py @@ -59,12 +59,11 @@ def rether(alphan, alphat, dene, dlamie, te, ti, zeffai): return conie * (ti - te) / (te**1.5) -@nb.jit(nopython=True, cache=True) def calculate_volt_second_requirements( csawth: float, eps: float, inductive_current_fraction: float, - gamma: float, + ejima_coeff: float, kappa: float, rmajor: float, res_plasma: float, @@ -81,8 +80,8 @@ def calculate_volt_second_requirements( :type eps: float :param inductive_current_fraction: Fraction of plasma current produced inductively :type inductive_current_fraction: float - :param gamma: Ejima coefficient for resistive start-up V-s component - :type gamma: float + :param ejima_coeff: Ejima coefficient for resistive start-up V-s component + :type ejima_coeff: float :param kappa: Plasma elongation :type kappa: float :param rmajor: Plasma major radius (m) @@ -119,7 +118,7 @@ def calculate_volt_second_requirements( # Start-up resistive component # Uses ITER formula without the 10 V-s add-on - vsres = gamma * constants.rmu0 * plasma_current * rmajor + vsres = ejima_coeff * constants.rmu0 * plasma_current * rmajor # Hirshman, Neilson: Physics of Fluids, 29 (1986) p790 # fit for external inductance @@ -2318,7 +2317,7 @@ def physics(self): physics_variables.csawth, physics_variables.eps, physics_variables.inductive_current_fraction, - physics_variables.gamma, + physics_variables.ejima_coeff, physics_variables.kappa, physics_variables.rmajor, physics_variables.res_plasma, @@ -5426,7 +5425,10 @@ def outplas(self): "OP ", ) po.ovarrf( - self.outfile, "Ejima coefficient", "(gamma)", physics_variables.gamma + self.outfile, + "Ejima coefficient", + "(ejima_coeff)", + physics_variables.ejima_coeff, ) po.ovarre( self.outfile, diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 34ebea9be0..4857a47358 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -310,7 +310,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fgwsep, rhopedn, tratio, q0, i_plasma_geometry, i_plasma_shape, fne0, ignite, f_tritium, & i_beta_fast_alpha, tauee_in, alphaj, alphat, i_plasma_current, q, ti, tesep, rli, triang, & itart, f_nd_alpha_electron, iprofile, triang95, rad_fraction_sol, betbm0, f_nd_protium_electrons, & - teped, f_helium3, iwalld, gamma, f_alpha_plasma, fgwped, tbeta, i_bootstrap_current, & + teped, f_helium3, iwalld, ejima_coeff, f_alpha_plasma, fgwped, tbeta, i_bootstrap_current, & i_rad_loss, te, alphan, rmajor, plasma_square, kappa, fkzohm, beamfus0, & tauratio, i_density_limit, bt, i_plasma_wall_gap, n_confinement_scalings, beta_max, beta_min, & i_diamagnetic_current, i_pfirsch_schluter_current, m_s_limit, burnup_in @@ -612,8 +612,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fvsbrnni') call parse_real_variable('fvsbrnni', fvsbrnni, 0.0D0, 1.0D0, & 'Non-inductive volt-sec burn fraction') - case ('gamma') - call parse_real_variable('gamma', gamma, 0.1D0, 1.0D0, & + case ('ejima_coeff') + call parse_real_variable('ejima_coeff', ejima_coeff, 0.1D0, 1.0D0, & 'Ejima coefficient for resistive V-s formula') case ('hfact') call parse_real_variable('hfact', hfact, 0.01D0, 10.0D0, & diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index da85f1eb97..7ed61893e1 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -260,7 +260,7 @@ module physics_variables real(dp) :: fvsbrnni !! fraction of the plasma current produced by non-inductive means (`iteration variable 44`) - real(dp) :: gamma + real(dp) :: ejima_coeff !! Ejima coefficient for resistive startup V-s formula real(dp) :: f_beta_alpha_beam_thermal @@ -973,7 +973,7 @@ subroutine init_physics_variables fusion_rate_density_total = 0.0D0 fusion_rate_density_plasma = 0.0D0 fvsbrnni = 1.0D0 - gamma = 0.4D0 + ejima_coeff = 0.4D0 f_beta_alpha_beam_thermal = 0.0D0 hfac = 0.0D0 hfact = 1.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index b46a2c55cd..f0c34da619 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -502,7 +502,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1558,7 +1558,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index e80aba06d8..ff356c436f 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -503,7 +503,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1559,7 +1559,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 8dbd796b28..3aa66b9546 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -503,7 +503,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1559,7 +1559,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 3b9d9c9eff..275352f41f 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -503,7 +503,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1559,7 +1559,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 8c7201c4ce..21c3a30914 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -369,7 +369,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index a0eead2388..9eaf161196 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -500,7 +500,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5011E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3534E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9825E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.6495E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1560,7 +1560,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 0b18994852..a66d423589 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -505,7 +505,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8020E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3405E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9971E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.9617E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1668,7 +1668,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8701E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3345E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0164E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0339E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -2831,7 +2831,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9230E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3268E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0314E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0930E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -3994,7 +3994,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9186E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3194E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0093E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0982E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -5157,7 +5157,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8754E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3316E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0076E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0431E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -6320,7 +6320,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8065E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3384E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9907E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.9691E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -7483,7 +7483,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8016E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3314E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9701E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.9733E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -8646,7 +8646,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8608E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3207E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9753E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0426E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -9809,7 +9809,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9150E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3051E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9666E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.1132E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -10972,7 +10972,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9148E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3029E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9602E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.1158E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -12135,7 +12135,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3208E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9757E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0432E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -13298,7 +13298,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8033E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3319E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9717E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.9742E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -14461,7 +14461,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8020E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3288E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9626E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.9769E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -15624,7 +15624,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8639E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3227E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9812E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0431E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -16787,7 +16787,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9259E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3165E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0007E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.1093E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -17845,7 +17845,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 730090d41e..e1beb0d13b 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -360,7 +360,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1355,7 +1355,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -2350,7 +2350,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -3345,7 +3345,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -4340,7 +4340,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -5335,7 +5335,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -6330,7 +6330,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -7325,7 +7325,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -8320,7 +8320,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -9236,7 +9236,7 @@ dene = 7.983e+19 * Electron density (/m3) (iteration variable 6) beta_norm_max = 3.0 * (troyon-like) coefficient for beta scaling; fkzohm = 1.0245 * Zohm elongation scaling adjustment factor (i_plasma_geometry=2; 3) fvsbrnni = 0.4434 * Fraction of the plasma current produced by -gamma = 0.3 * Ejima coefficient for resistive startup v-s formula +ejima_coeff = 0.3 * Ejima coefficient for resistive startup v-s formula hfact = 1.1 * H factor on energy confinement times (iteration variable 10) i_bootstrap_current = 4 * Switch for bootstrap current scaling; i_beta_component = 1 * Switch for beta limit scaling (constraint equation 24); diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index edbc6fffbc..5c1f64a52f 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -257,7 +257,7 @@ dene = 7.983e+19 * Electron density (/m3) (iteration variable 6) beta_norm_max = 3.0 * (troyon-like) coefficient for beta scaling; fkzohm = 1.0245 * Zohm elongation scaling adjustment factor (i_plasma_geometry=2; 3) fvsbrnni = 0.4434 * Fraction of the plasma current produced by -gamma = 0.3 * Ejima coefficient for resistive startup v-s formula +ejima_coeff = 0.3 * Ejima coefficient for resistive startup v-s formula hfact = 1.1 * H factor on energy confinement times (iteration variable 10) i_bootstrap_current = 4 * Switch for bootstrap current scaling; i_beta_component = 1 * Switch for beta limit scaling (constraint equation 24); diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 57c28b95be..ff8fc6cad9 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -257,7 +257,7 @@ dene = 7.983e+19 * Electron density (/m3) (iteration variable 6) beta_norm_max = 3.0 * (troyon-like) coefficient for beta scaling; fkzohm = 1.0245 * Zohm elongation scaling adjustment factor (i_plasma_geometry=2; 3) fvsbrnni = 0.4434 * Fraction of the plasma current produced by -gamma = 0.3 * Ejima coefficient for resistive startup v-s formula +ejima_coeff = 0.3 * Ejima coefficient for resistive startup v-s formula hfact = 1.1 * H factor on energy confinement times (iteration variable 10) i_bootstrap_current = 4 * Switch for bootstrap current scaling; i_beta_component = 1 * Switch for beta limit scaling (constraint equation 24); diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a88255f268..978c242497 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2181,7 +2181,7 @@ 170.0 ], "gamcd": 0.0, - "gamma": 0.4, + "ejima_coeff": 0.4, "gamma_ecrh": 0.35, "gamma_he": 1.667, "f_beta_alpha_beam_thermal": 0.0, @@ -9707,7 +9707,7 @@ "gain": "IFE target gain", "gainve": "IFE target gain vs driver energy (`ifedrv=-1`)", "gamcd": "normalised current drive efficiency (1.0e20 A/(W m^2))", - "gamma": "Ejima coefficient for resistive startup V-s formula", + "ejima_coeff": "Ejima coefficient for resistive startup V-s formula", "gamma_ecrh": "User input ECRH gamma (1.0e20 A/(W m^2))", "gamma_he": "ratio of specific heats for helium (`primary_pumping=3`)", "f_beta_alpha_beam_thermal": "ratio of (fast alpha + neutral beam beta) to thermal beta", @@ -13075,7 +13075,7 @@ "lb": 0.001, "ub": 1.0 }, - "gamma": { + "ejima_coeff": { "lb": 0.1, "ub": 1.0 }, @@ -19119,7 +19119,7 @@ "fusion_rate_density_total", "fusion_rate_density_plasma", "fvsbrnni", - "gamma", + "ejima_coeff", "f_beta_alpha_beam_thermal", "gtscale", "hfac", @@ -19794,7 +19794,7 @@ "conf", "glag", "glaga", - "gamma", + "ejima_coeff", "eta", "xa", "bdelta", @@ -20386,7 +20386,7 @@ "fzactual": "real_variable", "fzeffmax": "real_variable", "gainve": "real_array", - "gamma": "real_variable", + "ejima_coeff": "real_variable", "gamma_ecrh": "real_variable", "gamma_he": "real_variable", "gammax": "real_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 4e927ea37c..a1cac94b08 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -369,7 +369,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 3817b91f1a..33e950bcee 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -351,7 +351,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 3fe74d217d..85f28adef7 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2944,7 +2944,7 @@ i_bootstrap_current = 4 * DESCRIPTION: Plasma resistivity pre-factor, used to scale plasma resistance * JUSTIFICATION: Not used, not scaling plasma resistance for ohmic heating -*gamma = +*ejima_coeff = * DESCRIPTION: Ejima coefficient for resistive startup V-s formula * JUSTIFICATION: Not used. diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 918a780dcb..1972cf1009 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -369,7 +369,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index e0f358817e..c387f1259e 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -500,7 +500,7 @@ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5011E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3534E+02 OP - Ejima_coefficient_______________________________________________________ (gamma)_______________________ 3.0000E-01 + Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9825E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.6495E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 @@ -1560,7 +1560,7 @@ beta_norm_max = 3.0 fkzohm = 1.02 * Ejima coefficient for resistive startup V-s formula -gamma = 0.3 +ejima_coeff = 0.3 * Switch for bootstrap current scaling i_bootstrap_current = 4 diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 045b30da66..7c36d78dff 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1712,14 +1712,14 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): ) -class VscalcParam(NamedTuple): +class VoltSecondReqParam(NamedTuple): csawth: Any = None eps: Any = None inductive_current_fraction: Any = None - gamma: Any = None + ejima_coeff: Any = None kappa: Any = None @@ -1749,13 +1749,13 @@ class VscalcParam(NamedTuple): @pytest.mark.parametrize( - "vscalcparam", + "voltsecondreqparam", ( - VscalcParam( + VoltSecondReqParam( csawth=1, eps=0.33333333333333331, inductive_current_fraction=0.59999999999999998, - gamma=0.30000000000000004, + ejima_coeff=0.30000000000000004, kappa=1.8500000000000001, plasma_current=18398455.678867526, rli=1.2064840230894305, @@ -1770,11 +1770,11 @@ class VscalcParam(NamedTuple): expected_vsres=55.488435095110333, expected_vsstt=356.56885503707593, ), - VscalcParam( + VoltSecondReqParam( csawth=1, eps=0.33333333333333331, inductive_current_fraction=0.59999999999999998, - gamma=0.30000000000000004, + ejima_coeff=0.30000000000000004, kappa=1.8500000000000001, plasma_current=18398455.678867526, rli=1.2064840230894305, @@ -1791,41 +1791,41 @@ class VscalcParam(NamedTuple): ), ), ) -def test_vscalc(vscalcparam): +def test_vscalc(voltsecondreqparam): """ - Automatically generated Regression Unit Test for calculate_volt_second_requirements. + Automatically generated Regression Unit Test for calculate_volt_second_requirements(). This test was generated using data from tests/regression/scenarios/large-tokamak/IN.DAT. - :param vscalcparam: the data used to mock and assert in this test. - :type vscalcparam: vscalcparam + :param voltsecondreqparam: the data used to mock and assert in this test. + :type voltsecondreqparam: voltsecondreqparam """ phiint, rlp, vsbrn, vsind, vsres, vsstt = calculate_volt_second_requirements( - csawth=vscalcparam.csawth, - eps=vscalcparam.eps, - inductive_current_fraction=vscalcparam.inductive_current_fraction, - gamma=vscalcparam.gamma, - kappa=vscalcparam.kappa, - plasma_current=vscalcparam.plasma_current, - rli=vscalcparam.rli, - rmajor=vscalcparam.rmajor, - res_plasma=vscalcparam.res_plasma, - t_burn=vscalcparam.t_burn, - t_fusion_ramp=vscalcparam.t_fusion_ramp, + csawth=voltsecondreqparam.csawth, + eps=voltsecondreqparam.eps, + inductive_current_fraction=voltsecondreqparam.inductive_current_fraction, + ejima_coeff=voltsecondreqparam.ejima_coeff, + kappa=voltsecondreqparam.kappa, + plasma_current=voltsecondreqparam.plasma_current, + rli=voltsecondreqparam.rli, + rmajor=voltsecondreqparam.rmajor, + res_plasma=voltsecondreqparam.res_plasma, + t_burn=voltsecondreqparam.t_burn, + t_fusion_ramp=voltsecondreqparam.t_fusion_ramp, ) - assert phiint == pytest.approx(vscalcparam.expected_phiint) + assert phiint == pytest.approx(voltsecondreqparam.expected_phiint) - assert rlp == pytest.approx(vscalcparam.expected_rlp) + assert rlp == pytest.approx(voltsecondreqparam.expected_rlp) - assert vsbrn == pytest.approx(vscalcparam.expected_vsbrn) + assert vsbrn == pytest.approx(voltsecondreqparam.expected_vsbrn) - assert vsind == pytest.approx(vscalcparam.expected_vsind) + assert vsind == pytest.approx(voltsecondreqparam.expected_vsind) - assert vsres == pytest.approx(vscalcparam.expected_vsres) + assert vsres == pytest.approx(voltsecondreqparam.expected_vsres) - assert vsstt == pytest.approx(vscalcparam.expected_vsstt) + assert vsstt == pytest.approx(voltsecondreqparam.expected_vsstt) class PhyauxParam(NamedTuple): From 1f266a0228b747614b23f08459a5998597d089c7 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 31 Jan 2025 10:24:02 +0000 Subject: [PATCH 06/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'phiint'=20to=20'?= =?UTF-8?q?vs=5Fplasma=5Finternal'=20in=20physics=20calculations=20and=20u?= =?UTF-8?q?pdate=20related=20tests=20and=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/physics.py | 8 ++++---- source/fortran/physics_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_physics.py | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/process/physics.py b/process/physics.py index e5cbc79a33..9ef766add3 100644 --- a/process/physics.py +++ b/process/physics.py @@ -98,7 +98,7 @@ def calculate_volt_second_requirements( :type rli: float :return: A tuple containing: - - phiint: Internal plasma volt-seconds (Wb) + - vs_plasma_internal: Internal plasma volt-seconds (Wb) - rlp: Plasma inductance (H) - vsbrn: Volt-seconds needed during flat-top (heat+burn) (Wb) - vsind: Internal and external plasma inductance V-s (Wb) @@ -113,7 +113,7 @@ def calculate_volt_second_requirements( # Internal inductance rlpint = constants.rmu0 * rmajor * rli / 2.0 - phiint = rlpint * plasma_current + vs_plasma_internal = rlpint * plasma_current # Start-up resistive component # Uses ITER formula without the 10 V-s add-on @@ -149,7 +149,7 @@ def calculate_volt_second_requirements( vsbrn = vburn * (t_fusion_ramp + t_burn) vsstt = vsstt + vsbrn - return phiint, rlp, vsbrn, vsind, vsres, vsstt + return vs_plasma_internal, rlp, vsbrn, vsind, vsres, vsstt @nb.jit(nopython=True, cache=True) @@ -2307,7 +2307,7 @@ def physics(self): # Calculate Volt-second requirements ( - physics_variables.phiint, + physics_variables.vs_plasma_internal, physics_variables.rlp, physics_variables.vsbrn, physics_variables.vsind, diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 7ed61893e1..c45face114 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -624,7 +624,7 @@ module physics_variables real(dp) :: pedgeradpv !! edge radiation power per volume (MW/m3) - real(dp) :: phiint + real(dp) :: vs_plasma_internal !! internal plasma V-s real(dp) :: pflux_fw_rad_mw @@ -1042,7 +1042,7 @@ subroutine init_physics_variables p_plasma_outer_rad_mw = 0.0D0 pedgeradpv = 0.0D0 charged_particle_power = 0.0D0 - phiint = 0.0D0 + vs_plasma_internal = 0.0D0 pflux_fw_rad_mw = 0.0D0 piepv = 0.0D0 plasma_current = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 978c242497..b6438b1b4e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3525,7 +3525,7 @@ "phi_n_vv_OB_start": 0.0, "phi_tfc_ib": 0.0, "phi_tfc_ob": 0.0, - "phiint": 0.0, + "vs_plasma_internal": 0.0, "pflux_fw_rad_mw": 0.0, "pi": "3.14159265358979e0_rkind", "pibv": 20000.0, @@ -10284,7 +10284,7 @@ "phi_n_vv_OB_start": "", "phi_tfc_ib": "", "phi_tfc_ob": "", - "phiint": "internal plasma V-s", + "vs_plasma_internal": "internal plasma V-s", "pflux_fw_rad_mw": "Nominal mean radiation load on inside surface of reactor (MW/m2)", "pi": "pi", "pibv": "power injection building volume (m3)", @@ -19190,7 +19190,7 @@ "p_plasma_outer_rad_mw", "pedgeradpv", "charged_particle_power", - "phiint", + "vs_plasma_internal", "pflux_fw_rad_mw", "piepv", "plasma_current", diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 7c36d78dff..bed8a2d723 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1735,7 +1735,7 @@ class VoltSecondReqParam(NamedTuple): t_fusion_ramp: Any = None - expected_phiint: Any = None + expected_vs_plasma_internal: Any = None expected_rlp: Any = None @@ -1763,7 +1763,7 @@ class VoltSecondReqParam(NamedTuple): res_plasma=3.7767895536275952e-09, t_burn=1000, t_fusion_ramp=10, - expected_phiint=111.57651734747576, + expected_vs_plasma_internal=111.57651734747576, expected_rlp=1.4075705307248088e-05, expected_vsbrn=42.109179697761263, expected_vsind=258.97124024420435, @@ -1782,7 +1782,7 @@ class VoltSecondReqParam(NamedTuple): res_plasma=3.7767895536275952e-09, t_burn=0, t_fusion_ramp=10, - expected_phiint=111.57651734747576, + expected_vs_plasma_internal=111.57651734747576, expected_rlp=1.4075705307248088e-05, expected_vsbrn=0.41692257126496302, expected_vsind=258.97124024420435, @@ -1801,7 +1801,7 @@ def test_vscalc(voltsecondreqparam): :type voltsecondreqparam: voltsecondreqparam """ - phiint, rlp, vsbrn, vsind, vsres, vsstt = calculate_volt_second_requirements( + vs_plasma_internal, rlp, vsbrn, vsind, vsres, vsstt = calculate_volt_second_requirements( csawth=voltsecondreqparam.csawth, eps=voltsecondreqparam.eps, inductive_current_fraction=voltsecondreqparam.inductive_current_fraction, @@ -1815,7 +1815,7 @@ def test_vscalc(voltsecondreqparam): t_fusion_ramp=voltsecondreqparam.t_fusion_ramp, ) - assert phiint == pytest.approx(voltsecondreqparam.expected_phiint) + assert vs_plasma_internal == pytest.approx(voltsecondreqparam.expected_vs_plasma_internal) assert rlp == pytest.approx(voltsecondreqparam.expected_rlp) From 2f63af4c809c76e4aa178535fdbf1285113eeee3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 31 Jan 2025 10:39:56 +0000 Subject: [PATCH 07/31] Add vs_plasma_internal to output --- process/physics.py | 83 +++++++++++++++++++++----------------- tests/unit/test_physics.py | 34 +++++++++------- 2 files changed, 65 insertions(+), 52 deletions(-) diff --git a/process/physics.py b/process/physics.py index 9ef766add3..ced65bb182 100644 --- a/process/physics.py +++ b/process/physics.py @@ -74,41 +74,45 @@ def calculate_volt_second_requirements( ) -> tuple[float, float, float, float, float, float]: """Calculate the volt-second requirements and related parameters for plasma physics. - :param csawth: Coefficient for sawteeth effects - :type csawth: float - :param eps: Inverse aspect ratio - :type eps: float - :param inductive_current_fraction: Fraction of plasma current produced inductively - :type inductive_current_fraction: float - :param ejima_coeff: Ejima coefficient for resistive start-up V-s component - :type ejima_coeff: float - :param kappa: Plasma elongation - :type kappa: float - :param rmajor: Plasma major radius (m) - :type rmajor: float - :param res_plasma: Plasma resistance (ohm) - :type res_plasma: float - :param plasma_current: Plasma current (A) - :type plasma_current: float - :param t_fusion_ramp: Heating time (s) - :type t_fusion_ramp: float - :param t_burn: Burn time (s) - :type t_burn: float - :param rli: Plasma normalized inductivity - :type rli: float - - :return: A tuple containing: - - vs_plasma_internal: Internal plasma volt-seconds (Wb) - - rlp: Plasma inductance (H) - - vsbrn: Volt-seconds needed during flat-top (heat+burn) (Wb) - - vsind: Internal and external plasma inductance V-s (Wb) - - vsres: Resistive losses in start-up volt-seconds (Wb) - - vsstt: Total volt-seconds needed (Wb) - :rtype: tuple[float, float, float, float, float, float] - - :notes: - - :references: + :param csawth: Coefficient for sawteeth effects + :type csawth: float + :param eps: Inverse aspect ratio + :type eps: float + :param inductive_current_fraction: Fraction of plasma current produced inductively + :type inductive_current_fraction: float + :param ejima_coeff: Ejima coefficient for resistive start-up V-s component + :type ejima_coeff: float + :param kappa: Plasma elongation + :type kappa: float + :param rmajor: Plasma major radius (m) + :type rmajor: float + :param res_plasma: Plasma resistance (ohm) + :type res_plasma: float + :param plasma_current: Plasma current (A) + :type plasma_current: float + :param t_fusion_ramp: Heating time (s) + :type t_fusion_ramp: float + :param t_burn: Burn time (s) + :type t_burn: float + :param rli: Plasma normalized inductivity + :type rli: float + + :return: A tuple containing: + - vs_plasma_internal: Internal plasma volt-seconds (Wb) + - rlp: Plasma inductance (H) + - vsbrn: Volt-seconds needed during flat-top (heat+burn) (Wb) + - vsind: Internal and external plasma inductance V-s (Wb) + - vsres: Resistive losses in start-up volt-seconds (Wb) + - vsstt: Total volt-seconds needed (Wb) + :rtype: tuple[float, float, float, float, float, float] + + :notes: + + :references: + - S. P. Hirshman and G. H. Neilson, “External inductance of an axisymmetric plasma,” + The Physics of Fluids, vol. 29, no. 3, pp. 790–793, Mar. 1986, + doi: https://doi.org/10.1063/1.865934. + ‌ """ # Internal inductance @@ -120,8 +124,7 @@ def calculate_volt_second_requirements( vsres = ejima_coeff * constants.rmu0 * plasma_current * rmajor - # Hirshman, Neilson: Physics of Fluids, 29 (1986) p790 - # fit for external inductance + # Hirshman and Neilson fit for external inductance aeps = (1.0 + 1.81 * np.sqrt(eps) + 2.05 * eps) * np.log(8.0 / eps) - ( 2.0 + 9.25 * np.sqrt(eps) - 1.21 * eps @@ -5430,6 +5433,12 @@ def outplas(self): "(ejima_coeff)", physics_variables.ejima_coeff, ) + po.ovarre( + self.outfile, + "Internal plasma V-s", + "(vs_plasma_internal)", + physics_variables.vs_plasma_internal, + ) po.ovarre( self.outfile, "Start-up resistive (Wb)", diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index bed8a2d723..a6943de9a8 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1801,21 +1801,25 @@ def test_vscalc(voltsecondreqparam): :type voltsecondreqparam: voltsecondreqparam """ - vs_plasma_internal, rlp, vsbrn, vsind, vsres, vsstt = calculate_volt_second_requirements( - csawth=voltsecondreqparam.csawth, - eps=voltsecondreqparam.eps, - inductive_current_fraction=voltsecondreqparam.inductive_current_fraction, - ejima_coeff=voltsecondreqparam.ejima_coeff, - kappa=voltsecondreqparam.kappa, - plasma_current=voltsecondreqparam.plasma_current, - rli=voltsecondreqparam.rli, - rmajor=voltsecondreqparam.rmajor, - res_plasma=voltsecondreqparam.res_plasma, - t_burn=voltsecondreqparam.t_burn, - t_fusion_ramp=voltsecondreqparam.t_fusion_ramp, - ) - - assert vs_plasma_internal == pytest.approx(voltsecondreqparam.expected_vs_plasma_internal) + vs_plasma_internal, rlp, vsbrn, vsind, vsres, vsstt = ( + calculate_volt_second_requirements( + csawth=voltsecondreqparam.csawth, + eps=voltsecondreqparam.eps, + inductive_current_fraction=voltsecondreqparam.inductive_current_fraction, + ejima_coeff=voltsecondreqparam.ejima_coeff, + kappa=voltsecondreqparam.kappa, + plasma_current=voltsecondreqparam.plasma_current, + rli=voltsecondreqparam.rli, + rmajor=voltsecondreqparam.rmajor, + res_plasma=voltsecondreqparam.res_plasma, + t_burn=voltsecondreqparam.t_burn, + t_fusion_ramp=voltsecondreqparam.t_fusion_ramp, + ) + ) + + assert vs_plasma_internal == pytest.approx( + voltsecondreqparam.expected_vs_plasma_internal + ) assert rlp == pytest.approx(voltsecondreqparam.expected_rlp) From 955dbe99b6fe0599a4bf22a59d37397b4936e751 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 31 Jan 2025 10:44:21 +0000 Subject: [PATCH 08/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vsbrn'=20to=20'v?= =?UTF-8?q?s=5Fburn=5Frequired'=20in=20physics=20variables=20and=20update?= =?UTF-8?q?=20related=20data=20files=20and=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/physics.py | 18 +++++------ source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 12 ++++---- 18 files changed, 65 insertions(+), 63 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index a378b3985b..7278f6f7a2 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -509,7 +509,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3365E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0362E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.8572E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.8572E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6783E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1436E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index b9ded73ab4..6fe5c6168b 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index a7e2f431c9..b4cede6411 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 6d1e28c77d..95265178e3 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 0a3f852bbb..96aa9ddbc3 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index e0349e17fb..089a7698a0 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -362,7 +362,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -1357,7 +1357,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -2352,7 +2352,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -3347,7 +3347,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -4342,7 +4342,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -5337,7 +5337,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -6332,7 +6332,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -7327,7 +7327,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -8322,7 +8322,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 diff --git a/process/physics.py b/process/physics.py index ced65bb182..a9083c3be1 100644 --- a/process/physics.py +++ b/process/physics.py @@ -100,7 +100,7 @@ def calculate_volt_second_requirements( :return: A tuple containing: - vs_plasma_internal: Internal plasma volt-seconds (Wb) - rlp: Plasma inductance (H) - - vsbrn: Volt-seconds needed during flat-top (heat+burn) (Wb) + - vs_burn_required: Volt-seconds needed during flat-top (heat+burn) (Wb) - vsind: Internal and external plasma inductance V-s (Wb) - vsres: Resistive losses in start-up volt-seconds (Wb) - vsstt: Total volt-seconds needed (Wb) @@ -110,7 +110,7 @@ def calculate_volt_second_requirements( :references: - S. P. Hirshman and G. H. Neilson, “External inductance of an axisymmetric plasma,” - The Physics of Fluids, vol. 29, no. 3, pp. 790–793, Mar. 1986, + The Physics of Fluids, vol. 29, no. 3, pp. 790-793, Mar. 1986, doi: https://doi.org/10.1063/1.865934. ‌ """ @@ -149,10 +149,10 @@ def calculate_volt_second_requirements( # if the pulsed reactor option is used, but the value # will be correct on subsequent calls. - vsbrn = vburn * (t_fusion_ramp + t_burn) - vsstt = vsstt + vsbrn + vs_burn_required = vburn * (t_fusion_ramp + t_burn) + vsstt = vsstt + vs_burn_required - return vs_plasma_internal, rlp, vsbrn, vsind, vsres, vsstt + return vs_plasma_internal, rlp, vs_burn_required, vsind, vsres, vsstt @nb.jit(nopython=True, cache=True) @@ -2312,7 +2312,7 @@ def physics(self): ( physics_variables.vs_plasma_internal, physics_variables.rlp, - physics_variables.vsbrn, + physics_variables.vs_burn_required, physics_variables.vsind, physics_variables.vsres, physics_variables.vsstt, @@ -5448,9 +5448,9 @@ def outplas(self): ) po.ovarre( self.outfile, - "Flat-top resistive (Wb)", - "(vsbrn)", - physics_variables.vsbrn, + "V-s needed during flat-top (heat + burn times) (Wb)", + "(vs_burn_required)", + physics_variables.vs_burn_required, "OP ", ) diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index c45face114..ca319fa600 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -861,7 +861,7 @@ module physics_variables real(dp) :: vol_plasma !! plasma volume (m3) - real(dp) :: vsbrn + real(dp) :: vs_burn_required !! V-s needed during flat-top (heat + burn times) (Wb) real(dp) :: vshift @@ -1112,7 +1112,7 @@ subroutine init_physics_variables triang = 0.36D0 triang95 = 0.24D0 vol_plasma = 0.0D0 - vsbrn = 0.0D0 + vs_burn_required = 0.0D0 vshift = 0.0D0 vsind = 0.0D0 vsres = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index f0c34da619..b29f09339b 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -504,7 +504,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index ff356c436f..889f8d0e1d 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 3aa66b9546..46a682c8cb 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 275352f41f..63202b3980 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 9eaf161196..e7e1d70581 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -502,7 +502,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9825E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.6495E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.6495E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7455E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2290E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index a66d423589..84c71428d0 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -507,7 +507,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3405E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9971E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.9617E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9617E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6314E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1061E-01 @@ -1670,7 +1670,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3345E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0164E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0339E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0339E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6578E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1146E-01 @@ -2833,7 +2833,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3268E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0314E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0930E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0930E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6841E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1238E-01 @@ -3996,7 +3996,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3194E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0093E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0982E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0982E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7394E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1715E-01 @@ -5159,7 +5159,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3316E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0076E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0431E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0431E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7060E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1531E-01 @@ -6322,7 +6322,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3384E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9907E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.9691E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9691E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6836E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1452E-01 @@ -7485,7 +7485,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3314E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9701E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.9733E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9733E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7375E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1915E-01 @@ -8648,7 +8648,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3207E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9753E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0426E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0426E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7705E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2074E-01 @@ -9811,7 +9811,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3051E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9666E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.1132E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1132E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8133E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2337E-01 @@ -10974,7 +10974,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3029E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9602E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.1158E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1158E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8590E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2713E-01 @@ -12137,7 +12137,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3208E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9757E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0432E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0432E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8106E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2391E-01 @@ -13300,7 +13300,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3319E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9717E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.9742E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9742E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7771E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2221E-01 @@ -14463,7 +14463,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3288E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9626E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.9769E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9769E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8238E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2611E-01 @@ -15626,7 +15626,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3227E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9812E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.0431E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0431E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8476E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2685E-01 @@ -16789,7 +16789,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3165E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0007E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 3.1093E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1093E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8714E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2763E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index e1beb0d13b..575c777998 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -362,7 +362,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -1357,7 +1357,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -2352,7 +2352,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -3347,7 +3347,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -4342,7 +4342,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -5337,7 +5337,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -6332,7 +6332,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -7327,7 +7327,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -8322,7 +8322,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b6438b1b4e..1049e2d31f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7994,7 +7994,7 @@ "vporttmax": 0.0, "vpumpn": 0.0, "vsbn": 0.0, - "vsbrn": 0.0, + "vs_burn_required": 0.0, "vsdum": 0.0, "vsefbn": 0.0, "vsefsu": 0.0, @@ -11104,7 +11104,7 @@ "vporttmax": "maximum available toroidal extent for vertical ports (m)", "vpumpn": "number of high vacuum pumps", "vsbn": "total flux swing available for burn (Wb)", - "vsbrn": "V-s needed during flat-top (heat + burn times) (Wb)", + "vs_burn_required": "V-s needed during flat-top (heat + burn times) (Wb)", "vsdum": "", "vsefbn": "flux swing from PF coils for burn (Wb)", "vsefsu": "flux swing from PF coils for startup (Wb)", @@ -19259,7 +19259,7 @@ "triang", "triang95", "vol_plasma", - "vsbrn", + "vs_burn_required", "vshift", "vsind", "vsres", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c387f1259e..389fa8fc46 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -502,7 +502,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9825E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vsbrn)_______________________ 2.6495E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.6495E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7455E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2290E-01 diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index a6943de9a8..84abc4f135 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1739,7 +1739,7 @@ class VoltSecondReqParam(NamedTuple): expected_rlp: Any = None - expected_vsbrn: Any = None + expected_vs_burn_required: Any = None expected_vsind: Any = None @@ -1765,7 +1765,7 @@ class VoltSecondReqParam(NamedTuple): t_fusion_ramp=10, expected_vs_plasma_internal=111.57651734747576, expected_rlp=1.4075705307248088e-05, - expected_vsbrn=42.109179697761263, + expected_vs_burn_required=42.109179697761263, expected_vsind=258.97124024420435, expected_vsres=55.488435095110333, expected_vsstt=356.56885503707593, @@ -1784,7 +1784,7 @@ class VoltSecondReqParam(NamedTuple): t_fusion_ramp=10, expected_vs_plasma_internal=111.57651734747576, expected_rlp=1.4075705307248088e-05, - expected_vsbrn=0.41692257126496302, + expected_vs_burn_required=0.41692257126496302, expected_vsind=258.97124024420435, expected_vsres=55.488435095110333, expected_vsstt=314.87659791057968, @@ -1801,7 +1801,7 @@ def test_vscalc(voltsecondreqparam): :type voltsecondreqparam: voltsecondreqparam """ - vs_plasma_internal, rlp, vsbrn, vsind, vsres, vsstt = ( + vs_plasma_internal, rlp, vs_burn_required, vsind, vsres, vsstt = ( calculate_volt_second_requirements( csawth=voltsecondreqparam.csawth, eps=voltsecondreqparam.eps, @@ -1823,7 +1823,9 @@ def test_vscalc(voltsecondreqparam): assert rlp == pytest.approx(voltsecondreqparam.expected_rlp) - assert vsbrn == pytest.approx(voltsecondreqparam.expected_vsbrn) + assert vs_burn_required == pytest.approx( + voltsecondreqparam.expected_vs_burn_required + ) assert vsind == pytest.approx(voltsecondreqparam.expected_vsind) From 9fdf13c759d87e512af0c350886e6913e7235715 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 31 Jan 2025 10:53:01 +0000 Subject: [PATCH 09/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vsstt'=20to=20'v?= =?UTF-8?q?s=5Ftotal=5Frequired'=20in=20physics=20variables=20and=20update?= =?UTF-8?q?=20related=20data=20files=20and=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 ++-- process/physics.py | 100 ++++++++++-------- source/fortran/constraint_equations.f90 | 14 +-- source/fortran/physics_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++--- tests/integration/data/scan_MFILE.DAT | 18 ++-- tests/integration/ref_dicts.json | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 12 ++- 19 files changed, 118 insertions(+), 106 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 7278f6f7a2..197666f6a6 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -505,7 +505,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0262E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7167E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.6973E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.6973E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3365E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0362E+01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 6fe5c6168b..12fca68146 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index b4cede6411..28899905aa 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 95265178e3..22bc90d931 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 96aa9ddbc3..66ccad22a5 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 089a7698a0..52d54584a8 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -358,7 +358,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -1353,7 +1353,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -2348,7 +2348,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -3343,7 +3343,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -4338,7 +4338,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -5333,7 +5333,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -6328,7 +6328,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -7323,7 +7323,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -8318,7 +8318,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP diff --git a/process/physics.py b/process/physics.py index a9083c3be1..8c1a9c283d 100644 --- a/process/physics.py +++ b/process/physics.py @@ -74,45 +74,55 @@ def calculate_volt_second_requirements( ) -> tuple[float, float, float, float, float, float]: """Calculate the volt-second requirements and related parameters for plasma physics. - :param csawth: Coefficient for sawteeth effects - :type csawth: float - :param eps: Inverse aspect ratio - :type eps: float - :param inductive_current_fraction: Fraction of plasma current produced inductively - :type inductive_current_fraction: float - :param ejima_coeff: Ejima coefficient for resistive start-up V-s component - :type ejima_coeff: float - :param kappa: Plasma elongation - :type kappa: float - :param rmajor: Plasma major radius (m) - :type rmajor: float - :param res_plasma: Plasma resistance (ohm) - :type res_plasma: float - :param plasma_current: Plasma current (A) - :type plasma_current: float - :param t_fusion_ramp: Heating time (s) - :type t_fusion_ramp: float - :param t_burn: Burn time (s) - :type t_burn: float - :param rli: Plasma normalized inductivity - :type rli: float - - :return: A tuple containing: - - vs_plasma_internal: Internal plasma volt-seconds (Wb) - - rlp: Plasma inductance (H) - - vs_burn_required: Volt-seconds needed during flat-top (heat+burn) (Wb) - - vsind: Internal and external plasma inductance V-s (Wb) - - vsres: Resistive losses in start-up volt-seconds (Wb) - - vsstt: Total volt-seconds needed (Wb) - :rtype: tuple[float, float, float, float, float, float] - - :notes: - - :references: - - S. P. Hirshman and G. H. Neilson, “External inductance of an axisymmetric plasma,” - The Physics of Fluids, vol. 29, no. 3, pp. 790-793, Mar. 1986, - doi: https://doi.org/10.1063/1.865934. + :param csawth: Coefficient for sawteeth effects + :type csawth: float + :param eps: Inverse aspect ratio + :type eps: float + :param inductive_current_fraction: Fraction of plasma current produced inductively + :type inductive_current_fraction: float + :param ejima_coeff: Ejima coefficient for resistive start-up V-s component + :type ejima_coeff: float + :param kappa: Plasma elongation + :type kappa: float + :param rmajor: Plasma major radius (m) + :type rmajor: float + :param res_plasma: Plasma resistance (ohm) + :type res_plasma: float + :param plasma_current: Plasma current (A) + :type plasma_current: float + :param t_fusion_ramp: Heating time (s) + :type t_fusion_ramp: float + :param t_burn: Burn time (s) + :type t_burn: float + :param rli: Plasma normalized inductivity + :type rli: float + + :return: A tuple containing: + - vs_plasma_internal: Internal plasma volt-seconds (Wb) + - rlp: Plasma inductance (H) + - vs_burn_required: Volt-seconds needed during flat-top (heat+burn) (Wb) + - vsind: Internal and external plasma inductance V-s (Wb) + - vsres: Resistive losses in start-up volt-seconds (Wb) + - vs_total_required: Total volt-seconds needed (Wb) + :rtype: tuple[float, float, float, float, float, float] + + :notes: + + :references: + - S. Ejima, R. W. Callis, J. L. Luxon, R. D. Stambaugh, T. S. Taylor, and J. C. Wesley, + “Volt-second analysis and consumption in Doublet III plasmas,” + Nuclear Fusion, vol. 22, no. 10, pp. 1313-1319, Oct. 1982, doi: + https://doi.org/10.1088/0029-5515/22/10/006. + ‌ + - S. C. Jardin, C. E. Kessel, and N Pomphrey, + “Poloidal flux linkage requirements for the International Thermonuclear Experimental Reactor,” + Nuclear Fusion, vol. 34, no. 8, pp. 1145-1160, Aug. 1994, + doi: https://doi.org/10.1088/0029-5515/34/8/i07. ‌ + - S. P. Hirshman and G. H. Neilson, “External inductance of an axisymmetric plasma,” + The Physics of Fluids, vol. 29, no. 3, pp. 790-793, Mar. 1986, + doi: https://doi.org/10.1063/1.865934. + ‌ """ # Internal inductance @@ -137,7 +147,7 @@ def calculate_volt_second_requirements( # Inductive V-s component vsind = rlp * plasma_current - vsstt = vsres + vsind + vs_total_required = vsres + vsind # Loop voltage during flat-top # Include enhancement factor in flattop V-s requirement @@ -150,9 +160,9 @@ def calculate_volt_second_requirements( # will be correct on subsequent calls. vs_burn_required = vburn * (t_fusion_ramp + t_burn) - vsstt = vsstt + vs_burn_required + vs_total_required = vs_total_required + vs_burn_required - return vs_plasma_internal, rlp, vs_burn_required, vsind, vsres, vsstt + return vs_plasma_internal, rlp, vs_burn_required, vsind, vsres, vs_total_required @nb.jit(nopython=True, cache=True) @@ -2315,7 +2325,7 @@ def physics(self): physics_variables.vs_burn_required, physics_variables.vsind, physics_variables.vsres, - physics_variables.vsstt, + physics_variables.vs_total_required, ) = calculate_volt_second_requirements( physics_variables.csawth, physics_variables.eps, @@ -5415,9 +5425,9 @@ def outplas(self): po.osubhd(self.outfile, "Plasma Volt-second Requirements :") po.ovarre( self.outfile, - "Total volt-second requirement (Wb)", - "(vsstt)", - physics_variables.vsstt, + "Total volt-seconds required for pulse (Wb)", + "(vs_total_required)", + physics_variables.vs_total_required, "OP ", ) po.ovarre( diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index cfc3ece3a3..ec7037b4e8 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -866,14 +866,14 @@ subroutine constraint_eqn_012(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! residual error in physical units; output string; units string !! Equation for volt-second capability lower limit !! #=# pfcoil - !! #=#=# fvs, vsstt + !! #=#=# fvs, vs_total_required !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. - !! vsstt : input real : total V-s needed (Wb) - !! vsstt (lower limit) is positive; vstot (available) is negative + !! vs_total_required : input real : total V-s needed (Wb) + !! vs_total_required (lower limit) is positive; vstot (available) is negative !! fvs : input real : f-value for flux-swing (V-s) requirement (STEADY STATE) !! vstot : input real : total flux swing for pulse (Wb) - use physics_variables, only: vsstt + use physics_variables, only: vs_total_required use constraint_variables, only: fvs use pfcoil_variables, only: vstot implicit none @@ -883,9 +883,9 @@ subroutine constraint_eqn_012(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 + fvs * vstot/vsstt - tmp_con = vsstt * (1.0D0 - tmp_cc) - tmp_err = vsstt * tmp_cc + tmp_cc = 1.0D0 + fvs * vstot/vs_total_required + tmp_con = vs_total_required * (1.0D0 - tmp_cc) + tmp_err = vs_total_required * tmp_cc tmp_symbol = '>' tmp_units = 'V.sec' diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index ca319fa600..4369cf495b 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -873,7 +873,7 @@ module physics_variables real(dp) :: vsres !! resistive losses in startup V-s (Wb) - real(dp) :: vsstt + real(dp) :: vs_total_required !! total V-s needed (Wb) real(dp) :: wallmw @@ -1116,7 +1116,7 @@ subroutine init_physics_variables vshift = 0.0D0 vsind = 0.0D0 vsres = 0.0D0 - vsstt = 0.0D0 + vs_total_required = 0.0D0 wallmw = 0.0D0 wtgpd = 0.0D0 a_plasma_poloidal = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index b29f09339b..4a9db0b120 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -500,7 +500,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 889f8d0e1d..2fd87043c3 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 46a682c8cb..010a81f5f8 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 63202b3980..1fa30a12d1 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index e7e1d70581..d75d371de8 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -498,7 +498,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9482E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7112E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5011E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5011E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9825E+01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 84c71428d0..7c8b699a2d 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -503,7 +503,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9629E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.8476E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8020E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8020E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3405E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9971E+01 OP @@ -1666,7 +1666,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0016E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7709E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8701E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8701E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3345E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0164E+01 OP @@ -2829,7 +2829,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0417E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6995E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9230E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9230E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3268E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0314E+01 OP @@ -3992,7 +3992,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0515E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6373E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9186E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9186E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3194E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0093E+01 OP @@ -5155,7 +5155,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0113E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7056E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8754E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8754E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3316E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0076E+01 OP @@ -6318,7 +6318,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9729E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7718E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8065E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8065E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3384E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9907E+01 OP @@ -7481,7 +7481,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9822E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7090E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8016E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8016E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3314E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9701E+01 OP @@ -8644,7 +8644,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0212E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6394E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8608E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8608E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3207E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9753E+01 OP @@ -9807,7 +9807,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0617E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5690E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9150E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9150E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3051E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9666E+01 OP @@ -10970,7 +10970,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0713E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5115E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9148E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9148E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3029E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9602E+01 OP @@ -12133,7 +12133,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0306E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5818E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3208E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9757E+01 OP @@ -13296,7 +13296,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9915E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6496E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8033E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8033E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3319E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9717E+01 OP @@ -14459,7 +14459,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0007E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5910E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8020E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8020E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3288E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9626E+01 OP @@ -15622,7 +15622,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0398E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5257E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.8639E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8639E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3227E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9812E+01 OP @@ -16785,7 +16785,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0806E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.4604E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9259E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9259E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3165E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0007E+01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 575c777998..c9390c782a 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -358,7 +358,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -1353,7 +1353,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -2348,7 +2348,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -3343,7 +3343,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -4338,7 +4338,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -5333,7 +5333,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -6328,7 +6328,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -7323,7 +7323,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP @@ -8318,7 +8318,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 1049e2d31f..dd664854e1 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8005,7 +8005,7 @@ "vsohbn": 0.0, "vsohsu": 0.0, "vsres": 0.0, - "vsstt": 0.0, + "vs_total_required": 0.0, "vssu": 0.0, "vstot": 0.0, "vte1_": 18755328.0, @@ -11115,7 +11115,7 @@ "vsohbn": "central solenoid flux swing for burn (Wb)", "vsohsu": "central solenoid flux swing for startup (Wb)", "vsres": "resistive losses in startup V-s (Wb)", - "vsstt": "total V-s needed (Wb)", + "vs_total_required": "total V-s needed (Wb)", "vssu": "total flux swing for startup (`constraint eqn 51` to enforce vssu=vsres+vsind) (Wb)", "vstot": "total flux swing for pulse (Wb)", "vte1_": "", @@ -19263,7 +19263,7 @@ "vshift", "vsind", "vsres", - "vsstt", + "vs_total_required", "wallmw", "wtgpd", "a_plasma_poloidal", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 389fa8fc46..c33761e286 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -498,7 +498,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9482E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7112E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________ 5.5011E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5011E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9825E+01 OP diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 84abc4f135..e73cb020e0 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1745,7 +1745,7 @@ class VoltSecondReqParam(NamedTuple): expected_vsres: Any = None - expected_vsstt: Any = None + expected_vs_total_required: Any = None @pytest.mark.parametrize( @@ -1768,7 +1768,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_burn_required=42.109179697761263, expected_vsind=258.97124024420435, expected_vsres=55.488435095110333, - expected_vsstt=356.56885503707593, + expected_vs_total_required=356.56885503707593, ), VoltSecondReqParam( csawth=1, @@ -1787,7 +1787,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_burn_required=0.41692257126496302, expected_vsind=258.97124024420435, expected_vsres=55.488435095110333, - expected_vsstt=314.87659791057968, + expected_vs_total_required=314.87659791057968, ), ), ) @@ -1801,7 +1801,7 @@ def test_vscalc(voltsecondreqparam): :type voltsecondreqparam: voltsecondreqparam """ - vs_plasma_internal, rlp, vs_burn_required, vsind, vsres, vsstt = ( + vs_plasma_internal, rlp, vs_burn_required, vsind, vsres, vs_total_required = ( calculate_volt_second_requirements( csawth=voltsecondreqparam.csawth, eps=voltsecondreqparam.eps, @@ -1831,7 +1831,9 @@ def test_vscalc(voltsecondreqparam): assert vsres == pytest.approx(voltsecondreqparam.expected_vsres) - assert vsstt == pytest.approx(voltsecondreqparam.expected_vsstt) + assert vs_total_required == pytest.approx( + voltsecondreqparam.expected_vs_total_required + ) class PhyauxParam(NamedTuple): From cd1daf95bf94508d726f3aafa4354299daf92ad0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 7 Feb 2025 14:39:19 +0000 Subject: [PATCH 10/31] :memo: Add main bulk of volt second function to docs and make function variable names more verbose --- .../inductive_plasma_current.md | 155 +++++++++++++++++- process/physics.py | 46 ++++-- 2 files changed, 185 insertions(+), 16 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md b/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md index cee7a68d08..cfe9a3b090 100644 --- a/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md +++ b/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md @@ -4,4 +4,157 @@ This calculated fraction (`inductive_current_fraction`) is then used in the `cal !!! info "Inductive plasma current fraction refactor" - It is hoped for the near future to have a more engineering based calculation of the fraction of the plasma current driven by the central solenoid. This would hopefully allow the setting of required ramp and flat-top times for which a given inductive current fraction can be given based on the operational performance and margin in the central solenoid. \ No newline at end of file + It is hoped for the near future to have a more engineering based calculation of the fraction of the plasma current driven by the central solenoid. This would hopefully allow the setting of required ramp and flat-top times for which a given inductive current fraction can be given based on the operational performance and margin in the central solenoid. + + +-------------------- + +## Volt-second requirements | `calculate_volt_second_requirements()` + +The plasma requires a constants magnetic flux change in order to keep inductively driving a current in itself. + +By Faraday's law of induction, any change in flux through a circuit induces an electromotive force (EMF, $V$), +in the circuit, proportional to the rate of change of flux. + +$$ +V(t) = - \frac{\mathrm{d}}{\mathrm{d}t} \Phi(t) +$$ + +Inductance, $L$ is the ratio between the induced voltage from the flux change and the rate of change of current that produced the flux change. + +$$ +V(t) = L \ \frac{\mathrm{d}I}{\mathrm{d}t} +$$ + + +The flux requirements are defined by the sum of the pulse ramp up and flat top / burn phases. + +----------- + +### Current ramp phase + +#### Resistive Component + +In the ramp up phase we need to take the plasma current from 0 Amps to the plasma current value, which is normally ten's of Mega Amps. Since the plasma has a non zero resistance, the current induced in the plasma will be dissipated due to resistive losses. This can be tricky to calculate as the plasma resistance decreases as the plasma temperature increases towards our flat-top full plasma scenario state. The inductance of the plasma also varies during this ramp phase and so the amount of current driven for the same change in flux will vary too. + +Thankfully a formulation of the resistive flux consumption during ramp phase is given by Ejima et.al [^1]. + +$$ +\mathtt{vs\_res\_ramp} = \Phi_{\text{res,ramp}} = C_{\text{eji}}\mu_0I_{\text{p}}R +$$ + +where $C_{\text{ejima}}$ is the empirical Ejima coefficient defined by the user or at its default of 0.4. + +This relation is is done by analyzing a wide range of cross-sections, +ranging from circular to doublet produced in the Doublet III machine. The plasma cross-section is +slightly elongated, with $\kappa=1.2$. The toroidal field is 2.4 $\text{T}$. The current swing of the Ohmic-heating transformer is nominally from $-25 \text{kA}$ to $+80 \text{kA}$, corresponding to a flux swing of $\approx 2.6 \ \text{Vs}$. + +The initial one-turn loop voltage is around $50 \ \text{V}$, causing the plasma current to rise to $300 \ \text{kA}$ in about $80 \ \text{ms}$. The plasma current is then increased to higher flat-top currents at a steady rate of $2 \text{MA} \text{s}^{-1}$. + +------------- + +#### Self-Inductance Component + + +The internal inductance is defined as the part of the inductance obtained by integrating over the plasma volume. + +The internal component of the plasma self inductance flux consumption during the ramp up phase is given by: + +$$ +\mathtt{vs\_plasma\_internal} = \Phi_{\text{ind,internal,ramp}} = I_{\text{p}} \times \underbrace{\left[\frac{\mu_0 R l_i}{2}\right]}_{\mathtt{ind\_plasma\_internal}} +$$ + +Here $l_i$ is known as the normalized internal inductance defined for circular cross section plasmas with minor radius $a$: + +$$ +l_i = \frac{\langle B_{\text{p}}^2 \rangle }{B_{\text{p}}^2(a)} +$$ + +You may also see the following approximation term used, $l_i(3)$[^2]. + +$$ +l_i(3) = \frac{2V\langle B_{\text{p}}^2 \rangle }{\mu_0^2I^2R} +$$ + +which is equal to $l_i$ if the plasma has a perfect circular cross-section. + +The external inductance needs to be accounted for also as even though we assume the toroidal current density vanishes at the plasma edge, there still exists a vacuum poloidal magnetic field around the plasma. + +Hirshman et.al[^3] gives a formula for the external plasma inductance in the form: + +$$ +\mathtt{ind\_plasma\_external} = L_{\text{ext}} = \mu_0 R\frac{a(\epsilon)(1-\epsilon)}{1-\epsilon + b(\epsilon)\kappa} +$$ + +$$ +a(\epsilon) = (1+1.18\sqrt{\epsilon}+2.05\epsilon)\ln{\left(\frac{8}{\epsilon}\right)} \\ +- (2.0+9.25\sqrt{\epsilon}-1.21\epsilon) +$$ + +$$ +b(\epsilon) = 0.73\sqrt{\epsilon}(1+2\epsilon^4 - 6\epsilon^5+3.7\epsilon^6) +$$ + +where $\epsilon$ is the plasma inverse aspect ratio and $\kappa$ is the separatrix elongation. + + +The total plasma inductance is then calculated as: + +$$ +\mathtt{ind\_plasma\_total} = \mathtt{ind\_plasma\_external} + \mathtt{ind\_plasma\_internal} +$$ + +Therefore the total inductive flux consumption during ramp up is given by: + +$$ +\mathtt{vs\_self\_ind\_ramp} = \Phi_{\text{ind,ramp}} = \mathtt{ind\_plasma\_total} \times I_{\text{p}} +$$ + +So the total resisitive and inductive flux consumption at current ramp up which is the total flux requires is given by: + +$$ +\mathtt{vs\_ramp\_required} = \mathtt{vs\_res\_ramp} + \mathtt{vs\_self\_ind\_ramp} \\ +\Phi_{\text{tot,ramp}} = \Phi_{\text{res,ramp}} + \Phi_{\text{ind,ramp}} +$$ + +------------------ + +### Steady current burn phase + +At plasma current flat-top there is no self inductance contribution as the plasma current is expected to be at a constants value. However there is still a resistive contribution. + + + +#### Resistive Component + + +For the flat top resistive component we can just take the loop voltage value based on the plasmas resistivity and the known fraction of current driven inductively: + +$$ +\mathtt{v\_burn\_resistive} = V_{\text{loop}} = I_{\text{p}} \rho_\text{p} f_{\text{ind}} +$$ + +where $\rho_\text{p}$ is the calculated [plasma resistivity](./plasma_resistive_heating.md) and $f_{\text{ind}}$ is the inductive current fraction. + +The total flux required is then simply found by multiplying the loop voltage above by the required duration of the burn phase: + +$$ +\mathtt{vs\_burn\_required} = \Phi_{\text{res,burn}} = I_{\text{p}} \rho_\text{p} f_{\text{ind}} \times T_{\text{burn}} \\ += \mathtt{v\_burn\_resistive} \times \mathtt{t\_burn} +$$ + +---------------- + +Finally we can now find the minimum flux required for the full duration of the pulse: + +$$ +\mathtt{vs\_total\_required} = \Phi_{\text{tot}} = \Phi_{\text{tot,ramp}} + \Phi_{\text{res,burn}} \\ += \mathtt{vs\_ramp\_required} + \mathtt{vs\_burn\_required} +$$ + + + +[^1]: S. Ejima, R. W. Callis, J. L. Luxon, R. D. Stambaugh, T. S. Taylor, and J. C. Wesley, “Volt-second analysis and consumption in Doublet III plasmas,” Nuclear Fusion, vol. 22, no. 10, pp. 1313-1319, Oct. 1982, doi: https://doi.org/10.1088/0029-5515/22/10/006. +[^2]: G. L. Jackson et al., “ITER startup studies in the DIII-D tokamak,” Nuclear Fusion, vol. 48, no. 12, p. 125002, Nov. 2008, doi: https://doi.org/10.1088/0029-5515/48/12/125002. +[^3]: S. P. Hirshman and G. H. Neilson, “External inductance of an axisymmetric plasma,” The Physics of Fluids, vol. 29, no. 3, pp. 790-793, Mar. 1986, doi: https://doi.org/10.1063/1.865934. +‌ \ No newline at end of file diff --git a/process/physics.py b/process/physics.py index 8c1a9c283d..b786eef3c6 100644 --- a/process/physics.py +++ b/process/physics.py @@ -99,10 +99,10 @@ def calculate_volt_second_requirements( :return: A tuple containing: - vs_plasma_internal: Internal plasma volt-seconds (Wb) - - rlp: Plasma inductance (H) + - ind_plasma_internal: Plasma inductance (H) - vs_burn_required: Volt-seconds needed during flat-top (heat+burn) (Wb) - - vsind: Internal and external plasma inductance V-s (Wb) - - vsres: Resistive losses in start-up volt-seconds (Wb) + - ind_plasma_total,: Internal and external plasma inductance V-s (Wb) + - vs_res_ramp: Resistive losses in start-up volt-seconds (Wb) - vs_total_required: Total volt-seconds needed (Wb) :rtype: tuple[float, float, float, float, float, float] @@ -124,15 +124,19 @@ def calculate_volt_second_requirements( doi: https://doi.org/10.1063/1.865934. ‌ """ - # Internal inductance + # Plasma internal inductance + + ind_plasma_internal = constants.rmu0 * rmajor * rli / 2.0 - rlpint = constants.rmu0 * rmajor * rli / 2.0 - vs_plasma_internal = rlpint * plasma_current + # Internal plasma flux (V-s) component + vs_plasma_internal = ind_plasma_internal * plasma_current # Start-up resistive component # Uses ITER formula without the 10 V-s add-on - vsres = ejima_coeff * constants.rmu0 * plasma_current * rmajor + vs_res_ramp = ejima_coeff * constants.rmu0 * plasma_current * rmajor + + # ====================================================================== # Hirshman and Neilson fit for external inductance @@ -140,29 +144,41 @@ def calculate_volt_second_requirements( 2.0 + 9.25 * np.sqrt(eps) - 1.21 * eps ) beps = 0.73 * np.sqrt(eps) * (1.0 + 2.0 * eps**4 - 6.0 * eps**5 + 3.7 * eps**6) - rlpext = rmajor * constants.rmu0 * aeps * (1.0 - eps) / (1.0 - eps + beps * kappa) - rlp = rlpext + rlpint + ind_plasma_external = ( + rmajor * constants.rmu0 * aeps * (1.0 - eps) / (1.0 - eps + beps * kappa) + ) + + # ====================================================================== + + ind_plasma_total = ind_plasma_external + ind_plasma_internal # Inductive V-s component - vsind = rlp * plasma_current - vs_total_required = vsres + vsind + vs_self_ind_ramp = ind_plasma_total * plasma_current + vs_ramp_required = vs_res_ramp + vs_self_ind_ramp # Loop voltage during flat-top # Include enhancement factor in flattop V-s requirement # to account for MHD sawtooth effects. - vburn = plasma_current * res_plasma * inductive_current_fraction * csawth + v_burn_resistive = plasma_current * res_plasma * inductive_current_fraction * csawth # N.B. t_burn on first iteration will not be correct # if the pulsed reactor option is used, but the value # will be correct on subsequent calls. - vs_burn_required = vburn * (t_fusion_ramp + t_burn) - vs_total_required = vs_total_required + vs_burn_required + vs_burn_required = v_burn_resistive * (t_fusion_ramp + t_burn) + vs_total_required = vs_ramp_required + vs_burn_required - return vs_plasma_internal, rlp, vs_burn_required, vsind, vsres, vs_total_required + return ( + vs_plasma_internal, + ind_plasma_total, + vs_burn_required, + vs_self_ind_ramp, + vs_res_ramp, + vs_total_required, + ) @nb.jit(nopython=True, cache=True) From 227d71ca7a9058876118b520feebeb6431cd9d2c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 7 Feb 2025 14:53:34 +0000 Subject: [PATCH 11/31] :memo: Update inductance prefix from 'h_' to 'ind_' in documentation standards --- documentation/proc-pages/development/standards.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/proc-pages/development/standards.md b/documentation/proc-pages/development/standards.md index 8aa35a6122..b47414e445 100644 --- a/documentation/proc-pages/development/standards.md +++ b/documentation/proc-pages/development/standards.md @@ -254,7 +254,7 @@ This should be used for units of $\text{kg} \cdot \text{m}^{-2}\text{s}^{-1}$ ##### Inductances -- Inductances should start with the `h_` prefix +- Inductances should start with the `ind_` prefix --------------------- From 252f6faa7d89f19a28cbdfd182663955d61c59c2 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 7 Feb 2025 21:39:29 +0000 Subject: [PATCH 12/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'lpulse'=20to=20'?= =?UTF-8?q?i=5Fpulsed=5Fplant'=20in=20data=20files=20and=20update=20relate?= =?UTF-8?q?d=20code=20references?= 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/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 6 ++--- examples/data/scan_example_file_IN.DAT | 2 +- process/buildings.py | 2 +- process/costs.py | 4 ++-- process/init.py | 2 +- process/physics.py | 2 +- process/pulse.py | 4 ++-- process/utilities/errorlist.json | 6 ++--- source/fortran/buildings_variables.f90 | 2 +- source/fortran/constraint_equations.f90 | 2 +- source/fortran/fwbs_variables.f90 | 2 +- source/fortran/input.f90 | 8 +++---- source/fortran/iteration_variables.f90 | 4 ++-- source/fortran/pulse_variables.f90 | 4 ++-- source/fortran/times_variables.f90 | 8 +++---- .../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 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- .../data/large_tokamak_once_through.IN.DAT | 4 ++-- tests/integration/data/ref_IN.DAT | 6 ++--- tests/integration/data/scan_2D_MFILE.DAT | 2 +- tests/integration/data/scan_MFILE.DAT | 6 ++--- .../data/uncertainties_nonopt_ref_IN.DAT | 6 ++--- .../integration/data/uncertainties_ref_IN.DAT | 6 ++--- tests/integration/ref_dicts.json | 22 +++++++++---------- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 4 ++-- .../input_files/st_regression.IN.DAT | 10 ++++----- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_costs_1990.py | 16 +++++++------- tests/unit/test_pulse.py | 16 +++++++------- 42 files changed, 94 insertions(+), 94 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 197666f6a6..4f1c4e9961 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1631,7 +1631,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 12fca68146..3ebb8da19a 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1625,7 +1625,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 28899905aa..856bc32acf 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1625,7 +1625,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 22bc90d931..30f29034e8 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1626,7 +1626,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 66ccad22a5..b0acb3498a 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1626,7 +1626,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 240fad8278..7051df43bc 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -436,7 +436,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 52d54584a8..9d6a885f76 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -9270,7 +9270,7 @@ plasma_res_factor = 0.66 * plasma resistivity pre-factor *-----------------Pulse Variables------------------* -lpulse = 1 * Switch for reactor model; +i_pulsed_plant = 1 * Switch for reactor model; t_between_pulse = 0 * dwell time (s) pulsetimings = 0 t_precharge = 500.0 @@ -9309,8 +9309,8 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) -t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) +t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) bt = 5.3292E+00 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index e445bd04b2..2a0a94bea3 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -436,7 +436,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/process/buildings.py b/process/buildings.py index c7046c903c..41bda0cc8f 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -292,7 +292,7 @@ def bldgs( cryv = 55.0e0 * helpow**0.5 # Other building volumes # pibv : power injection building volume, m3 - # esbldgm3 is forced to be zero if no energy storage is required (lpulse=0) + # esbldgm3 is forced to be zero if no energy storage is required (i_pulsed_plant=0) elev = ( buildings_variables.tfcbv + buildings_variables.pfbldgm3 diff --git a/process/costs.py b/process/costs.py index 09cdee0e16..bc783afbf7 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2481,7 +2481,7 @@ def acc2253(self): # Thermal storage options for a pulsed reactor # See F/MPE/MOD/CAG/PROCESS/PULSE/0008 and 0014 - if pulse_variables.lpulse == 1: + if pulse_variables.i_pulsed_plant == 1: if pulse_variables.istore == 1: # Option 1 from ELECTROWATT report # Pulsed Fusion Reactor Study : AEA FUS 205 @@ -2758,7 +2758,7 @@ def coelc(self): # Additional cost due to pulsed reactor thermal storage # See F/MPE/MOD/CAG/PROCESS/PULSE/0008 # - # if (lpulse.eq.1) : + # if (i_pulsed_plant.eq.1) : # if (istore.eq.1) : # annoam1 = 51.0e0 # elif (istore.eq.2) : diff --git a/process/init.py b/process/init.py index 241ea0774b..77f998cd20 100644 --- a/process/init.py +++ b/process/init.py @@ -857,7 +857,7 @@ def check_process(): ) # Pulsed power plant model - if fortran.pulse_variables.lpulse == 1: + if fortran.pulse_variables.i_pulsed_plant == 1: fortran.global_variables.icase = "Pulsed tokamak model" else: fortran.buildings_variables.esbldgm3 = 0.0 diff --git a/process/physics.py b/process/physics.py index b786eef3c6..493337695a 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1687,7 +1687,7 @@ def physics(self): ) # Set PF coil ramp times - if pulse_variables.lpulse != 1: + if pulse_variables.i_pulsed_plant != 1: if times_variables.tohsin == 0.0e0: times_variables.t_current_ramp_up = ( physics_variables.plasma_current / 5.0e5 diff --git a/process/pulse.py b/process/pulse.py index 62981c87ad..d9a3663e0c 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -46,7 +46,7 @@ def tohswg(self, output: bool) -> None: :param output: indicate whether output should be written to the output file, or not :type output: boolean """ - if pulse_variables.lpulse != 1: + if pulse_variables.i_pulsed_plant != 1: return # Current/turn in Central Solenoid at beginning of pulse (A/turn) @@ -132,7 +132,7 @@ def burn(self, output: bool): :param output: indicate whether output should be written to the output file, or not :type output: boolean """ - if pulse_variables.lpulse != 1: + if pulse_variables.i_pulsed_plant != 1: return # Volt-seconds required to produce plasma current during start-up diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index dbd7759653..a3daa230f9 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -33,12 +33,12 @@ { "no": 5, "level": 3, - "message": "CONSTRAINTS: tpeak = 0 ==> lpulse=0; do not use constraint 39 if lpulse=0" + "message": "CONSTRAINTS: tpeak = 0 ==> i_pulsed_plant=0; do not use constraint 39 if i_pulsed_plant=0" }, { "no": 6, "level": 3, - "message": "CONSTRAINTS: tcycmn = 0 ==> lpulse=0; do not use constraint 42 if lpulse=0" + "message": "CONSTRAINTS: tcycmn = 0 ==> i_pulsed_plant=0; do not use constraint 42 if i_pulsed_plant=0" }, { "no": 7, @@ -258,7 +258,7 @@ { "no": 50, "level": 3, - "message": "LOADXC: Do not use t_current_ramp_up as an iteration variable if lpulse /= 1" + "message": "LOADXC: Do not use t_current_ramp_up as an iteration variable if i_pulsed_plant /= 1" }, { "no": 51, diff --git a/source/fortran/buildings_variables.f90 b/source/fortran/buildings_variables.f90 index 4ce2c827a2..07340fea96 100644 --- a/source/fortran/buildings_variables.f90 +++ b/source/fortran/buildings_variables.f90 @@ -86,7 +86,7 @@ module buildings_variables !! volume of electrical equipment building (m3) real(dp) :: esbldgm3 - !! volume of energy storage equipment building (m3) (not used if `lpulse=0`) + !! volume of energy storage equipment building (m3) (not used if `i_pulsed_plant=0`) real(dp) :: fc_building_l, fc_building_w !! Fuel Cycle facilities length, width (m) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index ec7037b4e8..67280fabbe 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -902,7 +902,7 @@ subroutine constraint_eqn_013(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! ft_burn : input real : f-value for minimum burn time - !! t_burn : input real : burn time (s) (calculated if lpulse=1) + !! t_burn : input real : burn time (s) (calculated if i_pulsed_plant=1) !! t_burn_min : input real : minimum burn time (s) use constraint_variables, only: ft_burn,t_burn_min use times_variables, only: t_burn diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index e14f43e855..c389214431 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -396,7 +396,7 @@ module fwbs_variables !! area coverage factor for outboard shield volume real(dp) :: fwclfr - !! first wall coolant fraction (calculated if `lpulse=1` or `ipowerflow=1`) + !! first wall coolant fraction (calculated if `i_pulsed_plant=1` or `ipowerflow=1`) real(dp) :: praddiv !! Radiation power incident on the divertor (MW) diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 4857a47358..70ae1a2374 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -315,7 +315,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) tauratio, i_density_limit, bt, i_plasma_wall_gap, n_confinement_scalings, beta_max, beta_min, & i_diamagnetic_current, i_pfirsch_schluter_current, m_s_limit, burnup_in use pf_power_variables, only: iscenr, maxpoloidalpower - use pulse_variables, only: lpulse, dtstor, itcycl, istore, bctmp + use pulse_variables, only: i_pulsed_plant, dtstor, itcycl, istore, bctmp use primary_pumping_variables, only: t_in_bb, t_out_bb, dp_he, p_he, gamma_he, & dp_fw_blkt, dp_fw, dp_blkt, dp_liq @@ -1139,7 +1139,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) 'Initial charge time for PF coils (s)') case ('pulsetimings') call parse_real_variable('pulsetimings', pulsetimings, 0.0D0, 1.0D0, & - 'Pulse timings switch for lpulse=1') + 'Pulse timings switch for i_pulsed_plant=1') ! Divertor settings: 2016 Kallenbach model (2016/07/04) @@ -1991,8 +1991,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('itcycl') call parse_int_variable('itcycl', itcycl, 1, 3, & 'Switch for 1st wall axial stress model') - case ('lpulse') - call parse_int_variable('lpulse', lpulse, 0, 1, & + case ('i_pulsed_plant') + call parse_int_variable('i_pulsed_plant', i_pulsed_plant, 0, 1, & 'Switch for pulsed reactor model') case ('copperaoh_m2') diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index 690645c780..5a34f4c20d 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -1505,11 +1505,11 @@ end subroutine init_itv_65 real(kind(1.d0)) function itv_65() use error_handling, only: report_error - use pulse_variables, only: lpulse + use pulse_variables, only: i_pulsed_plant use times_variables, only: t_current_ramp_up implicit none itv_65 = t_current_ramp_up - if (lpulse /= 1) then + if (i_pulsed_plant /= 1) then call report_error(50) end if end function itv_65 diff --git a/source/fortran/pulse_variables.f90 b/source/fortran/pulse_variables.f90 index 2b4fa678ed..7f7181eee6 100644 --- a/source/fortran/pulse_variables.f90 +++ b/source/fortran/pulse_variables.f90 @@ -35,7 +35,7 @@ module pulse_variables !! - =2 no axial constraint, no bending !! - =3 no axial constraint, bending - integer :: lpulse + integer :: i_pulsed_plant !! Switch for reactor model: !! !! - =0 continuous operation @@ -51,6 +51,6 @@ subroutine init_pulse_variables dtstor = 300.0D0 istore = 1 itcycl = 1 - lpulse = 0 + i_pulsed_plant = 0 end subroutine init_pulse_variables end module pulse_variables diff --git a/source/fortran/times_variables.f90 b/source/fortran/times_variables.f90 index 6b61972052..fccf9a3291 100644 --- a/source/fortran/times_variables.f90 +++ b/source/fortran/times_variables.f90 @@ -15,13 +15,13 @@ module times_variables public real(dp) :: pulsetimings - !! Switch for pulse timings (if lpulse=1): + !! Switch for pulse timings (if i_pulsed_plant=1): !! !! - =0, t_current_ramp_up = Ip(MA)/0.1 t_precharge, t_ramp_down = input !! - =1, t_current_ramp_up = iteration var or input. t_precharge/t_ramp_down max of input or t_current_ramp_up real(dp) :: t_burn - !! flat-top duration (s) (calculated if `lpulse=1`) + !! flat-top duration (s) (calculated if `i_pulsed_plant=1`) real(dp) :: t_burn_0 !! burn time (s) - used for internal consistency @@ -48,11 +48,11 @@ module times_variables !! time intervals - as strings (s) real(dp) :: t_current_ramp_up - !! time for plasma current to ramp up to approx. full value (s) (calculated if `lpulse=0`) + !! time for plasma current to ramp up to approx. full value (s) (calculated if `i_pulsed_plant=0`) !! (`iteration variable 65`) real(dp) :: tohsin - !! Switch for plasma current ramp-up time (if lpulse=0): + !! Switch for plasma current ramp-up time (if i_pulsed_plant=0): !! !! - = 0, t_current_ramp_up = t_precharge = t_ramp_down = Ip(MA)/0.5 !! - <>0, t_current_ramp_up = tohsin; t_precharge, t_ramp_down are input diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 4a9db0b120..61066068c8 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1624,7 +1624,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 2fd87043c3..0144980858 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1625,7 +1625,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 010a81f5f8..5d5cfc32e7 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1625,7 +1625,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 1fa30a12d1..87cbc1df14 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1625,7 +1625,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 21c3a30914..912b478d37 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -435,7 +435,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index d75d371de8..a901ccb307 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1626,7 +1626,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 26bbfd8fec..6045dfc7d1 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -368,7 +368,7 @@ triang = 0.5 * plasma separatrix triangularity (calculated if `i_plasma_geomet *-----------------Pulse Variables------------------* -lpulse = 1 * Switch for reactor model; +i_pulsed_plant = 1 * Switch for reactor model; *-----------------Rebco Variables------------------* @@ -428,7 +428,7 @@ vftf = 0.3 * coolant fraction of TFC 'cable' (`i_tf_sup=1`); or of TFC leg ( *-----------------Times Variables------------------* -pulsetimings = 0 * Switch for pulse timings (if lpulse=1); +pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) t_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 79d9ac6d1a..65b94958ac 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -291,7 +291,7 @@ plasma_res_factor = 0.66 * plasma resistivity pre-factor *-----------------Pulse Variables------------------* -lpulse = 1 * Switch for reactor model; +i_pulsed_plant = 1 * Switch for reactor model; t_between_pulse = 0 * dwell time (s) pulsetimings = 0 t_precharge = 500.0 @@ -329,8 +329,8 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) -t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) +t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) bt = 5.3292E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 7c8b699a2d..07e3ecf4ea 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -17912,7 +17912,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index c9390c782a..ff9f4b314c 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -9270,7 +9270,7 @@ plasma_res_factor = 0.66 * plasma resistivity pre-factor *-----------------Pulse Variables------------------* -lpulse = 1 * Switch for reactor model; +i_pulsed_plant = 1 * Switch for reactor model; t_between_pulse = 0 * dwell time (s) pulsetimings = 0 t_precharge = 500.0 @@ -9309,8 +9309,8 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) -t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) +t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) bt = 5.3292E+00 diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 5c1f64a52f..e13916e374 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -291,7 +291,7 @@ plasma_res_factor = 0.66 * plasma resistivity pre-factor *-----------------Pulse Variables------------------* -lpulse = 1 * Switch for reactor model; +i_pulsed_plant = 1 * Switch for reactor model; t_between_pulse = 0 * dwell time (s) pulsetimings = 0 t_precharge = 500.0 @@ -329,8 +329,8 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) -t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) +t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) bt = 5.3292E+00 diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index ff8fc6cad9..cdbfb75a15 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -291,7 +291,7 @@ plasma_res_factor = 0.66 * plasma resistivity pre-factor *-----------------Pulse Variables------------------* -lpulse = 1 * Switch for reactor model; +i_pulsed_plant = 1 * Switch for reactor model; t_between_pulse = 0 * dwell time (s) pulsetimings = 0 t_precharge = 500.0 @@ -329,8 +329,8 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) -t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) +t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) bt = 5.3292E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index dd664854e1..a261474cc9 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3240,7 +3240,7 @@ "logical_def": "kind(.true.)", "loss": null, "lowest_valid_fom": null, - "lpulse": 0.0, + "i_pulsed_plant": 0.0, "lsa": 4.0, "lwa": null, "m": null, @@ -9415,7 +9415,7 @@ "error_tail": "", "error_type": "", "errors_on": "", - "esbldgm3": "volume of energy storage equipment building (m3) (not used if `lpulse=0`)", + "esbldgm3": "volume of energy storage equipment building (m3) (not used if `i_pulsed_plant=0`)", "estotft": "", "estotftgj": "total stored energy in the toroidal field (GJ)", "eta": "", @@ -9674,7 +9674,7 @@ "fwbs_prob_fail": "Fwbs probability of failure (per op day)", "fwbs_umain_time": "Fwbs unplanned maintenance time (years)", "fwbsshape": "switch for first wall, blanket, shield and vacuum vessel shape:\n
    \n
  • =1 D-shaped (cylinder inboard + ellipse outboard)
    • \n
  • =2 defined by two ellipses
    • \n
", - "fwclfr": "first wall coolant fraction (calculated if `lpulse=1` or `ipowerflow=1`)", + "fwclfr": "first wall coolant fraction (calculated if `i_pulsed_plant=1` or `ipowerflow=1`)", "fwcoolant": "switch for first wall coolant (can be different from blanket coolant):\n
    \n
  • 'helium'
    • \n
  • 'water'
    • \n
", "fwdr": "radial thickness of IFE first wall (m)", "fwdzl": "vertical thickness of IFE first wall below chamber (m)", @@ -10015,7 +10015,7 @@ "logT_z": "", "logical_def": "", "lowest_valid_fom": "", - "lpulse": "Switch for reactor model:\n
    \n
  • =0 continuous operation
    • \n
  • =1 pulsed operation
    • \n
", + "i_pulsed_plant": "Switch for reactor model:\n
    \n
  • =0 continuous operation
    • \n
  • =1 pulsed operation
    • \n
", "lsa": "Level of safety assurance switch (generally, use 3 or 4):\n
    \n
  • =1 truly passively safe plant
    • \n
  • =2,3 in-between
    • \n
  • =4 like current fission plant
    • \n
", "lwa": "", "m": "", @@ -10413,7 +10413,7 @@ "pden_electron_transport_loss_mw": "electron transport power per volume (MW/m3)", "p_ion_transport_loss_mw": "ion transport power (MW)", "pden_ion_transport_loss_mw": "ion transport power per volume (MW/m3)", - "pulsetimings": "Switch for pulse timings (if lpulse=1):\n
    \n
  • =0, t_current_ramp_up = Ip(MA)/0.1 t_precharge, t_ramp_down = input
    • \n
  • =1, t_current_ramp_up = iteration var or input. t_precharge/t_ramp_down max of input or t_current_ramp_up
    • \n
", + "pulsetimings": "Switch for pulse timings (if i_pulsed_plant=1):\n
    \n
  • =0, t_current_ramp_up = Ip(MA)/0.1 t_precharge, t_ramp_down = input
    • \n
  • =1, t_current_ramp_up = iteration var or input. t_precharge/t_ramp_down max of input or t_current_ramp_up
    • \n
", "pumpareafraction": "area of one pumping port as a fraction of plasma surface area", "pumpspeedfactor": "effective pumping speed reduction factor due to duct impedance", "pumpspeedmax": "maximum pumping speed per unit area for deuterium & tritium, molecular flow", @@ -10744,7 +10744,7 @@ "tbratio": "Tritium breeding ratio [--]", "tbrmin": "minimum tritium breeding ratio (`constraint equation 52`)", "t_burn_min": "minimum burn time (s) (KE - no longer itv., see issue #706)", - "t_burn": "burn time (s) (calculated if `lpulse=1`)", + "t_burn": "burn time (s) (calculated if `i_pulsed_plant=1`)", "t_burn_0": "burn time (s) - used for internal consistency", "tcomrepl": "time taken to replace both blanket and divertor (y) (`iavail=1`)", "tconl": "main plasma connection length (m)", @@ -10848,8 +10848,8 @@ "tmaxpro": "maximum temp rise during a quench for protection (K)", "tmpcry": "coil temperature for cryogenic plant power calculation (K)", "tn": "neutral gas temperature in chamber (K)", - "t_current_ramp_up": "plasma current ramp-up time for current initiation (s) (calculated if `lpulse=0`)\n (`iteration variable 65`)", - "tohsin": "Switch for plasma current ramp-up time (if lpulse=0):\n
    \n
  • = 0, t_current_ramp_up = t_precharge = t_ramp_down = Ip(MA)/0.5
    • \n
  • <>0, t_current_ramp_up = tohsin; t_precharge, t_ramp_down are input
    • \n
", + "t_current_ramp_up": "plasma current ramp-up time for current initiation (s) (calculated if `i_pulsed_plant=0`)\n (`iteration variable 65`)", + "tohsin": "Switch for plasma current ramp-up time (if i_pulsed_plant=0):\n
    \n
  • = 0, t_current_ramp_up = t_precharge = t_ramp_down = Ip(MA)/0.5
    • \n
  • <>0, t_current_ramp_up = tohsin; t_precharge, t_ramp_down are input
    • \n
", "t_current_ramp_up_min": "minimum plasma current ramp-up time (s) (`constraint equation 41`)", "tok_build_cost_per_vol": "Unit cost for tokamak complex buildings, including building and site services ($/m3)", "tol": "", @@ -13619,7 +13619,7 @@ "lb": 10.0, "ub": 1000.0 }, - "lpulse": { + "i_pulsed_plant": { "lb": 0, "ub": 1 }, @@ -19330,7 +19330,7 @@ "dtstor", "istore", "itcycl", - "lpulse" + "i_pulsed_plant" ], "read_and_get_atomic_data": [ "FirstCall" @@ -20529,7 +20529,7 @@ "llw_storage_h": "real_variable", "llw_storage_l": "real_variable", "llw_storage_w": "real_variable", - "lpulse": "int_variable", + "i_pulsed_plant": "int_variable", "lsa": "int_variable", "m_res": "int_variable", "m_s_limit": "real_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index a1cac94b08..fe8e5ef93c 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -435,7 +435,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 33e950bcee..9904124d79 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -417,7 +417,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 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 1739a1eca8..dcf4b81bc6 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -368,7 +368,7 @@ triang = 0.5 * plasma separatrix triangularity (calculated if `i_plasma_geomet *-----------------Pulse Variables------------------* -lpulse = 1 * Switch for reactor model; +i_pulsed_plant = 1 * Switch for reactor model; *-----------------Rebco Variables------------------* @@ -428,7 +428,7 @@ vftf = 0.3 * coolant fraction of TFC 'cable' (`i_tf_sup=1`); or of TFC leg ( *-----------------Times Variables------------------* -pulsetimings = 0 * Switch for pulse timings (if lpulse=1); +pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) t_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 85f28adef7..3a68737cc4 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2356,7 +2356,7 @@ fwcoolant = helium * JUSTIFICATION: *fwclfr = -* DESCRIPTION: First wall coolant fraction (calculated if `lpulse=1` or `ipowerflow=1`) +* DESCRIPTION: First wall coolant fraction (calculated if `i_pulsed_plant=1` or `ipowerflow=1`) * JUSTIFICATION: Not using ipowerflow = 1 *fhcd = @@ -3208,8 +3208,8 @@ lsa = 2 *---------------------------------Time-----------------------------------* *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾* -lpulse = 0 -* DESCRIPTION: lpulse = 1 pulsed machine. lpulse = 0 steady state machine +i_pulsed_plant = 0 +* DESCRIPTION: i_pulsed_plant = 1 pulsed machine. i_pulsed_plant = 0 steady state machine * JUSTIFICATION: Default is steady state machine *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -3232,7 +3232,7 @@ lpulse = 0 t_burn = 1000.0 * DESCRIPTION: Burn Time (s) -* JUSTIFICATION: Default, steady-state device so input, calculates if lpulse = 1 +* JUSTIFICATION: Default, steady-state device so input, calculates if i_pulsed_plant = 1 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -3243,7 +3243,7 @@ t_between_pulse = 100.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *pulsetimings -* DESCRIPTION: Switch for pulse timings (if lpulse=1): +* DESCRIPTION: Switch for pulse timings (if i_pulsed_plant=1): * =0, t_current_ramp_up = Ip(MA)/0.1 t_precharge, t_ramp_down = input * =1, t_current_ramp_up = iteration var or input. t_precharge/t_ramp_down max of input or t_current_ramp_up * JUSTIFICATION: Assuming default, may change diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 1972cf1009..2d3b23a593 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -436,7 +436,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c33761e286..8156cf0641 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1627,7 +1627,7 @@ plasma_res_factor = 0.7 *********** * Switch for reactor model - pulsed -lpulse = 1 +i_pulsed_plant = 1 * dwell time [s] t_between_pulse = 1800.0 diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index e3a553eac1..eef99835e3 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -3628,7 +3628,7 @@ class Acc2253Param(NamedTuple): pnetelmw: Any = None - lpulse: Any = None + i_pulsed_plant: Any = None dtstor: Any = None @@ -3653,7 +3653,7 @@ class Acc2253Param(NamedTuple): fkind=1, pthermmw=2620.2218111502593, pnetelmw=493.01760776192009, - lpulse=1, + i_pulsed_plant=1, dtstor=300, istore=1, tdown=854.42613938735622, @@ -3667,7 +3667,7 @@ class Acc2253Param(NamedTuple): fkind=1, pthermmw=2619.4223856129224, pnetelmw=422.4198205312706, - lpulse=1, + i_pulsed_plant=1, dtstor=300, istore=1, tdown=854.42613938735622, @@ -3699,7 +3699,7 @@ def test_acc2253(acc2253param, monkeypatch, costs): monkeypatch.setattr(heat_transport_variables, "pnetelmw", acc2253param.pnetelmw) - monkeypatch.setattr(pulse_variables, "lpulse", acc2253param.lpulse) + monkeypatch.setattr(pulse_variables, "i_pulsed_plant", acc2253param.i_pulsed_plant) monkeypatch.setattr(pulse_variables, "dtstor", acc2253param.dtstor) @@ -5292,7 +5292,7 @@ class Acc2253Param(NamedTuple): pnetelmw: Any = None - lpulse: Any = None + i_pulsed_plant: Any = None dtstor: Any = None @@ -5317,7 +5317,7 @@ class Acc2253Param(NamedTuple): fkind=1, pthermmw=2620.2218111502593, pnetelmw=493.01760776192009, - lpulse=1, + i_pulsed_plant=1, dtstor=300, istore=1, tdown=854.42613938735622, @@ -5331,7 +5331,7 @@ class Acc2253Param(NamedTuple): fkind=1, pthermmw=2619.4223856129224, pnetelmw=422.4198205312706, - lpulse=1, + i_pulsed_plant=1, dtstor=300, istore=1, tdown=854.42613938735622, @@ -5363,7 +5363,7 @@ def test_acc2253_urt(acc2253param, monkeypatch, costs, initialise_error_module): monkeypatch.setattr(heat_transport_variables, "pnetelmw", acc2253param.pnetelmw) - monkeypatch.setattr(pulse_variables, "lpulse", acc2253param.lpulse) + monkeypatch.setattr(pulse_variables, "i_pulsed_plant", acc2253param.i_pulsed_plant) monkeypatch.setattr(pulse_variables, "dtstor", acc2253param.dtstor) diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 3b7ed82f72..195babf44f 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -54,7 +54,7 @@ class TohswgParam(NamedTuple): active_constraints: Any = None - lpulse: Any = None + i_pulsed_plant: Any = None outfile: Any = None @@ -80,7 +80,7 @@ class BurnParam(NamedTuple): csawth: Any = None - lpulse: Any = None + i_pulsed_plant: Any = None t_burn: Any = None @@ -648,7 +648,7 @@ class BurnParam(NamedTuple): False, False, ), - lpulse=1, + i_pulsed_plant=1, outfile=11, iprint=0, expected_tohsmn=-526.67247746645455, @@ -1205,7 +1205,7 @@ class BurnParam(NamedTuple): False, False, ), - lpulse=1, + i_pulsed_plant=1, outfile=11, iprint=0, expected_tohsmn=51.251726699574235, @@ -1255,7 +1255,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): monkeypatch.setattr(numerics, "active_constraints", tohswgparam.active_constraints) - monkeypatch.setattr(pulse_variables, "lpulse", tohswgparam.lpulse) + monkeypatch.setattr(pulse_variables, "i_pulsed_plant", tohswgparam.i_pulsed_plant) pulse.tohswg(output=False) @@ -1276,7 +1276,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): plasma_current=17721306.969367817, inductive_current_fraction=0.60433999999999999, csawth=1, - lpulse=1, + i_pulsed_plant=1, t_burn=0, t_fusion_ramp=10, outfile=11, @@ -1292,7 +1292,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): plasma_current=17721306.969367817, inductive_current_fraction=0.60433999999999999, csawth=1, - lpulse=1, + i_pulsed_plant=1, t_burn=10234.092022756307, t_fusion_ramp=10, outfile=11, @@ -1334,7 +1334,7 @@ def test_burn(burnparam, monkeypatch, initialise_error_module, pulse): monkeypatch.setattr(physics_variables, "csawth", burnparam.csawth) - monkeypatch.setattr(pulse_variables, "lpulse", burnparam.lpulse) + monkeypatch.setattr(pulse_variables, "i_pulsed_plant", burnparam.i_pulsed_plant) monkeypatch.setattr(times_variables, "t_burn", burnparam.t_burn) From a1b859581db93c2273fc6ca3e358400053690fa5 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 7 Feb 2025 21:50:25 +0000 Subject: [PATCH 13/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vsres'=20to=20'v?= =?UTF-8?q?s=5Fplasma=5Fres=5Framp'=20across=20codebase=20and=20update=20r?= =?UTF-8?q?elated=20calculations=20and=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 ++++---- process/io/plot_proc.py | 2 +- process/pfcoil.py | 2 +- process/physics.py | 8 ++-- process/pulse.py | 2 +- source/fortran/constraint_equations.f90 | 6 +-- source/fortran/pfcoil_variables.f90 | 2 +- source/fortran/physics_variables.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 | 8 ++-- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 41 +++++++++++-------- tests/unit/test_pulse.py | 10 +++-- 26 files changed, 94 insertions(+), 85 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 4f1c4e9961..78f445e288 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -508,7 +508,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.6973E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3365E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0362E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0362E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.8572E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6783E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 3ebb8da19a..695ae070c1 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -504,7 +504,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 856bc32acf..df4702a5d4 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -504,7 +504,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 30f29034e8..65173c4a2d 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -504,7 +504,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index b0acb3498a..6178192d3a 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -504,7 +504,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 9d6a885f76..0213841929 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -361,7 +361,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -1356,7 +1356,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -2351,7 +2351,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -3346,7 +3346,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -4341,7 +4341,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -5336,7 +5336,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -6331,7 +6331,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -7326,7 +7326,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -8321,7 +8321,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index b280b32644..334475ebee 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2629,7 +2629,7 @@ def plot_magnetics_info(axis, mfile_data, scan): else: tftype = "Resistive Copper" - vssoft = mfile_data.data["vsres"].get_scan(scan) + mfile_data.data[ + vssoft = mfile_data.data["vs_plasma_res_ramp"].get_scan(scan) + mfile_data.data[ "vsind" ].get_scan(scan) diff --git a/process/pfcoil.py b/process/pfcoil.py index 2941dbbb2a..b417d0ef67 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -445,7 +445,7 @@ def pfcoil(self): nocoil = nocoil + 1 # Flux swing required from CS coil - csflux = -(pv.vsres + pv.vsind) - pfflux + csflux = -(pv.vs_plasma_res_ramp + pv.vsind) - pfflux if bv.iohcl == 1: # Required current change in CS coil diff --git a/process/physics.py b/process/physics.py index 493337695a..1b0ce3719b 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2340,7 +2340,7 @@ def physics(self): physics_variables.rlp, physics_variables.vs_burn_required, physics_variables.vsind, - physics_variables.vsres, + physics_variables.vs_plasma_res_ramp, physics_variables.vs_total_required, ) = calculate_volt_second_requirements( physics_variables.csawth, @@ -5467,9 +5467,9 @@ def outplas(self): ) po.ovarre( self.outfile, - "Start-up resistive (Wb)", - "(vsres)", - physics_variables.vsres, + "Plasma resistive flux consumption for plasma current ramp-up (Wb)", + "(vs_plasma_res_ramp)", + physics_variables.vs_plasma_res_ramp, "OP ", ) po.ovarre( diff --git a/process/pulse.py b/process/pulse.py index d9a3663e0c..c5b4d338a4 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -138,7 +138,7 @@ def burn(self, output: bool): # Volt-seconds required to produce plasma current during start-up # (i.e. up to start of flat top) - vssoft = physics_variables.vsres + physics_variables.vsind + vssoft = physics_variables.vs_plasma_res_ramp + physics_variables.vsind # Total volt-seconds available during flat-top (heat + burn) # (Previously calculated as (abs(pfcoil_variables.vstot) - vssoft) ) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 67280fabbe..9f116d099d 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2157,10 +2157,10 @@ subroutine constraint_eqn_051(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! #=#=# consistency !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. - !! vsres : input real : resistive losses in startup V-s (Wb) + !! vs_plasma_res_ramp : input real : resistive losses in startup V-s (Wb) !! vsind : input real : internal and external plasma inductance V-s (Wb)) !! vssu : input real : total flux swing for startup (Wb) - use physics_variables, only: vsres, vsind + use physics_variables, only: vs_plasma_res_ramp, vsind use pfcoil_variables, only: vssu, fvssu implicit none real(dp), intent(out) :: tmp_cc @@ -2169,7 +2169,7 @@ subroutine constraint_eqn_051(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 - fvssu * abs((vsres+vsind) / vssu) + tmp_cc = 1.0D0 - fvssu * abs((vs_plasma_res_ramp+vsind) / vssu) tmp_con = vssu * (1.0D0 - tmp_cc) tmp_err = vssu * tmp_cc tmp_symbol = '=' diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 7ed1de0405..ab2bbe512e 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -345,7 +345,7 @@ module pfcoil_variables !! central solenoid flux swing for startup (Wb) real(dp) :: vssu - !! total flux swing for startup (`constraint eqn 51` to enforce vssu=vsres+vsind) (Wb) + !! total flux swing for startup (`constraint eqn 51` to enforce vssu=vs_plasma_res_ramp+vsind) (Wb) real(dp) :: vstot !! total flux swing for pulse (Wb) diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 4369cf495b..9ad93d06db 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -870,8 +870,8 @@ module physics_variables real(dp) :: vsind !! internal and external plasma inductance V-s (Wb) - real(dp) :: vsres - !! resistive losses in startup V-s (Wb) + real(dp) :: vs_plasma_res_ramp + !! Plasma resistive flux consumption for plasma current ramp-up (Vs)(Wb) real(dp) :: vs_total_required !! total V-s needed (Wb) @@ -1115,7 +1115,7 @@ subroutine init_physics_variables vs_burn_required = 0.0D0 vshift = 0.0D0 vsind = 0.0D0 - vsres = 0.0D0 + vs_plasma_res_ramp = 0.0D0 vs_total_required = 0.0D0 wallmw = 0.0D0 wtgpd = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 61066068c8..ec4a340133 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -503,7 +503,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 0144980858..21df0e8767 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -504,7 +504,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 5d5cfc32e7..f1c925b7ae 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -504,7 +504,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 87cbc1df14..2ceae3a455 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -504,7 +504,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0159E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index a901ccb307..cb8b53c2c3 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -501,7 +501,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5011E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9825E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9825E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.6495E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7455E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 07e3ecf4ea..31dcf82794 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -506,7 +506,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8020E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3405E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9971E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9971E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9617E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6314E-01 @@ -1669,7 +1669,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8701E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3345E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0164E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0164E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0339E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6578E-01 @@ -2832,7 +2832,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9230E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3268E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0314E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0314E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0930E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6841E-01 @@ -3995,7 +3995,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9186E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3194E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0093E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0093E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0982E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7394E-01 @@ -5158,7 +5158,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8754E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3316E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0076E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0076E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0431E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7060E-01 @@ -6321,7 +6321,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8065E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3384E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9907E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9907E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9691E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6836E-01 @@ -7484,7 +7484,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8016E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3314E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9701E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9701E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9733E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7375E-01 @@ -8647,7 +8647,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8608E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3207E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9753E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9753E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0426E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7705E-01 @@ -9810,7 +9810,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9150E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3051E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9666E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9666E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1132E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8133E-01 @@ -10973,7 +10973,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9148E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3029E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9602E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9602E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1158E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8590E-01 @@ -12136,7 +12136,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3208E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9757E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9757E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0432E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8106E-01 @@ -13299,7 +13299,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8033E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3319E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9717E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9717E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9742E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7771E-01 @@ -14462,7 +14462,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8020E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3288E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9626E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9626E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9769E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8238E-01 @@ -15625,7 +15625,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8639E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3227E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9812E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9812E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0431E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8476E-01 @@ -16788,7 +16788,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9259E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3165E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 5.0007E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0007E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1093E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8714E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index ff9f4b314c..da489299e0 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -361,7 +361,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -1356,7 +1356,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -2351,7 +2351,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -3346,7 +3346,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -4341,7 +4341,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -5336,7 +5336,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -6331,7 +6331,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -7326,7 +7326,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 @@ -8321,7 +8321,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 6.2549E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a261474cc9..3af4d7a45b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8004,7 +8004,7 @@ "vsoh": 0.0, "vsohbn": 0.0, "vsohsu": 0.0, - "vsres": 0.0, + "vs_plasma_res_ramp": 0.0, "vs_total_required": 0.0, "vssu": 0.0, "vstot": 0.0, @@ -11114,9 +11114,9 @@ "vsoh": "total flux swing from the central solenoid (Wb)", "vsohbn": "central solenoid flux swing for burn (Wb)", "vsohsu": "central solenoid flux swing for startup (Wb)", - "vsres": "resistive losses in startup V-s (Wb)", + "vs_plasma_res_ramp": "resistive losses in startup V-s (Wb)", "vs_total_required": "total V-s needed (Wb)", - "vssu": "total flux swing for startup (`constraint eqn 51` to enforce vssu=vsres+vsind) (Wb)", + "vssu": "total flux swing for startup (`constraint eqn 51` to enforce vssu=vs_plasma_res_ramp+vsind) (Wb)", "vstot": "total flux swing for pulse (Wb)", "vte1_": "", "vtfkv": "TF coil voltage for resistive coil including bus (kV)", @@ -19262,7 +19262,7 @@ "vs_burn_required", "vshift", "vsind", - "vsres", + "vs_plasma_res_ramp", "vs_total_required", "wallmw", "wtgpd", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 4ceb207b7d..00f89d8e98 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -118,7 +118,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pv, "kappa", 1.727) monkeypatch.setattr(pv, "rli", 1.693) monkeypatch.setattr(pv, "itartpf", 0) - monkeypatch.setattr(pv, "vsres", 6.151e1) + monkeypatch.setattr(pv, "vs_plasma_res_ramp", 6.151e1) monkeypatch.setattr(pv, "plasma_current", 1.8254e7) monkeypatch.setattr(pv, "triang", 0.413) monkeypatch.setattr(pv, "rminor", 2.883) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 3a68737cc4..79cf8ed2e1 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1719,7 +1719,7 @@ ipfres = 0 *icc = 51 * DESCRIPTION: Constraint equation to enforce startup flux = able startup flux * JUSTIFICATION: Turned off, do not care about startup flux. -* VARIABLES: vssu,vsind,vsres calculated in situ +* VARIABLES: vssu,vsind,vs_plasma_res_ramp calculated in situ *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 8156cf0641..96ac7a49c5 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -501,7 +501,7 @@ Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5011E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 - Start-up_resistive_(Wb)_________________________________________________ (vsres)_______________________ 4.9825E+01 OP + Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9825E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.6495E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7455E-01 diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index e73cb020e0..6effb815a8 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1743,7 +1743,7 @@ class VoltSecondReqParam(NamedTuple): expected_vsind: Any = None - expected_vsres: Any = None + expected_vs_plasma_res_ramp: Any = None expected_vs_total_required: Any = None @@ -1767,7 +1767,7 @@ class VoltSecondReqParam(NamedTuple): expected_rlp=1.4075705307248088e-05, expected_vs_burn_required=42.109179697761263, expected_vsind=258.97124024420435, - expected_vsres=55.488435095110333, + expected_vs_plasma_res_ramp=55.488435095110333, expected_vs_total_required=356.56885503707593, ), VoltSecondReqParam( @@ -1786,7 +1786,7 @@ class VoltSecondReqParam(NamedTuple): expected_rlp=1.4075705307248088e-05, expected_vs_burn_required=0.41692257126496302, expected_vsind=258.97124024420435, - expected_vsres=55.488435095110333, + expected_vs_plasma_res_ramp=55.488435095110333, expected_vs_total_required=314.87659791057968, ), ), @@ -1801,20 +1801,25 @@ def test_vscalc(voltsecondreqparam): :type voltsecondreqparam: voltsecondreqparam """ - vs_plasma_internal, rlp, vs_burn_required, vsind, vsres, vs_total_required = ( - calculate_volt_second_requirements( - csawth=voltsecondreqparam.csawth, - eps=voltsecondreqparam.eps, - inductive_current_fraction=voltsecondreqparam.inductive_current_fraction, - ejima_coeff=voltsecondreqparam.ejima_coeff, - kappa=voltsecondreqparam.kappa, - plasma_current=voltsecondreqparam.plasma_current, - rli=voltsecondreqparam.rli, - rmajor=voltsecondreqparam.rmajor, - res_plasma=voltsecondreqparam.res_plasma, - t_burn=voltsecondreqparam.t_burn, + ( + vs_plasma_internal, + rlp, + vs_burn_required, + vsind, + vs_plasma_res_ramp, + vs_total_required, + ) = calculate_volt_second_requirements( + csawth=voltsecondreqparam.csawth, + eps=voltsecondreqparam.eps, + inductive_current_fraction=voltsecondreqparam.inductive_current_fraction, + ejima_coeff=voltsecondreqparam.ejima_coeff, + kappa=voltsecondreqparam.kappa, + plasma_current=voltsecondreqparam.plasma_current, + rli=voltsecondreqparam.rli, + rmajor=voltsecondreqparam.rmajor, + res_plasma=voltsecondreqparam.res_plasma, + t_burn=voltsecondreqparam.t_burn, t_fusion_ramp=voltsecondreqparam.t_fusion_ramp, - ) ) assert vs_plasma_internal == pytest.approx( @@ -1829,7 +1834,9 @@ def test_vscalc(voltsecondreqparam): assert vsind == pytest.approx(voltsecondreqparam.expected_vsind) - assert vsres == pytest.approx(voltsecondreqparam.expected_vsres) + assert vs_plasma_res_ramp == pytest.approx( + voltsecondreqparam.expected_vs_plasma_res_ramp + ) assert vs_total_required == pytest.approx( voltsecondreqparam.expected_vs_total_required diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 195babf44f..5dc7d5aa09 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -66,7 +66,7 @@ class TohswgParam(NamedTuple): class BurnParam(NamedTuple): res_plasma: Any = None - vsres: Any = None + vs_plasma_res_ramp: Any = None vsind: Any = None @@ -1269,7 +1269,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): ( BurnParam( res_plasma=3.2347283861249307e-09, - vsres=59.392760827339345, + vs_plasma_res_ramp=59.392760827339345, vsind=284.23601098215397, vsbn=0, vstot=-718.91787876294552, @@ -1285,7 +1285,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): ), BurnParam( res_plasma=3.2347283861249307e-09, - vsres=59.392760827339345, + vs_plasma_res_ramp=59.392760827339345, vsind=284.23601098215397, vstot=-718.9849676846776, vsbn=-354.76231817639609, @@ -1316,7 +1316,9 @@ def test_burn(burnparam, monkeypatch, initialise_error_module, pulse): monkeypatch.setattr(physics_variables, "res_plasma", burnparam.res_plasma) - monkeypatch.setattr(physics_variables, "vsres", burnparam.vsres) + monkeypatch.setattr( + physics_variables, "vs_plasma_res_ramp", burnparam.vs_plasma_res_ramp + ) monkeypatch.setattr(physics_variables, "vsind", burnparam.vsind) From c6c484b824d4040bfe49c80de661b558243e962f Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 7 Feb 2025 21:55:15 +0000 Subject: [PATCH 14/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vsind'=20to=20'v?= =?UTF-8?q?s=5Fplasma=5Find=5Framp'=20across=20codebase=20and=20update=20r?= =?UTF-8?q?elated=20calculations=20and=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/plot_proc.py | 2 +- process/pfcoil.py | 2 +- process/physics.py | 8 ++--- process/pulse.py | 4 ++- source/fortran/constraint_equations.f90 | 6 ++-- source/fortran/pfcoil_variables.f90 | 2 +- source/fortran/physics_variables.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 | 8 ++--- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 12 ++++---- tests/unit/test_pulse.py | 10 ++++--- 26 files changed, 79 insertions(+), 73 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 78f445e288..30f3d41aaf 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -506,7 +506,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7167E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.6973E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3365E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3365E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0362E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.8572E+02 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 695ae070c1..d56dba23a4 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -502,7 +502,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index df4702a5d4..56bad7e2a3 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -502,7 +502,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 65173c4a2d..5e69eec049 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -502,7 +502,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 6178192d3a..146711c86f 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -502,7 +502,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 0213841929..ac4364d942 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -359,7 +359,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -1354,7 +1354,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -2349,7 +2349,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -3344,7 +3344,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -4339,7 +4339,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -5334,7 +5334,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -6329,7 +6329,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -7324,7 +7324,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -8319,7 +8319,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 334475ebee..61156a26b7 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2630,7 +2630,7 @@ def plot_magnetics_info(axis, mfile_data, scan): tftype = "Resistive Copper" vssoft = mfile_data.data["vs_plasma_res_ramp"].get_scan(scan) + mfile_data.data[ - "vsind" + "vs_plasma_ind_ramp" ].get_scan(scan) sig_case = 1.0e-6 * mfile_data.data[f"sig_tf_tresca_max({i_tf_bucking})"].get_scan( diff --git a/process/pfcoil.py b/process/pfcoil.py index b417d0ef67..e5b435c493 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -445,7 +445,7 @@ def pfcoil(self): nocoil = nocoil + 1 # Flux swing required from CS coil - csflux = -(pv.vs_plasma_res_ramp + pv.vsind) - pfflux + csflux = -(pv.vs_plasma_res_ramp + pv.vs_plasma_ind_ramp) - pfflux if bv.iohcl == 1: # Required current change in CS coil diff --git a/process/physics.py b/process/physics.py index 1b0ce3719b..9dc6a24dda 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2339,7 +2339,7 @@ def physics(self): physics_variables.vs_plasma_internal, physics_variables.rlp, physics_variables.vs_burn_required, - physics_variables.vsind, + physics_variables.vs_plasma_ind_ramp, physics_variables.vs_plasma_res_ramp, physics_variables.vs_total_required, ) = calculate_volt_second_requirements( @@ -5448,9 +5448,9 @@ def outplas(self): ) po.ovarre( self.outfile, - "Inductive volt-seconds (Wb)", - "(vsind)", - physics_variables.vsind, + "Total plasma inductive flux consumption for plasma current ramp-up (Wb)", + "(vs_plasma_ind_ramp)", + physics_variables.vs_plasma_ind_ramp, "OP ", ) po.ovarrf( diff --git a/process/pulse.py b/process/pulse.py index c5b4d338a4..e491d0646c 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -138,7 +138,9 @@ def burn(self, output: bool): # Volt-seconds required to produce plasma current during start-up # (i.e. up to start of flat top) - vssoft = physics_variables.vs_plasma_res_ramp + physics_variables.vsind + vssoft = ( + physics_variables.vs_plasma_res_ramp + physics_variables.vs_plasma_ind_ramp + ) # Total volt-seconds available during flat-top (heat + burn) # (Previously calculated as (abs(pfcoil_variables.vstot) - vssoft) ) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 9f116d099d..fc11639963 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2158,9 +2158,9 @@ subroutine constraint_eqn_051(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! vs_plasma_res_ramp : input real : resistive losses in startup V-s (Wb) - !! vsind : input real : internal and external plasma inductance V-s (Wb)) + !! vs_plasma_ind_ramp : input real : internal and external plasma inductance V-s (Wb)) !! vssu : input real : total flux swing for startup (Wb) - use physics_variables, only: vs_plasma_res_ramp, vsind + use physics_variables, only: vs_plasma_res_ramp, vs_plasma_ind_ramp use pfcoil_variables, only: vssu, fvssu implicit none real(dp), intent(out) :: tmp_cc @@ -2169,7 +2169,7 @@ subroutine constraint_eqn_051(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 - fvssu * abs((vs_plasma_res_ramp+vsind) / vssu) + tmp_cc = 1.0D0 - fvssu * abs((vs_plasma_res_ramp+vs_plasma_ind_ramp) / vssu) tmp_con = vssu * (1.0D0 - tmp_cc) tmp_err = vssu * tmp_cc tmp_symbol = '=' diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index ab2bbe512e..8dc543b8ee 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -345,7 +345,7 @@ module pfcoil_variables !! central solenoid flux swing for startup (Wb) real(dp) :: vssu - !! total flux swing for startup (`constraint eqn 51` to enforce vssu=vs_plasma_res_ramp+vsind) (Wb) + !! total flux swing for startup (`constraint eqn 51` to enforce vssu=vs_plasma_res_ramp+vs_plasma_ind_ramp) (Wb) real(dp) :: vstot !! total flux swing for pulse (Wb) diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 9ad93d06db..0fcbc6d3ea 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -867,8 +867,8 @@ module physics_variables real(dp) :: vshift !! plasma/device midplane vertical shift - single null - real(dp) :: vsind - !! internal and external plasma inductance V-s (Wb) + real(dp) :: vs_plasma_ind_ramp + !! Total plasma inductive flux consumption for plasma current ramp-up (Vs)(Wb) real(dp) :: vs_plasma_res_ramp !! Plasma resistive flux consumption for plasma current ramp-up (Vs)(Wb) @@ -1114,7 +1114,7 @@ subroutine init_physics_variables vol_plasma = 0.0D0 vs_burn_required = 0.0D0 vshift = 0.0D0 - vsind = 0.0D0 + vs_plasma_ind_ramp = 0.0D0 vs_plasma_res_ramp = 0.0D0 vs_total_required = 0.0D0 wallmw = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index ec4a340133..541d4e6e1d 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 21df0e8767..a7942d72ad 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -502,7 +502,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index f1c925b7ae..29e85b1dbf 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -502,7 +502,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 2ceae3a455..fdc41b8c51 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -502,7 +502,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3585E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index cb8b53c2c3..1cf086c6ba 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -499,7 +499,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7112E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5011E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3534E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9825E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.6495E+02 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 31dcf82794..4db83b68b5 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -504,7 +504,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.8476E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8020E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3405E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3405E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9971E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9617E+02 OP @@ -1667,7 +1667,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7709E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8701E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3345E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3345E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0164E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0339E+02 OP @@ -2830,7 +2830,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6995E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9230E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3268E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3268E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0314E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0930E+02 OP @@ -3993,7 +3993,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6373E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9186E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3194E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3194E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0093E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0982E+02 OP @@ -5156,7 +5156,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7056E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8754E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3316E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3316E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0076E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0431E+02 OP @@ -6319,7 +6319,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7718E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8065E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3384E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3384E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9907E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9691E+02 OP @@ -7482,7 +7482,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7090E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8016E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3314E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3314E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9701E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9733E+02 OP @@ -8645,7 +8645,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6394E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8608E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3207E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3207E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9753E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0426E+02 OP @@ -9808,7 +9808,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5690E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9150E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3051E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3051E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9666E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1132E+02 OP @@ -10971,7 +10971,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5115E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9148E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3029E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3029E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9602E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1158E+02 OP @@ -12134,7 +12134,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5818E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8616E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3208E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3208E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9757E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0432E+02 OP @@ -13297,7 +13297,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6496E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8033E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3319E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3319E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9717E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9742E+02 OP @@ -14460,7 +14460,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5910E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8020E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3288E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3288E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9626E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9769E+02 OP @@ -15623,7 +15623,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5257E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8639E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3227E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3227E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9812E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0431E+02 OP @@ -16786,7 +16786,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.4604E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9259E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3165E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3165E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0007E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1093E+02 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index da489299e0..e1da334aaf 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -359,7 +359,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -1354,7 +1354,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -2349,7 +2349,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -3344,7 +3344,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -4339,7 +4339,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -5334,7 +5334,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -6329,7 +6329,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -7324,7 +7324,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP @@ -8319,7 +8319,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.9934E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 3af4d7a45b..8d831019b0 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8000,7 +8000,7 @@ "vsefsu": 0.0, "vseft": 0.0, "vshift": 0.0, - "vsind": 0.0, + "vs_plasma_ind_ramp": 0.0, "vsoh": 0.0, "vsohbn": 0.0, "vsohsu": 0.0, @@ -11110,13 +11110,13 @@ "vsefsu": "flux swing from PF coils for startup (Wb)", "vseft": "total flux swing from PF coils (Wb)", "vshift": "plasma/device midplane vertical shift - single null", - "vsind": "internal and external plasma inductance V-s (Wb)", + "vs_plasma_ind_ramp": "internal and external plasma inductance V-s (Wb)", "vsoh": "total flux swing from the central solenoid (Wb)", "vsohbn": "central solenoid flux swing for burn (Wb)", "vsohsu": "central solenoid flux swing for startup (Wb)", "vs_plasma_res_ramp": "resistive losses in startup V-s (Wb)", "vs_total_required": "total V-s needed (Wb)", - "vssu": "total flux swing for startup (`constraint eqn 51` to enforce vssu=vs_plasma_res_ramp+vsind) (Wb)", + "vssu": "total flux swing for startup (`constraint eqn 51` to enforce vssu=vs_plasma_res_ramp+vs_plasma_ind_ramp) (Wb)", "vstot": "total flux swing for pulse (Wb)", "vte1_": "", "vtfkv": "TF coil voltage for resistive coil including bus (kV)", @@ -19261,7 +19261,7 @@ "vol_plasma", "vs_burn_required", "vshift", - "vsind", + "vs_plasma_ind_ramp", "vs_plasma_res_ramp", "vs_total_required", "wallmw", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 00f89d8e98..ef7b6d6f05 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -123,7 +123,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pv, "triang", 0.413) monkeypatch.setattr(pv, "rminor", 2.883) monkeypatch.setattr(pv, "rmajor", 8.938) - monkeypatch.setattr(pv, "vsind", 3.497e2) + monkeypatch.setattr(pv, "vs_plasma_ind_ramp", 3.497e2) monkeypatch.setattr(pv, "aspect", 3.1) monkeypatch.setattr(pv, "itart", 0) monkeypatch.setattr(pv, "beta_poloidal", 6.313e-1) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 79cf8ed2e1..4b2e785199 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1719,7 +1719,7 @@ ipfres = 0 *icc = 51 * DESCRIPTION: Constraint equation to enforce startup flux = able startup flux * JUSTIFICATION: Turned off, do not care about startup flux. -* VARIABLES: vssu,vsind,vs_plasma_res_ramp calculated in situ +* VARIABLES: vssu,vs_plasma_ind_ramp,vs_plasma_res_ramp calculated in situ *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 96ac7a49c5..ff5a814dfe 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -499,7 +499,7 @@ Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7112E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5011E+02 OP - Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________ 2.3534E+02 OP + Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9825E+01 OP Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.6495E+02 OP diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 6effb815a8..a07e9c6c7c 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1741,7 +1741,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_burn_required: Any = None - expected_vsind: Any = None + expected_vs_plasma_ind_ramp: Any = None expected_vs_plasma_res_ramp: Any = None @@ -1766,7 +1766,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_plasma_internal=111.57651734747576, expected_rlp=1.4075705307248088e-05, expected_vs_burn_required=42.109179697761263, - expected_vsind=258.97124024420435, + expected_vs_plasma_ind_ramp=258.97124024420435, expected_vs_plasma_res_ramp=55.488435095110333, expected_vs_total_required=356.56885503707593, ), @@ -1785,7 +1785,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_plasma_internal=111.57651734747576, expected_rlp=1.4075705307248088e-05, expected_vs_burn_required=0.41692257126496302, - expected_vsind=258.97124024420435, + expected_vs_plasma_ind_ramp=258.97124024420435, expected_vs_plasma_res_ramp=55.488435095110333, expected_vs_total_required=314.87659791057968, ), @@ -1805,7 +1805,7 @@ def test_vscalc(voltsecondreqparam): vs_plasma_internal, rlp, vs_burn_required, - vsind, + vs_plasma_ind_ramp, vs_plasma_res_ramp, vs_total_required, ) = calculate_volt_second_requirements( @@ -1832,7 +1832,9 @@ def test_vscalc(voltsecondreqparam): voltsecondreqparam.expected_vs_burn_required ) - assert vsind == pytest.approx(voltsecondreqparam.expected_vsind) + assert vs_plasma_ind_ramp == pytest.approx( + voltsecondreqparam.expected_vs_plasma_ind_ramp + ) assert vs_plasma_res_ramp == pytest.approx( voltsecondreqparam.expected_vs_plasma_res_ramp diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 5dc7d5aa09..af23de9a5e 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -68,7 +68,7 @@ class BurnParam(NamedTuple): vs_plasma_res_ramp: Any = None - vsind: Any = None + vs_plasma_ind_ramp: Any = None vsbn: Any = None @@ -1270,7 +1270,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): BurnParam( res_plasma=3.2347283861249307e-09, vs_plasma_res_ramp=59.392760827339345, - vsind=284.23601098215397, + vs_plasma_ind_ramp=284.23601098215397, vsbn=0, vstot=-718.91787876294552, plasma_current=17721306.969367817, @@ -1286,7 +1286,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): BurnParam( res_plasma=3.2347283861249307e-09, vs_plasma_res_ramp=59.392760827339345, - vsind=284.23601098215397, + vs_plasma_ind_ramp=284.23601098215397, vstot=-718.9849676846776, vsbn=-354.76231817639609, plasma_current=17721306.969367817, @@ -1320,7 +1320,9 @@ def test_burn(burnparam, monkeypatch, initialise_error_module, pulse): physics_variables, "vs_plasma_res_ramp", burnparam.vs_plasma_res_ramp ) - monkeypatch.setattr(physics_variables, "vsind", burnparam.vsind) + monkeypatch.setattr( + physics_variables, "vs_plasma_ind_ramp", burnparam.vs_plasma_ind_ramp + ) monkeypatch.setattr(pfcoil_variables, "vstot", burnparam.vstot) From c280921219f638f4705bb032ca880296b9e1ea22 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 7 Feb 2025 22:37:50 +0000 Subject: [PATCH 15/31] :memo: Put plasma volt second output into seperate section and away from bootstrap --- process/physics.py | 81 ++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/process/physics.py b/process/physics.py index 9dc6a24dda..a903ec8765 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2351,7 +2351,6 @@ def physics(self): physics_variables.rmajor, physics_variables.res_plasma, physics_variables.plasma_current, - times_variables.t_fusion_ramp, times_variables.t_burn, physics_variables.rli, ) @@ -5480,6 +5479,48 @@ def outplas(self): "OP ", ) + po.ovarre( + self.outfile, + "Loop voltage during burn (V)", + "(vburn)", + physics_variables.plasma_current + * physics_variables.res_plasma + * physics_variables.inductive_current_fraction, + "OP ", + ) + po.ovarre( + self.outfile, + "Plasma resistance (ohm)", + "(res_plasma)", + physics_variables.res_plasma, + "OP ", + ) + + po.ovarre( + self.outfile, + "Resistive diffusion time (s)", + "(res_time)", + physics_variables.res_time, + "OP ", + ) + po.ovarre( + self.outfile, + "Plasma inductance (H)", + "(rlp)", + physics_variables.rlp, + "OP ", + ) + po.ovarrf( + self.outfile, + "Coefficient for sawtooth effects on burn V-s requirement", + "(csawth)", + physics_variables.csawth, + ) + + po.oblnkl(self.outfile) + po.ostars(self.outfile, 110) + po.oblnkl(self.outfile) + po.ovarrf( self.outfile, "Bootstrap current fraction multiplier", @@ -5702,44 +5743,6 @@ def outplas(self): "OP ", ) - po.ovarre( - self.outfile, - "Loop voltage during burn (V)", - "(vburn)", - physics_variables.plasma_current - * physics_variables.res_plasma - * physics_variables.inductive_current_fraction, - "OP ", - ) - po.ovarre( - self.outfile, - "Plasma resistance (ohm)", - "(res_plasma)", - physics_variables.res_plasma, - "OP ", - ) - - po.ovarre( - self.outfile, - "Resistive diffusion time (s)", - "(res_time)", - physics_variables.res_time, - "OP ", - ) - po.ovarre( - self.outfile, - "Plasma inductance (H)", - "(rlp)", - physics_variables.rlp, - "OP ", - ) - po.ovarrf( - self.outfile, - "Coefficient for sawtooth effects on burn V-s requirement", - "(csawth)", - physics_variables.csawth, - ) - po.osubhd(self.outfile, "Fuelling :") po.ovarre( self.outfile, From cd73522852ae11ebc7c523c52a73d7108610cf65 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 7 Feb 2025 22:44:26 +0000 Subject: [PATCH 16/31] :memo: Clarify resistive component calculations in inductive plasma current documentation --- .../plasma_current/inductive_plasma_current.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md b/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md index cfe9a3b090..259572b6cc 100644 --- a/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md +++ b/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md @@ -35,7 +35,7 @@ The flux requirements are defined by the sum of the pulse ramp up and flat top / #### Resistive Component -In the ramp up phase we need to take the plasma current from 0 Amps to the plasma current value, which is normally ten's of Mega Amps. Since the plasma has a non zero resistance, the current induced in the plasma will be dissipated due to resistive losses. This can be tricky to calculate as the plasma resistance decreases as the plasma temperature increases towards our flat-top full plasma scenario state. The inductance of the plasma also varies during this ramp phase and so the amount of current driven for the same change in flux will vary too. +In the ramp up phase we need to take the plasma current from 0 Amps to the plasma current value, which is normally ten's of Mega Amps. Since the plasma has a non zero resistance, the current induced in the plasma will be dissipated due to resistive losses. This can be tricky to calculate as the plasma resistance decreases as the plasma temperature increases towards our flat-top full plasma scenario state. The inductance of the plasma also varies during this ramp phase and so the amount of current driven for the same change in flux will vary too. Thankfully a formulation of the resistive flux consumption during ramp phase is given by Ejima et.al [^1]. @@ -51,6 +51,9 @@ slightly elongated, with $\kappa=1.2$. The toroidal field is 2.4 $\text{T}$. The The initial one-turn loop voltage is around $50 \ \text{V}$, causing the plasma current to rise to $300 \ \text{kA}$ in about $80 \ \text{ms}$. The plasma current is then increased to higher flat-top currents at a steady rate of $2 \text{MA} \text{s}^{-1}$. +The calculation of $\Phi_{\text{res,ramp}}$ is based on the fact that the ramp up takes of the order of the resistive current penetration time $\frac{\mu_0 a^2}{\rho_{\text{p}}}$, where $\rho_{\text{p}}$ is the resistivity of the plasma. The +flux consumption is therefore independent of the resistivity and the minor radius. + ------------- #### Self-Inductance Component From 5fe24d2fb83881a0f4fc3220fd72d31dc61569f8 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 7 Feb 2025 22:50:11 +0000 Subject: [PATCH 17/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vburn'=20to=20'v?= =?UTF-8?q?=5Fplasma=5Floop=5Fburn'=20across=20codebase=20and=20update=20r?= =?UTF-8?q?elated=20calculations=20and=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/plot_radial_build.py | 2 +- process/io/variable_metadata.py | 2 +- process/physics.py | 4 +-- process/pulse.py | 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/unit/data/large_tokamak_MFILE.DAT | 2 +- 18 files changed, 51 insertions(+), 51 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 30f3d41aaf..7a2b1b68ec 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -521,7 +521,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1436E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9627E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9627E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0562E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0010E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.3992E-05 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index d56dba23a4..658d98ad8a 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -517,7 +517,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.7450E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 56bad7e2a3..e2a8ff763b 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -517,7 +517,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.7450E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 5e69eec049..b0720af15d 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -517,7 +517,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.7450E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 146711c86f..335077ba49 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -517,7 +517,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.7450E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index ac4364d942..acec35a8f2 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -374,7 +374,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -1369,7 +1369,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -2364,7 +2364,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -3359,7 +3359,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -4354,7 +4354,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -5349,7 +5349,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -6344,7 +6344,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -7339,7 +7339,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -8334,7 +8334,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index b5c3fb5417..3b877ee20d 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -225,7 +225,7 @@ def main(args=None): "", "", "fvs", # actaully lower bound fvs - "vburn", + "v_plasma_loop_burn", "res_plasma", ] diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index fc1cf2ab98..2f67e6f477 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -271,7 +271,7 @@ class VariableMetadata: "t_burn": VariableMetadata( latex=r"$t_{\mathrm{burn}}$[$s$]", description="Burn time", units="s" ), - "vburn": VariableMetadata( + "v_plasma_loop_burn": VariableMetadata( latex=r"$V_{\mathrm{loop}}$ [$V$]", description="Loop voltage during burn", units="V", diff --git a/process/physics.py b/process/physics.py index a903ec8765..b3e1a4c929 100644 --- a/process/physics.py +++ b/process/physics.py @@ -5481,8 +5481,8 @@ def outplas(self): po.ovarre( self.outfile, - "Loop voltage during burn (V)", - "(vburn)", + "Plasma loop voltage during burn (V)", + "(v_plasma_loop_burn)", physics_variables.plasma_current * physics_variables.res_plasma * physics_variables.inductive_current_fraction, diff --git a/process/pulse.py b/process/pulse.py index e491d0646c..ec7d272d9f 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -151,7 +151,7 @@ def burn(self, output: bool): # Loop voltage during flat-top (including MHD sawtooth enhancement) - vburn = ( + v_plasma_loop_burn = ( physics_variables.plasma_current * physics_variables.res_plasma * physics_variables.inductive_current_fraction @@ -160,11 +160,11 @@ def burn(self, output: bool): # Burn time (s) - tb = vsmax / vburn - times_variables.t_fusion_ramp + tb = vsmax / v_plasma_loop_burn - times_variables.t_fusion_ramp if tb < 0.0e0: error_handling.fdiags[0] = tb error_handling.fdiags[1] = vsmax - error_handling.fdiags[2] = vburn + error_handling.fdiags[2] = v_plasma_loop_burn error_handling.fdiags[3] = times_variables.t_fusion_ramp error_handling.report_error(93) diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 541d4e6e1d..7e8835f0ad 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -516,7 +516,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.7450E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index a7942d72ad..391b3cf7a4 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -517,7 +517,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.7450E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 29e85b1dbf..ba2f9b3737 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -517,7 +517,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.7450E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index fdc41b8c51..d81b8660f3 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -517,7 +517,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.7450E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 1cf086c6ba..075f51f360 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -514,7 +514,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2290E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.6762E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.6762E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9470E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0839E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4245E-05 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 4db83b68b5..1f82f7b601 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -519,7 +519,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1061E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 4.1078E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.1078E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0689E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9916E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4126E-05 OP @@ -1682,7 +1682,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1146E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 4.0431E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0431E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0820E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9820E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4036E-05 OP @@ -2845,7 +2845,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1238E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 4.0227E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0227E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.1144E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9585E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.3947E-05 OP @@ -4008,7 +4008,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1715E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9960E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9960E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0884E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9773E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.3964E-05 OP @@ -5171,7 +5171,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1531E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9998E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9998E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0680E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9923E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4042E-05 OP @@ -6334,7 +6334,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1452E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9635E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9635E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0504E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0053E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4131E-05 OP @@ -7497,7 +7497,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1915E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9388E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9388E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0293E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0210E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4147E-05 OP @@ -8660,7 +8660,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2074E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9711E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9711E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0529E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0034E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4067E-05 OP @@ -9823,7 +9823,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2337E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 4.0073E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0073E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0706E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9903E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.3998E-05 OP @@ -10986,7 +10986,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2713E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9907E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9907E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0501E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0054E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4003E-05 OP @@ -12149,7 +12149,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2391E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9599E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9599E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0408E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0124E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4067E-05 OP @@ -13312,7 +13312,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2221E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9340E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9340E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0207E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0274E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4146E-05 OP @@ -14475,7 +14475,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2611E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9155E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9155E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9990E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0439E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4153E-05 OP @@ -15638,7 +15638,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2685E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.9658E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9658E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0183E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0292E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4063E-05 OP @@ -16801,7 +16801,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2763E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 4.0161E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0161E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0375E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0148E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.3971E-05 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index e1da334aaf..1ecd7f15c2 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -374,7 +374,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -1369,7 +1369,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -2364,7 +2364,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -3359,7 +3359,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -4354,7 +4354,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -5349,7 +5349,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -6344,7 +6344,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -7339,7 +7339,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP @@ -8334,7 +8334,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.1974E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index ff5a814dfe..395e6c220e 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -514,7 +514,7 @@ Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2290E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 - Loop_voltage_during_burn_(V)____________________________________________ (vburn)_______________________ 3.6762E-02 OP + Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.6762E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9470E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0839E+03 OP Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4245E-05 OP From f39f078fe95dd0c33e3800a437bcb548d6b542e1 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 7 Feb 2025 22:54:16 +0000 Subject: [PATCH 18/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rlp'=20to=20'ind?= =?UTF-8?q?=5Fplasma'=20across=20codebase=20and=20update=20related=20calcu?= =?UTF-8?q?lations=20and=20documentation?= 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/pfcoil.py | 2 +- process/physics.py | 6 ++-- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 10 +++---- 20 files changed, 59 insertions(+), 59 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 7a2b1b68ec..077d037919 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -524,7 +524,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9627E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0562E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0010E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.3992E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.3992E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3502E+21 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 658d98ad8a..bd31114b7c 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -520,7 +520,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3420E+21 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index e2a8ff763b..1418b8079d 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -520,7 +520,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3420E+21 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index b0720af15d..2556ed5804 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -520,7 +520,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3420E+21 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 335077ba49..1737c6ac9d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -520,7 +520,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3420E+21 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index acec35a8f2..6c2ee043e4 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -377,7 +377,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -1372,7 +1372,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -2367,7 +2367,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -3362,7 +3362,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -4357,7 +4357,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -5352,7 +5352,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -6347,7 +6347,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -7342,7 +7342,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -8337,7 +8337,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP diff --git a/process/pfcoil.py b/process/pfcoil.py index e5b435c493..bdd14cdd43 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1712,7 +1712,7 @@ def induct(self, output): ] # Plasma self inductance - pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 1] = pv.rlp + pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 1] = pv.ind_plasma # PF coil / plasma mutual inductances ncoils = 0 diff --git a/process/physics.py b/process/physics.py index b3e1a4c929..3f6e7a536f 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2337,7 +2337,7 @@ def physics(self): # Calculate Volt-second requirements ( physics_variables.vs_plasma_internal, - physics_variables.rlp, + physics_variables.ind_plasma, physics_variables.vs_burn_required, physics_variables.vs_plasma_ind_ramp, physics_variables.vs_plasma_res_ramp, @@ -5506,8 +5506,8 @@ def outplas(self): po.ovarre( self.outfile, "Plasma inductance (H)", - "(rlp)", - physics_variables.rlp, + "(ind_plasma)", + physics_variables.ind_plasma, "OP ", ) po.ovarrf( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 0fcbc6d3ea..9a8375565e 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -765,7 +765,7 @@ module physics_variables real(dp) :: rli !! plasma normalised internal inductance (calculated from alphaj if `iprofile=1`) - real(dp) :: rlp + real(dp) :: ind_plasma !! plasma inductance (H) real(dp) :: rmajor @@ -1081,7 +1081,7 @@ subroutine init_physics_variables f_nd_alpha_electron = 0.10D0 f_nd_protium_electrons = 0.0D0 rli = 0.9D0 - rlp = 0.0D0 + ind_plasma = 0.0D0 rmajor = 8.14D0 rminor = 0.0D0 f_nd_beam_electron = 0.005D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 7e8835f0ad..33df705a4b 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -519,7 +519,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3420E+21 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 391b3cf7a4..e7d28991b3 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -520,7 +520,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3420E+21 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ba2f9b3737..c0edcf26b5 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -520,7 +520,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3420E+21 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d81b8660f3..81aaef2b1d 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -520,7 +520,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4181E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3420E+21 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 075f51f360..2db27eb643 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -517,7 +517,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.6762E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9470E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0839E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4245E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4245E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3577E+21 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 1f82f7b601..457b3e7c25 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -522,7 +522,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.1078E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0689E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9916E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4126E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4126E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7176E+21 OP @@ -1685,7 +1685,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0431E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0820E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9820E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4036E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4036E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7709E+21 OP @@ -2848,7 +2848,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0227E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.1144E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9585E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.3947E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.3947E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7853E+21 OP @@ -4011,7 +4011,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9960E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0884E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9773E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.3964E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.3964E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7588E+21 OP @@ -5174,7 +5174,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9998E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0680E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9923E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4042E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4042E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7831E+21 OP @@ -6337,7 +6337,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9635E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0504E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0053E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4131E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4131E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.8047E+21 OP @@ -7500,7 +7500,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9388E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0293E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0210E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4147E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4147E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7806E+21 OP @@ -8663,7 +8663,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9711E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0529E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0034E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4067E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4067E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7852E+21 OP @@ -9826,7 +9826,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0073E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0706E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9903E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.3998E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.3998E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7734E+21 OP @@ -10989,7 +10989,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9907E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0501E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0054E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4003E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4003E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7567E+21 OP @@ -12152,7 +12152,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9599E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0408E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0124E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4067E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4067E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7723E+21 OP @@ -13315,7 +13315,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9340E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0207E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0274E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4146E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4146E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7780E+21 OP @@ -14478,7 +14478,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9155E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9990E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0439E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4153E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4153E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7598E+21 OP @@ -15641,7 +15641,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9658E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0183E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0292E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4063E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4063E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7620E+21 OP @@ -16804,7 +16804,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0161E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0375E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0148E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.3971E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.3971E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.7644E+21 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 1ecd7f15c2..0bf30e8c96 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -377,7 +377,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -1372,7 +1372,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -2367,7 +2367,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -3362,7 +3362,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -4357,7 +4357,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -5352,7 +5352,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -6347,7 +6347,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -7342,7 +7342,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP @@ -8337,7 +8337,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.6558E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 5.1368E+21 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 8d831019b0..4acf8f9269 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4235,7 +4235,7 @@ "rlclolcn": 0.0, "rlenmax": 0.5, "rli": 0.9, - "rlp": 0.0, + "ind_plasma": 0.0, "rmaj": null, "rmajor": 8.14, "rmajor_star": 0.0, @@ -10543,7 +10543,7 @@ "rlclolcn": "ratio of collision length / connection length", "rlenmax": "maximum value for length ratio (rlclolcn) (`constraintg eqn 22`)", "rli": "plasma normalised internal inductance (calculated from alphaj if `iprofile=1`)", - "rlp": "plasma inductance (H)", + "ind_plasma": "plasma inductance (H)", "rmaj": "", "rmajor": "plasma major radius (m) (`iteration variable 3`)", "rmajor_star": "", @@ -19229,7 +19229,7 @@ "f_nd_alpha_electron", "f_nd_protium_electrons", "rli", - "rlp", + "ind_plasma", "rmajor", "rminor", "f_nd_beam_electron", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index ef7b6d6f05..7fde9d41f2 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -2969,7 +2969,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ]), ) monkeypatch.setattr(pv, "rmajor", 8.8901000000000003) - monkeypatch.setattr(pv, "rlp", 1.6039223939491056e-05) + monkeypatch.setattr(pv, "ind_plasma", 1.6039223939491056e-05) sxlg_exp = np.array([ [ diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 395e6c220e..8a952276a8 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -517,7 +517,7 @@ Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.6762E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9470E-09 OP Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0839E+03 OP - Plasma_inductance_(H)___________________________________________________ (rlp)_________________________ 1.4245E-05 OP + Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4245E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 Fuelling_rate_(nucleus-pairs/s)_________________________________________ (qfuel)_______________________ 3.3577E+21 OP diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index a07e9c6c7c..77deec9454 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1737,7 +1737,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_plasma_internal: Any = None - expected_rlp: Any = None + expected_ind_plasma: Any = None expected_vs_burn_required: Any = None @@ -1764,7 +1764,7 @@ class VoltSecondReqParam(NamedTuple): t_burn=1000, t_fusion_ramp=10, expected_vs_plasma_internal=111.57651734747576, - expected_rlp=1.4075705307248088e-05, + expected_ind_plasma=1.4075705307248088e-05, expected_vs_burn_required=42.109179697761263, expected_vs_plasma_ind_ramp=258.97124024420435, expected_vs_plasma_res_ramp=55.488435095110333, @@ -1783,7 +1783,7 @@ class VoltSecondReqParam(NamedTuple): t_burn=0, t_fusion_ramp=10, expected_vs_plasma_internal=111.57651734747576, - expected_rlp=1.4075705307248088e-05, + expected_ind_plasma=1.4075705307248088e-05, expected_vs_burn_required=0.41692257126496302, expected_vs_plasma_ind_ramp=258.97124024420435, expected_vs_plasma_res_ramp=55.488435095110333, @@ -1803,7 +1803,7 @@ def test_vscalc(voltsecondreqparam): ( vs_plasma_internal, - rlp, + ind_plasma, vs_burn_required, vs_plasma_ind_ramp, vs_plasma_res_ramp, @@ -1826,7 +1826,7 @@ def test_vscalc(voltsecondreqparam): voltsecondreqparam.expected_vs_plasma_internal ) - assert rlp == pytest.approx(voltsecondreqparam.expected_rlp) + assert ind_plasma == pytest.approx(voltsecondreqparam.expected_ind_plasma) assert vs_burn_required == pytest.approx( voltsecondreqparam.expected_vs_burn_required From bb97c8fdc6576aef7e194a1c74abce8d31be35cb Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 7 Feb 2025 23:11:26 +0000 Subject: [PATCH 19/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rli'=20to=20'ind?= =?UTF-8?q?=5Fplasma=5Finternal=5Fnorm'=20across=20codebase=20and=20update?= =?UTF-8?q?=20related=20calculations=20and=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 ++--- process/io/variable_metadata.py | 4 +- process/pfcoil.py | 6 +- process/physics.py | 74 ++++++++++--------- process/plasma_geometry.py | 8 +- source/fortran/input.f90 | 8 +- source/fortran/physics_variables.f90 | 18 ++--- .../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 | 14 ++-- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/st_regression.IN.DAT | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 42 ++++++----- 24 files changed, 141 insertions(+), 129 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 077d037919..72b0b63845 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -334,7 +334,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6699E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8387E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.1898E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.1898E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3601E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.0627E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.7139E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index bd31114b7c..585af5e5b6 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -335,7 +335,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6631E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9805E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2275E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2275E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4373E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2940E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6787E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 1418b8079d..3b85ea70e3 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -335,7 +335,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6631E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9805E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2275E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2275E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4373E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2940E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6787E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 2556ed5804..cf17c4c13c 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -335,7 +335,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6631E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9805E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2275E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2275E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4373E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2940E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6787E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 1737c6ac9d..f156464fa3 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -335,7 +335,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6631E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9805E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2275E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2275E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4373E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2940E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6787E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 6c2ee043e4..c656a25b5d 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -190,7 +190,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -1185,7 +1185,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -2180,7 +2180,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -3175,7 +3175,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -4170,7 +4170,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -5165,7 +5165,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -6160,7 +6160,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -7155,7 +7155,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -8150,7 +8150,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 2f67e6f477..6aa43dd957 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -281,8 +281,8 @@ class VariableMetadata: description="Maximum TF winding pack stress", units="", ), - "rli": VariableMetadata( - latex=r"$l_i$", description="Normalized internal inductance", units="" + "ind_plasma_internal_norm": VariableMetadata( + latex=r"$l_i$", description="Plasma normalised internal inductance", units="" ), "n_cycle_min": VariableMetadata( latex=r"$MinCycles_{\mathrm{Stress.min}}^{\mathrm{CS}}$", diff --git a/process/pfcoil.py b/process/pfcoil.py index bdd14cdd43..067da403e0 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -309,7 +309,7 @@ def pfcoil(self): * ( math.log(8.0e0 * pv.aspect) + pv.beta_poloidal - + (pv.rli / 2.0e0) + + (pv.ind_plasma_internal_norm / 2.0e0) - 1.5e0 ) ) @@ -384,7 +384,7 @@ def pfcoil(self): zpts[0] = 0.0e0 brin[0] = 0.0e0 - # Added pv.rli term correctly -- RK 07/12 + # Added pv.ind_plasma_internal_norm term correctly -- RK 07/12 bzin[0] = ( -1.0e-7 @@ -393,7 +393,7 @@ def pfcoil(self): * ( math.log(8.0e0 * pv.aspect) + pv.beta_poloidal - + (pv.rli / 2.0e0) + + (pv.ind_plasma_internal_norm / 2.0e0) - 1.5e0 ) ) diff --git a/process/physics.py b/process/physics.py index 3f6e7a536f..c494ecaaa4 100644 --- a/process/physics.py +++ b/process/physics.py @@ -70,7 +70,7 @@ def calculate_volt_second_requirements( plasma_current: float, t_fusion_ramp: float, t_burn: float, - rli: float, + ind_plasma_internal_norm: float, ) -> tuple[float, float, float, float, float, float]: """Calculate the volt-second requirements and related parameters for plasma physics. @@ -94,8 +94,8 @@ def calculate_volt_second_requirements( :type t_fusion_ramp: float :param t_burn: Burn time (s) :type t_burn: float - :param rli: Plasma normalized inductivity - :type rli: float + :param ind_plasma_internal_norm: Plasma normalized internal inductance + :type ind_plasma_internal_norm: float :return: A tuple containing: - vs_plasma_internal: Internal plasma volt-seconds (Wb) @@ -126,7 +126,7 @@ def calculate_volt_second_requirements( """ # Plasma internal inductance - ind_plasma_internal = constants.rmu0 * rmajor * rli / 2.0 + ind_plasma_internal = constants.rmu0 * rmajor * ind_plasma_internal_norm / 2.0 # Internal plasma flux (V-s) component vs_plasma_internal = ind_plasma_internal * plasma_current @@ -1564,7 +1564,7 @@ def physics(self): # Calculate plasma current ( physics_variables.alphaj, - physics_variables.rli, + physics_variables.ind_plasma_internal_norm, physics_variables.bp, physics_variables.qstar, physics_variables.plasma_current, @@ -1581,7 +1581,7 @@ def physics(self): physics_variables.len_plasma_poloidal, physics_variables.q0, physics_variables.q, - physics_variables.rli, + physics_variables.ind_plasma_internal_norm, physics_variables.rmajor, physics_variables.rminor, physics_variables.triang, @@ -1851,7 +1851,7 @@ def physics(self): alphan=physics_variables.alphan, alphat=physics_variables.alphat, eps=physics_variables.eps, - rli=physics_variables.rli, + ind_plasma_internal_norm=physics_variables.ind_plasma_internal_norm, ) ) @@ -1859,7 +1859,7 @@ def physics(self): current_drive_variables.cboot * self.bootstrap_fraction_aries( beta_poloidal=physics_variables.beta_poloidal, - rli=physics_variables.rli, + ind_plasma_internal_norm=physics_variables.ind_plasma_internal_norm, core_density=physics_variables.ne0, average_density=physics_variables.dene, inverse_aspect=physics_variables.eps, @@ -2352,7 +2352,7 @@ def physics(self): physics_variables.res_plasma, physics_variables.plasma_current, times_variables.t_burn, - physics_variables.rli, + physics_variables.ind_plasma_internal_norm, ) # Calculate auxiliary physics related information @@ -2393,7 +2393,9 @@ def physics(self): # T. T. S et al., “Profile Optimization and High Beta Discharges and Stability of High Elongation Plasmas in the DIII-D Tokamak,” # Osti.gov, Oct. 1990. https://www.osti.gov/biblio/6194284 (accessed Dec. 19, 2024). - physics_variables.beta_norm_max = 4.0e0 * physics_variables.rli + physics_variables.beta_norm_max = ( + 4.0e0 * physics_variables.ind_plasma_internal_norm + ) if physics_variables.iprofile == 2: # Original scaling law @@ -3178,7 +3180,7 @@ def calculate_plasma_current( len_plasma_poloidal: float, q0: float, q95: float, - rli: float, + ind_plasma_internal_norm: float, rmajor: float, rminor: float, triang: float, @@ -3202,26 +3204,26 @@ def calculate_plasma_current( 8 = Sauter scaling (allowing negative triangularity) 9 = FIESTA ST scaling iprofile (int): Switch for current profile consistency. - 0: Use input values for alphaj, rli, beta_norm_max. + 0: Use input values for alphaj, ind_plasma_internal_norm, beta_norm_max. 1: Make these consistent with input q, q_0 values. - 2: Use input values for alphaj, rli. Scale beta_norm_max with aspect ratio (original scaling). - 3: Use input values for alphaj, rli. Scale beta_norm_max with aspect ratio (Menard scaling). - 4: Use input values for alphaj, beta_norm_max. Set rli from elongation (Menard scaling). - 5: Use input value for alphaj. Set rli and beta_norm_max from Menard scaling. + 2: Use input values for alphaj, ind_plasma_internal_norm. Scale beta_norm_max with aspect ratio (original scaling). + 3: Use input values for alphaj, ind_plasma_internal_norm. Scale beta_norm_max with aspect ratio (Menard scaling). + 4: Use input values for alphaj, beta_norm_max. Set ind_plasma_internal_norm from elongation (Menard scaling). + 5: Use input value for alphaj. Set ind_plasma_internal_norm and beta_norm_max from Menard scaling. kappa (float): Plasma elongation. kappa95 (float): Plasma elongation at 95% surface. p0 (float): Central plasma pressure (Pa). len_plasma_poloidal (float): Plasma perimeter length (m). q0 (float): Plasma safety factor on axis. q95 (float): Plasma safety factor at 95% flux (= q-bar for i_plasma_current=2). - rli (float): Plasma normalised internal inductance. + ind_plasma_internal_norm (float): Plasma normalised internal inductance. rmajor (float): Major radius (m). rminor (float): Minor radius (m). triang (float): Plasma triangularity. triang95 (float): Plasma triangularity at 95% surface. Returns: - Tuple[float, float, float, float, float]: Tuple containing bp, qstar, plasma_current, alphaj, rli. + Tuple[float, float, float, float, float]: Tuple containing bp, qstar, plasma_current, alphaj, ind_plasma_internal_norm. Raises: ValueError: If invalid value for i_plasma_current is provided. @@ -3344,14 +3346,14 @@ def calculate_plasma_current( # Tokamaks 4th Edition, Wesson, page 116 alphaj = qstar / q0 - 1.0 - rli = np.log(1.65 + 0.89 * alphaj) + ind_plasma_internal_norm = np.log(1.65 + 0.89 * alphaj) if iprofile in [4, 5, 6]: # Spherical Tokamak relation for internal inductance # Menard et al. (2016), Nuclear Fusion, 56, 106023 - rli = 3.4 - kappa + ind_plasma_internal_norm = 3.4 - kappa - return alphaj, rli, bp, qstar, plasma_current + return alphaj, ind_plasma_internal_norm, bp, qstar, plasma_current def outtim(self): po.oheadr(self.outfile, "Times") @@ -3667,12 +3669,12 @@ def outplas(self): if physics_variables.iprofile == 1: po.ocmmnt( self.outfile, - "Consistency between q0,q,alphaj,rli,beta_norm_max is enforced", + "Consistency between q0,q,alphaj,ind_plasma_internal_norm,beta_norm_max is enforced", ) else: po.ocmmnt( self.outfile, - "Consistency between q0,q,alphaj,rli,beta_norm_max is not enforced", + "Consistency between q0,q,alphaj,ind_plasma_internal_norm,beta_norm_max is not enforced", ) po.oblnkl(self.outfile) @@ -3715,9 +3717,9 @@ def outplas(self): ) po.ovarrf( self.outfile, - "Plasma internal inductance, li", - "(rli)", - physics_variables.rli, + "Plasma normalised internal inductance", + "(ind_plasma_internal_norm)", + physics_variables.ind_plasma_internal_norm, "OP ", ) po.ovarrf( @@ -6305,7 +6307,7 @@ def bootstrap_fraction_sakai( alphan: float, alphat: float, eps: float, - rli: float, + ind_plasma_internal_norm: float, ) -> float: """ Calculate the bootstrap fraction using the Sakai formula. @@ -6317,7 +6319,7 @@ def bootstrap_fraction_sakai( alphan (float): Density profile index alphat (float): Temperature profile index eps (float): Inverse aspect ratio. - rli (float): Internal Inductance + ind_plasma_internal_norm (float): Plasma normalised internal inductance Returns: float: The calculated bootstrap fraction. @@ -6341,7 +6343,7 @@ def bootstrap_fraction_sakai( return ( 10 ** (0.951 * eps - 0.948) * beta_poloidal ** (1.226 * eps + 1.584) - * rli ** (-0.184 * eps - 0.282) + * ind_plasma_internal_norm ** (-0.184 * eps - 0.282) * (q95 / q0) ** (-0.042 * eps - 0.02) * alphan ** (0.13 * eps + 0.05) * alphat ** (0.502 * eps - 0.273) @@ -6350,7 +6352,7 @@ def bootstrap_fraction_sakai( @staticmethod def bootstrap_fraction_aries( beta_poloidal: float, - rli: float, + ind_plasma_internal_norm: float, core_density: float, average_density: float, inverse_aspect: float, @@ -6360,7 +6362,7 @@ def bootstrap_fraction_aries( Parameters: beta_poloidal (float): Plasma poloidal beta. - rli (float): Plasma normalized internal inductance. + ind_plasma_internal_norm (float): Plasma normalized internal inductance. core_density (float): Core plasma density. average_density (float): Average plasma density. inverse_aspect (float): Inverse aspect ratio. @@ -6378,8 +6380,14 @@ def bootstrap_fraction_aries( """ # Using the standard variable naming from the ARIES paper - a_1 = 1.10 - 1.165 * rli + 0.47 * rli**2 - b_1 = 0.806 - 0.885 * rli + 0.297 * rli**2 + a_1 = ( + 1.10 - 1.165 * ind_plasma_internal_norm + 0.47 * ind_plasma_internal_norm**2 + ) + b_1 = ( + 0.806 + - 0.885 * ind_plasma_internal_norm + + 0.297 * ind_plasma_internal_norm**2 + ) c_bs = a_1 + b_1 * (core_density / average_density) diff --git a/process/plasma_geometry.py b/process/plasma_geometry.py index f09e23a03e..c8c9bc2b65 100644 --- a/process/plasma_geometry.py +++ b/process/plasma_geometry.py @@ -167,11 +167,11 @@ def plasma_geometry(self) -> None: if ( physics_variables.i_plasma_geometry == 9 - ): # Use input triang, physics_variables.rli values + ): # Use input triang, physics_variables.ind_plasma_internal_norm values # physics_variables.kappa found from physics_variables.aspect ratio and plasma internal inductance li(3) - physics_variables.kappa = (1.09e0 + 0.26e0 / physics_variables.rli) * ( - 1.5e0 / physics_variables.aspect - ) ** 0.4e0 + physics_variables.kappa = ( + 1.09e0 + 0.26e0 / physics_variables.ind_plasma_internal_norm + ) * (1.5e0 / physics_variables.aspect) ** 0.4e0 physics_variables.kappa95 = physics_variables.kappa / 1.12e0 physics_variables.triang95 = physics_variables.triang / 1.50e0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 70ae1a2374..3cdb88a1e2 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -308,7 +308,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fpdivlim, beta_poloidal_eps_max, i_confinement_time, kappa95, aspect, f_r_conducting_wall, nesep, c_beta, csawth, dene, & ftar, plasma_res_factor, f_sync_reflect, f_nd_beam_electron, beta, neped, hfact, beta_norm_max, & fgwsep, rhopedn, tratio, q0, i_plasma_geometry, i_plasma_shape, fne0, ignite, f_tritium, & - i_beta_fast_alpha, tauee_in, alphaj, alphat, i_plasma_current, q, ti, tesep, rli, triang, & + i_beta_fast_alpha, tauee_in, alphaj, alphat, i_plasma_current, q, ti, tesep, ind_plasma_internal_norm, triang, & itart, f_nd_alpha_electron, iprofile, triang95, rad_fraction_sol, betbm0, f_nd_protium_electrons, & teped, f_helium3, iwalld, ejima_coeff, f_alpha_plasma, fgwped, tbeta, i_bootstrap_current, & i_rad_loss, te, alphan, rmajor, plasma_square, kappa, fkzohm, beamfus0, & @@ -725,9 +725,9 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('rhopedt') call parse_real_variable('rhopedt', rhopedt, 0.01D0, 1.0D0, & 'Temperature pedestal r/a') - case ('rli') - call parse_real_variable('rli', rli, 0.0D0, 10.0D0, & - 'Normalised inductivity') + case ('ind_plasma_internal_norm') + call parse_real_variable('ind_plasma_internal_norm', ind_plasma_internal_norm, 0.0D0, 10.0D0, & + 'Plasma normalised internal inductance') case ('rmajor') call parse_real_variable('rmajor', rmajor, 0.1D0, 50.0D0, & 'Plasma major radius (m)') diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 9a8375565e..b1eaa4d7de 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -399,13 +399,13 @@ module physics_variables integer :: iprofile !! switch for current profile consistency: !! - !! - =0 use input values for alphaj, rli, beta_norm_max + !! - =0 use input values for alphaj, ind_plasma_internal_norm, beta_norm_max !! - =1 make these consistent with input q, q_0 values (recommend `i_plasma_current=4` with this option) - !! - =2 use input values for alphaj, rli. Scale beta_norm_max with aspect ratio (original scaling) - !! - =3 use input values for alphaj, rli. Scale beta_norm_max with aspect ratio (Menard scaling) - !! - =4 use input values for alphaj, beta_norm_max. Set rli from elongation (Menard scaling) - !! - =5 use input value for alphaj. Set rli and beta_norm_max from Menard scaling - !! - =6 use input values for alphaj, c_beta. Set rli from Menard and beta_norm_max from Tholerus + !! - =2 use input values for alphaj, ind_plasma_internal_norm. Scale beta_norm_max with aspect ratio (original scaling) + !! - =3 use input values for alphaj, ind_plasma_internal_norm. Scale beta_norm_max with aspect ratio (Menard scaling) + !! - =4 use input values for alphaj, beta_norm_max. Set ind_plasma_internal_norm from elongation (Menard scaling) + !! - =5 use input value for alphaj. Set ind_plasma_internal_norm and beta_norm_max from Menard scaling + !! - =6 use input values for alphaj, c_beta. Set ind_plasma_internal_norm from Menard and beta_norm_max from Tholerus integer :: i_rad_loss !! switch for radiation loss term usage in power balance (see User Guide): @@ -762,8 +762,8 @@ module physics_variables real(dp) :: f_nd_protium_electrons !! Seeded f_nd_protium_electrons density / electron density. - real(dp) :: rli - !! plasma normalised internal inductance (calculated from alphaj if `iprofile=1`) + real(dp) :: ind_plasma_internal_norm + !! Plasma normalised internal inductance (calculated from alphaj if `iprofile=1`) real(dp) :: ind_plasma !! plasma inductance (H) @@ -1080,7 +1080,7 @@ subroutine init_physics_variables rad_fraction_total = 0.0D0 f_nd_alpha_electron = 0.10D0 f_nd_protium_electrons = 0.0D0 - rli = 0.9D0 + ind_plasma_internal_norm = 0.9D0 ind_plasma = 0.0D0 rmajor = 8.14D0 rminor = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 33df705a4b..e82539919e 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -334,7 +334,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6631E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9805E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2275E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2275E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4373E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2940E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6787E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index e7d28991b3..30b29dd799 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -335,7 +335,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6631E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9805E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2275E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2275E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4373E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2940E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6787E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index c0edcf26b5..d80b32d89a 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -335,7 +335,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6631E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9805E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2275E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2275E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4373E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2940E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6787E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 81aaef2b1d..8dac19929f 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -335,7 +335,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6631E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9805E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2275E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2275E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4373E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2940E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6787E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 2db27eb643..acb35b74b3 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -331,7 +331,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6521E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 2.0295E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2402E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2402E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4379E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.3453E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6210E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 457b3e7c25..dc3b844d1a 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -336,7 +336,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6569E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9385E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2165E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2165E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3401E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6462E-01 @@ -1499,7 +1499,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6633E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8709E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.1985E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.1985E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3404E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.1000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6796E-01 @@ -2662,7 +2662,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6683E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8062E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.1810E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.1810E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3354E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.0000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.7056E-01 @@ -3825,7 +3825,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6609E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8186E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.1844E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.1844E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3410E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.0000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6673E-01 @@ -4988,7 +4988,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6604E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8760E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.1999E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.1999E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3571E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.1000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6644E-01 @@ -6151,7 +6151,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6548E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9423E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2175E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2175E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3617E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6351E-01 @@ -7314,7 +7314,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6479E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9545E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2207E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2207E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3684E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5994E-01 @@ -8477,7 +8477,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6497E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8947E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2048E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2048E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3564E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.1000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6085E-01 @@ -9640,7 +9640,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6468E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8429E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.1909E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.1909E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3335E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.0000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5934E-01 @@ -10803,7 +10803,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6447E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8466E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.1919E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.1919E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3508E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.0000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5823E-01 @@ -11966,7 +11966,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6498E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8944E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2048E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2048E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3786E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.1000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6092E-01 @@ -13129,7 +13129,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6485E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9535E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2204E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2204E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.3919E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6023E-01 @@ -14292,7 +14292,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6455E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9590E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2219E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2219E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4071E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5865E-01 @@ -15455,7 +15455,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6516E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8912E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2039E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2039E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4046E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.1000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6187E-01 @@ -16618,7 +16618,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6581E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.8235E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.1857E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.1857E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4025E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.0000E+00 Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6524E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 0bf30e8c96..7c6428790c 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -190,7 +190,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -1185,7 +1185,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -2180,7 +2180,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -3175,7 +3175,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -4170,7 +4170,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -5165,7 +5165,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -6160,7 +6160,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -7155,7 +7155,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 @@ -8150,7 +8150,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.8078E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 1.9256E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2131E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2131E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -6.9441E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.2660E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.5031E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 4acf8f9269..0bb3287f72 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4234,7 +4234,7 @@ "rkind": "double", "rlclolcn": 0.0, "rlenmax": 0.5, - "rli": 0.9, + "ind_plasma_internal_norm": 0.9, "ind_plasma": 0.0, "rmaj": null, "rmajor": 8.14, @@ -9315,7 +9315,7 @@ "nd_alphas": "thermal alpha density (/m3)", "nd_beam_ions": "hot beam ion density, variable (/m3)", "beam_density_out": "hot beam ion density from calculation (/m3)", - "beta_norm_max": "Troyon-like coefficient for beta scaling calculated\n as 4*rli if `iprofile=1` (see also gtscale option)", + "beta_norm_max": "Troyon-like coefficient for beta scaling calculated\n as 4*ind_plasma_internal_norm if `iprofile=1` (see also gtscale option)", "dndrho_max": "Maximum density gradient wrt to normalized r (rho) (/m3)", "dnelimt": "density limit (/m3)", "nd_ions_total": "total ion density (/m3)", @@ -9891,7 +9891,7 @@ "i_cs_precomp": "Switch for existence of central solenoid pre-compression structure:\n
    \n
  • =0 no pre-compression structure
    • \n
  • =1 calculated pre-compression structure
    • \n
", "iprimdiv": "", "iprimshld": "Switch for shield thermal power destiny:\n
    \n
  • =0 does not contribute to energy generation cycle
    • \n
  • =1 contributes to energy generation cycle
    • \n
", - "iprofile": "switch for current profile consistency:\n
    \n
  • =0 use input values for alphaj, rli, beta_norm_max (but see gtscale option)
    • \n
  • =1 make these consistent with input q, q_0 values (recommend `i_plasma_current=4` with this option)
    • \n
", + "iprofile": "switch for current profile consistency:\n
    \n
  • =0 use input values for alphaj, ind_plasma_internal_norm, beta_norm_max (but see gtscale option)
    • \n
  • =1 make these consistent with input q, q_0 values (recommend `i_plasma_current=4` with this option)
    • \n
", "i_pfirsch_schluter_current": "switch for Pfirsch-Schl\u00fcter current scaling (issue #413):\n
    \n
  • =0 Do not calculate
    • \n
  • =1 Use SCENE scaling
    • \n
", "iptnt": "", "iptr": "", @@ -10542,7 +10542,7 @@ "rkind": "", "rlclolcn": "ratio of collision length / connection length", "rlenmax": "maximum value for length ratio (rlclolcn) (`constraintg eqn 22`)", - "rli": "plasma normalised internal inductance (calculated from alphaj if `iprofile=1`)", + "ind_plasma_internal_norm": "plasma normalised internal inductance (calculated from alphaj if `iprofile=1`)", "ind_plasma": "plasma inductance (H)", "rmaj": "", "rmajor": "plasma major radius (m) (`iteration variable 3`)", @@ -14151,7 +14151,7 @@ "lb": 0.0, "ub": 1.0 }, - "rli": { + "ind_plasma_internal_norm": { "lb": 0.0, "ub": 10.0 }, @@ -19228,7 +19228,7 @@ "rad_fraction_total", "f_nd_alpha_electron", "f_nd_protium_electrons", - "rli", + "ind_plasma_internal_norm", "ind_plasma", "rmajor", "rminor", @@ -20672,7 +20672,7 @@ "ripmax": "real_variable", "rjconpf": "real_array", "rlenmax": "real_variable", - "rli": "real_variable", + "ind_plasma_internal_norm": "real_variable", "rmajor": "real_variable", "f_nd_beam_electron": "real_variable", "robotics_h": "real_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 7fde9d41f2..4717e313c4 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -116,7 +116,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "ccls_ma", np.full(10, 0.0)) monkeypatch.setattr(pv, "bvert", -6.51e-1) monkeypatch.setattr(pv, "kappa", 1.727) - monkeypatch.setattr(pv, "rli", 1.693) + monkeypatch.setattr(pv, "ind_plasma_internal_norm", 1.693) monkeypatch.setattr(pv, "itartpf", 0) monkeypatch.setattr(pv, "vs_plasma_res_ramp", 6.151e1) monkeypatch.setattr(pv, "plasma_current", 1.8254e7) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 4b2e785199..ba7c20786b 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2971,13 +2971,13 @@ i_pfirsch_schluter_current = 1 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ iprofile = 0 -* DESCRIPTION: Switch for Current Profile Consistency (0: Use Input Values for alphaj rli beta_norm_max) -* =0 use input values for alphaj, rli, beta_norm_max (but see gtscale option) +* DESCRIPTION: Switch for Current Profile Consistency (0: Use Input Values for alphaj ind_plasma_internal_norm beta_norm_max) +* =0 use input values for alphaj, ind_plasma_internal_norm, beta_norm_max (but see gtscale option) * =1 make these consistent with input q, q_0 values (recommend `i_plasma_current=4` with this option) * JUSTIFICATION: These consistency equations don't hold for STs * REFERENCE: -rli = 0.3 +ind_plasma_internal_norm = 0.3 * DESCRIPTION: Plasma Normalised Internal Inductance * JUSTIFICATION: Matched to JETTO li(3). diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 8a952276a8..1b0f02f83c 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -331,7 +331,7 @@ Plasma_current_scaling_law_used_________________________________________ (i_plasma_current)_______________________ 4 Plasma_current_(MA)_____________________________________________________ (plasma_current_MA)_________________ 1.6521E+01 Current_density_profile_factor__________________________________________ (alphaj)______________________ 2.0295E+00 - Plasma_internal_inductance,_li__________________________________________ (rli)_________________________ 1.2402E+00 + Plasma_internal_inductance,_li__________________________________________ (ind_plasma_internal_norm)_________________________ 1.2402E+00 Vertical_field_at_plasma_(T)____________________________________________ (bvert)_______________________ -7.4379E-01 Vacuum_toroidal_field_at_R_(T)__________________________________________ (bt)__________________________ 5.3453E+00 ITV Average_poloidal_field_(T)______________________________________________ (bp)__________________________ 8.6210E-01 diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 77deec9454..245b79df7c 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -503,7 +503,7 @@ class BootstrapFractionSakaiParam(NamedTuple): eps: Any = None - rli: Any = None + ind_plasma_internal_norm: Any = None expected_bfs: Any = None @@ -518,7 +518,7 @@ class BootstrapFractionSakaiParam(NamedTuple): alphan=1.0, alphat=1.45, eps=1 / 3, - rli=1.2098126022585098, + ind_plasma_internal_norm=1.2098126022585098, expected_bfs=0.3501274900057279, ), BootstrapFractionSakaiParam( @@ -528,7 +528,7 @@ class BootstrapFractionSakaiParam(NamedTuple): alphan=0.9, alphat=1.3999999999999999, eps=1 / 1.8, - rli=0.3, + ind_plasma_internal_norm=0.3, expected_bfs=0.81877746774625, ), ), @@ -561,7 +561,11 @@ def test_bootstrap_fraction_sakai(bootstrapfractionsakaiparam, monkeypatch, phys monkeypatch.setattr(physics_variables, "eps", bootstrapfractionsakaiparam.eps) - monkeypatch.setattr(physics_variables, "rli", bootstrapfractionsakaiparam.rli) + monkeypatch.setattr( + physics_variables, + "ind_plasma_internal_norm", + bootstrapfractionsakaiparam.ind_plasma_internal_norm, + ) bfs = physics.bootstrap_fraction_sakai( beta_poloidal=bootstrapfractionsakaiparam.beta_poloidal, @@ -570,7 +574,7 @@ def test_bootstrap_fraction_sakai(bootstrapfractionsakaiparam, monkeypatch, phys alphan=bootstrapfractionsakaiparam.alphan, alphat=bootstrapfractionsakaiparam.alphat, eps=bootstrapfractionsakaiparam.eps, - rli=bootstrapfractionsakaiparam.rli, + ind_plasma_internal_norm=bootstrapfractionsakaiparam.ind_plasma_internal_norm, ) assert bfs == pytest.approx(bootstrapfractionsakaiparam.expected_bfs) @@ -579,7 +583,7 @@ def test_bootstrap_fraction_sakai(bootstrapfractionsakaiparam, monkeypatch, phys class BootstrapFractionAriesParam(NamedTuple): beta_poloidal: Any = None - rli: Any = None + ind_plasma_internal_norm: Any = None core_density: Any = None @@ -595,7 +599,7 @@ class BootstrapFractionAriesParam(NamedTuple): ( BootstrapFractionAriesParam( beta_poloidal=1.2708883332338736, - rli=1.4279108047138775, + ind_plasma_internal_norm=1.4279108047138775, core_density=1.0695994460047332e20, average_density=8.1317358967210131e19, inverse_aspect=1 / 3, @@ -615,7 +619,7 @@ def test_bootstrap_fraction_aries(bootstrapfractionariesparam, physics): bfs = physics.bootstrap_fraction_aries( beta_poloidal=bootstrapfractionariesparam.beta_poloidal, - rli=bootstrapfractionariesparam.rli, + ind_plasma_internal_norm=bootstrapfractionariesparam.ind_plasma_internal_norm, core_density=bootstrapfractionariesparam.core_density, average_density=bootstrapfractionariesparam.average_density, inverse_aspect=bootstrapfractionariesparam.inverse_aspect, @@ -875,7 +879,7 @@ class PlasmaCurrentParam(NamedTuple): alphaj: Any = None - rli: Any = None + ind_plasma_internal_norm: Any = None alphap: Any = None @@ -907,7 +911,7 @@ class PlasmaCurrentParam(NamedTuple): expected_alphaj: Any = None - expected_rli: Any = None + expected_ind_plasma_internal_norm: Any = None expected_bp: Any = None @@ -925,7 +929,7 @@ class PlasmaCurrentParam(NamedTuple): i_plasma_current=4, iprofile=1, alphaj=1, - rli=0.90000000000000002, + ind_plasma_internal_norm=0.90000000000000002, alphap=0, bt=5.7000000000000002, eps=0.33333333333333331, @@ -941,7 +945,7 @@ class PlasmaCurrentParam(NamedTuple): triang95=0.33333333333333331, expected_normalised_total_beta=2.4784688886891844, expected_alphaj=1.9008029008029004, - expected_rli=1.2064840230894305, + expected_ind_plasma_internal_norm=1.2064840230894305, expected_bp=0.96008591022564971, expected_qstar=3.869423496255382, expected_plasma_current=18398455.678867526, @@ -952,7 +956,7 @@ class PlasmaCurrentParam(NamedTuple): i_plasma_current=4, iprofile=1, alphaj=1.9008029008029004, - rli=1.2064840230894305, + ind_plasma_internal_norm=1.2064840230894305, alphap=2.4500000000000002, bt=5.7000000000000002, eps=0.33333333333333331, @@ -968,7 +972,7 @@ class PlasmaCurrentParam(NamedTuple): triang95=0.33333333333333331, expected_normalised_total_beta=2.4784688886891844, expected_alphaj=1.9008029008029004, - expected_rli=1.2064840230894305, + expected_ind_plasma_internal_norm=1.2064840230894305, expected_bp=0.96008591022564971, expected_qstar=3.869423496255382, expected_plasma_current=18398455.678867526, @@ -1000,7 +1004,7 @@ def test_calculate_plasma_current(plasmacurrentparam, monkeypatch, physics): i_plasma_current=plasmacurrentparam.i_plasma_current, iprofile=plasmacurrentparam.iprofile, alphaj=plasmacurrentparam.alphaj, - rli=plasmacurrentparam.rli, + ind_plasma_internal_norm=plasmacurrentparam.ind_plasma_internal_norm, alphap=plasmacurrentparam.alphap, bt=plasmacurrentparam.bt, eps=plasmacurrentparam.eps, @@ -1725,7 +1729,7 @@ class VoltSecondReqParam(NamedTuple): plasma_current: Any = None - rli: Any = None + ind_plasma_internal_norm: Any = None rmajor: Any = None @@ -1758,7 +1762,7 @@ class VoltSecondReqParam(NamedTuple): ejima_coeff=0.30000000000000004, kappa=1.8500000000000001, plasma_current=18398455.678867526, - rli=1.2064840230894305, + ind_plasma_internal_norm=1.2064840230894305, rmajor=8, res_plasma=3.7767895536275952e-09, t_burn=1000, @@ -1777,7 +1781,7 @@ class VoltSecondReqParam(NamedTuple): ejima_coeff=0.30000000000000004, kappa=1.8500000000000001, plasma_current=18398455.678867526, - rli=1.2064840230894305, + ind_plasma_internal_norm=1.2064840230894305, rmajor=8, res_plasma=3.7767895536275952e-09, t_burn=0, @@ -1815,7 +1819,7 @@ def test_vscalc(voltsecondreqparam): ejima_coeff=voltsecondreqparam.ejima_coeff, kappa=voltsecondreqparam.kappa, plasma_current=voltsecondreqparam.plasma_current, - rli=voltsecondreqparam.rli, + ind_plasma_internal_norm=voltsecondreqparam.ind_plasma_internal_norm, rmajor=voltsecondreqparam.rmajor, res_plasma=voltsecondreqparam.res_plasma, t_burn=voltsecondreqparam.t_burn, From 70e5154fcd3003791e533ddf1b37757f1e3f4da8 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 7 Feb 2025 23:14:27 +0000 Subject: [PATCH 20/31] :art: Add normalised inductance to volt second requirement section of output --- process/physics.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/process/physics.py b/process/physics.py index c494ecaaa4..8a08d4ab0d 100644 --- a/process/physics.py +++ b/process/physics.py @@ -5512,6 +5512,13 @@ def outplas(self): physics_variables.ind_plasma, "OP ", ) + po.ovarrf( + self.outfile, + "Plasma normalised internal inductance", + "(ind_plasma_internal_norm)", + physics_variables.ind_plasma_internal_norm, + "OP ", + ) po.ovarrf( self.outfile, "Coefficient for sawtooth effects on burn V-s requirement", From b0f7c3c16301a20e3e682787476ef340175ff13f Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 7 Feb 2025 23:41:38 +0000 Subject: [PATCH 21/31] :sparkle: Creat new v_plasma_loop_burn variable in physics variables and add to tests --- process/io/variable_metadata.py | 2 +- process/physics.py | 12 +++++++----- source/fortran/physics_variables.f90 | 4 ++++ tests/unit/test_physics.py | 9 +++++++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 6aa43dd957..b060443e34 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -273,7 +273,7 @@ class VariableMetadata: ), "v_plasma_loop_burn": VariableMetadata( latex=r"$V_{\mathrm{loop}}$ [$V$]", - description="Loop voltage during burn", + description="Plasma loop voltage during burn", units="V", ), "sig_tf_wp_max": VariableMetadata( diff --git a/process/physics.py b/process/physics.py index 8a08d4ab0d..05092c18f2 100644 --- a/process/physics.py +++ b/process/physics.py @@ -158,11 +158,13 @@ def calculate_volt_second_requirements( vs_self_ind_ramp = ind_plasma_total * plasma_current vs_ramp_required = vs_res_ramp + vs_self_ind_ramp - # Loop voltage during flat-top + # Plasma loop voltage during flat-top # Include enhancement factor in flattop V-s requirement # to account for MHD sawtooth effects. - v_burn_resistive = plasma_current * res_plasma * inductive_current_fraction * csawth + v_plasma_loop_burn = plasma_current * res_plasma * inductive_current_fraction + + v_burn_resistive = v_plasma_loop_burn * csawth # N.B. t_burn on first iteration will not be correct # if the pulsed reactor option is used, but the value @@ -178,6 +180,7 @@ def calculate_volt_second_requirements( vs_self_ind_ramp, vs_res_ramp, vs_total_required, + v_plasma_loop_burn, ) @@ -2342,6 +2345,7 @@ def physics(self): physics_variables.vs_plasma_ind_ramp, physics_variables.vs_plasma_res_ramp, physics_variables.vs_total_required, + physics_variables.v_plasma_loop_burn, ) = calculate_volt_second_requirements( physics_variables.csawth, physics_variables.eps, @@ -5485,9 +5489,7 @@ def outplas(self): self.outfile, "Plasma loop voltage during burn (V)", "(v_plasma_loop_burn)", - physics_variables.plasma_current - * physics_variables.res_plasma - * physics_variables.inductive_current_fraction, + physics_variables.v_plasma_loop_burn, "OP ", ) po.ovarre( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index b1eaa4d7de..be8e3f622d 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -864,6 +864,9 @@ module physics_variables real(dp) :: vs_burn_required !! V-s needed during flat-top (heat + burn times) (Wb) + real(dp) :: v_plasma_loop_burn + !! Plasma loop voltage during flat-top (V) + real(dp) :: vshift !! plasma/device midplane vertical shift - single null @@ -1113,6 +1116,7 @@ subroutine init_physics_variables triang95 = 0.24D0 vol_plasma = 0.0D0 vs_burn_required = 0.0D0 + v_plasma_loop_burn = 0.0D0 vshift = 0.0D0 vs_plasma_ind_ramp = 0.0D0 vs_plasma_res_ramp = 0.0D0 diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 245b79df7c..d2731d0f26 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1751,6 +1751,8 @@ class VoltSecondReqParam(NamedTuple): expected_vs_total_required: Any = None + expected_v_plasma_loop_burn: Any = None + @pytest.mark.parametrize( "voltsecondreqparam", @@ -1773,6 +1775,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_plasma_ind_ramp=258.97124024420435, expected_vs_plasma_res_ramp=55.488435095110333, expected_vs_total_required=356.56885503707593, + expected_v_plasma_loop_burn=0.0416922571264963, ), VoltSecondReqParam( csawth=1, @@ -1792,6 +1795,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_plasma_ind_ramp=258.97124024420435, expected_vs_plasma_res_ramp=55.488435095110333, expected_vs_total_required=314.87659791057968, + expected_v_plasma_loop_burn=0.0416922571264963, ), ), ) @@ -1812,6 +1816,7 @@ def test_vscalc(voltsecondreqparam): vs_plasma_ind_ramp, vs_plasma_res_ramp, vs_total_required, + v_plasma_loop_burn, ) = calculate_volt_second_requirements( csawth=voltsecondreqparam.csawth, eps=voltsecondreqparam.eps, @@ -1848,6 +1853,10 @@ def test_vscalc(voltsecondreqparam): voltsecondreqparam.expected_vs_total_required ) + assert v_plasma_loop_burn == pytest.approx( + voltsecondreqparam.expected_v_plasma_loop_burn + ) + class PhyauxParam(NamedTuple): tauratio: Any = None From d9d2fdb46b50dfc2054da374d4934b36e3d621d0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 10 Feb 2025 16:32:19 +0000 Subject: [PATCH 22/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rpfac'=20to=20'f?= =?UTF-8?q?=5Fres=5Fplasma=5Fneo'=20in=20physics=20variables=20and=20updat?= =?UTF-8?q?e=20related=20calculations=20and=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/physics.py | 10 +++++----- source/fortran/physics_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_physics.py | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/process/physics.py b/process/physics.py index 05092c18f2..3226799d31 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2200,7 +2200,7 @@ def physics(self): ( physics_variables.pden_plasma_ohmic_mw, physics_variables.p_plasma_ohmic_mw, - physics_variables.rpfac, + physics_variables.f_res_plasma_neo, physics_variables.res_plasma, ) = self.plasma_ohmic_heating( physics_variables.inductive_current_fraction, @@ -3121,7 +3121,7 @@ def plasma_ohmic_heating( Tuple[float, float, float, float]: Tuple containing: - pden_plasma_ohmic_mw (float): Ohmic heating power per unit volume (MW/m^3). - p_plasma_ohmic_mw (float): Total ohmic heating power (MW). - - rpfac (float): Neo-classical resistivity enhancement factor. + - f_res_plasma_neo (float): Neo-classical resistivity enhancement factor. - res_plasma (float): Plasma resistance (ohm). Notes: @@ -3145,8 +3145,8 @@ def plasma_ohmic_heating( # Neo-classical resistivity enhancement factor # Taken from ITER Physics Design Guidelines: 1989 # The expression is valid for aspect ratios in the range 2.5 to 4.0 - rpfac = 4.3 - 0.6 * rmajor / rminor - res_plasma = res_plasma * rpfac + f_res_plasma_neo = 4.3 - 0.6 * rmajor / rminor + res_plasma = res_plasma * f_res_plasma_neo # Check to see if plasma resistance is negative # (possible if aspect ratio is too high) @@ -3168,7 +3168,7 @@ def plasma_ohmic_heating( # Total ohmic heating power p_plasma_ohmic_mw = pden_plasma_ohmic_mw * vol_plasma - return pden_plasma_ohmic_mw, p_plasma_ohmic_mw, rpfac, res_plasma + return pden_plasma_ohmic_mw, p_plasma_ohmic_mw, f_res_plasma_neo, res_plasma @staticmethod def calculate_plasma_current( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index be8e3f622d..f0c3b12a49 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -789,7 +789,7 @@ module physics_variables real(dp) :: rnone !! n_oxygen / n_e - real(dp) :: rpfac + real(dp) :: f_res_plasma_neo !! neo-classical correction factor to res_plasma real(dp) :: res_plasma @@ -1092,7 +1092,7 @@ subroutine init_physics_variables rndfuel = 0.0D0 rnfene = 0.0D0 rnone = 0.0D0 - rpfac = 0.0D0 + f_res_plasma_neo = 0.0D0 res_plasma = 0.0D0 res_time = 0.0D0 a_plasma_surface = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 0bb3287f72..23f3c43d45 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4261,7 +4261,7 @@ "rpf1": 0.0, "rpf2": -1.63, "dr_pf_cryostat": 0.5, - "rpfac": 0.0, + "f_res_plasma_neo": 0.0, "res_plasma": 0.0, "rref": [ 7.0, @@ -10569,7 +10569,7 @@ "rpf1": "offset (m) of radial position of `ipfloc=1` PF coils from being directly above\n the central solenoid", "rpf2": "offset (m) of radial position of `ipfloc=2` PF coils from being at\n rmajor (offset = rpf2triangrminor)", "dr_pf_cryostat": "Radial distance between furthest PF coil (or stellarator\n modular coil) and cryostat (m)", - "rpfac": "neo-classical correction factor to res_plasma", + "f_res_plasma_neo": "neo-classical correction factor to res_plasma", "res_plasma": "plasma resistance (ohm)", "rref": "PF coil radial positioning adjuster:\n
    \n
  • for groups j with ipfloc(j) = 1; rref(j) is ignored
    • \n
  • for groups j with ipfloc(j) = 2; rref(j) is ignored
    • \n
  • for groups j with ipfloc(j) = 3; rref(j) is ignored
    • \n
  • for groups j with ipfloc(j) = 4; rref(j) is radius of\n the coil in units of minor radii from the major radius\n (r = rmajor + rref*rminor)
    • \n
", "rrin": "Input IFE repetition rate (Hz) (`ifedrv=3 only`; `itv 156`)", @@ -19237,7 +19237,7 @@ "rndfuel", "rnfene", "rnone", - "rpfac", + "f_res_plasma_neo", "res_plasma", "res_time", "a_plasma_surface", diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index d2731d0f26..bbff6f5f84 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -2034,7 +2034,7 @@ class PohmParam(NamedTuple): expected_p_plasma_ohmic_mw: Any = None - expected_rpfac: Any = None + expected_f_res_plasma_neo: Any = None expected_res_plasma: Any = None @@ -2055,7 +2055,7 @@ class PohmParam(NamedTuple): zeff=2.0909945616489103, expected_pden_plasma_ohmic_mw=0.0004062519138005805, expected_p_plasma_ohmic_mw=0.7670731448937912, - expected_rpfac=2.5, + expected_f_res_plasma_neo=2.5, expected_res_plasma=3.7767895536275952e-09, ), ), @@ -2082,7 +2082,7 @@ def test_pohm(pohmparam, monkeypatch, physics): ( pden_plasma_ohmic_mw, p_plasma_ohmic_mw, - rpfac, + f_res_plasma_neo, res_plasma, ) = physics.plasma_ohmic_heating( inductive_current_fraction=pohmparam.inductive_current_fraction, @@ -2101,7 +2101,7 @@ def test_pohm(pohmparam, monkeypatch, physics): assert p_plasma_ohmic_mw == pytest.approx(pohmparam.expected_p_plasma_ohmic_mw) - assert rpfac == pytest.approx(pohmparam.expected_rpfac) + assert f_res_plasma_neo == pytest.approx(pohmparam.expected_f_res_plasma_neo) assert res_plasma == pytest.approx(pohmparam.expected_res_plasma) From 3c99844c3f85635840971d34c965657fa409ab23 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 10 Feb 2025 17:01:57 +0000 Subject: [PATCH 23/31] :art: Update plasma resistivity calculations and enhance documentation for plasma ohmic heating --- .../plasma_resistive_heating.md | 29 +++++++++++++++++-- process/physics.py | 5 +++- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_current/plasma_resistive_heating.md b/documentation/proc-pages/physics-models/plasma_current/plasma_resistive_heating.md index 751f05ad4c..1a874bace8 100644 --- a/documentation/proc-pages/physics-models/plasma_current/plasma_resistive_heating.md +++ b/documentation/proc-pages/physics-models/plasma_current/plasma_resistive_heating.md @@ -2,24 +2,47 @@ The ohmic component of the plasma heating is given by that from the ITER 1989 Physics Design Guidelines[^1] +------------------- + +## Plasma Ohmic Heating Power | `plasma_ohmic_heating()` + Using the resistive loop voltage for a reference profile of parabolic shape with: $$ \alpha_n \approx 0.5, \alpha_T \approx 1.0, \alpha_J \approx 1.5 $$ +We calculate the plasma resistance as: $$ -\Omega_{\text{plasma}} \approx 2.15 \times 10^{-3} Z_{\text{eff}}\langle \gamma_{\text{NC}} \rangle \frac{R_0}{\kappa a^2} \frac{1}{T_{10}^{1.5}} +\mathtt{res\_plasma} = \Omega_{\text{plasma}} \approx 2.15 \times 10^{-3} Z_{\text{eff}}\langle \gamma_{\text{NC}} \rangle \frac{R_0}{\kappa a^2} \frac{1}{T_{10}^{1.5}} $$ -The neoclassical (avergae) resisitivity enhancement factor $\left(\langle \gamma_{\text{NC}} \rangle \right)$ is given by an empirical fit: +where $Z_{\text{eff}}$ is the plasma effective charge and $T_{10}$ is the density-weighted temperature in units of 10 keV. + +The neoclassical (average) resistivity enhancement factor $\left(\langle \gamma_{\text{NC}} \rangle \right)$ is given by an empirical fit: $$ \langle \gamma_{\text{NC}} \rangle = 4.3 -0.6A $$ -where $A$ is valid in the range of 2.5 - 4.0. +where $A$ is valid in the range of 2.5 - 4.0. If $A < 2.5$ then $\langle \gamma_{\text{NC}}\rangle$ is et equal to 1.0 + +--------------- + +The ohmic heating power in MW is then simply found using Joules law: + +$$ +\mathtt{p\_plasma\_ohmic\_mw} = P_{\text{OH}} = 1\times 10^{-6} \left[f_{\text{ind}}I_{\text{p}}^2\Omega_{\text{plasma}}\right] +$$ + +where $f_{\text{ind}}$ is the fraction of plasma current driven by inductive means. + +Likewise, the ohmic heating per unit volume simply as: + +$$ +\mathtt{pden\_plasma\_ohmic\_mw} = \frac{\mathtt{p\_plasma\_ohmic\_mw}}{V_{\text{p}}} +$$ [^1]: N.A. Uckan and ITER Physics Group, 'ITER Physics Design Guidelines: 1989', \ No newline at end of file diff --git a/process/physics.py b/process/physics.py index 3226799d31..dca189b875 100644 --- a/process/physics.py +++ b/process/physics.py @@ -3145,7 +3145,9 @@ def plasma_ohmic_heating( # Neo-classical resistivity enhancement factor # Taken from ITER Physics Design Guidelines: 1989 # The expression is valid for aspect ratios in the range 2.5 to 4.0 - f_res_plasma_neo = 4.3 - 0.6 * rmajor / rminor + + f_res_plasma_neo = 1.0 if rmajor / rminor < 2.5 else 4.3 - 0.6 * rmajor / rminor + res_plasma = res_plasma * f_res_plasma_neo # Check to see if plasma resistance is negative @@ -3157,6 +3159,7 @@ def plasma_ohmic_heating( # Ohmic heating power per unit volume # Corrected from: pden_plasma_ohmic_mw = (inductive_current_fraction*plasma_current)**2 * ... + pden_plasma_ohmic_mw = ( inductive_current_fraction * plasma_current**2 From 966b9b9ee3252ad35282b407c4673ca7a2367baa Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 08:52:45 +0000 Subject: [PATCH 24/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vs=5Ftotal=5Freq?= =?UTF-8?q?uired'=20to=20'vs=5Fplasma=5Ftotal=5Frequired'=20in=20physics?= =?UTF-8?q?=20variables=20and=20update=20related=20references?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/physics-models/pulsed-plant.md | 8 ++--- .../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 | 14 ++++----- source/fortran/constraint_equations.f90 | 14 ++++----- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 12 ++++---- 20 files changed, 73 insertions(+), 73 deletions(-) diff --git a/documentation/proc-pages/physics-models/pulsed-plant.md b/documentation/proc-pages/physics-models/pulsed-plant.md index f3eea47bd7..c57f751e14 100644 --- a/documentation/proc-pages/physics-models/pulsed-plant.md +++ b/documentation/proc-pages/physics-models/pulsed-plant.md @@ -5,8 +5,8 @@ necessary to operate the plant in a pulsed manner as the current swing in the ce cannot be continued indefinitely. `PROCESS` can perform a number of calculations relevant to a pulsed power plant, as detailed below. -Switch `lpulse` determines whether the power plant is assumed to be based on steady-state -(`lpulse = 0`) or pulsed (`lpulse = 1`) operation. The current ramp calculations apply in both +Switch `i_pulsed_plant` determines whether the power plant is assumed to be based on steady-state +(`i_pulsed_plant = 0`) or pulsed (`i_pulsed_plant = 1`) operation. The current ramp calculations apply in both cases, as even a steady-state reactor has to be started up. ## Start-up power requirements @@ -29,14 +29,14 @@ change equal to the maximum proposed in [^1], or it can be set by the user. The constraint is likely to depend on whether the ramp-up is purely inductive or includes current drive, but this is not taken ito account. -In the steady-state scenario (`lpulse` = 0), the plasma current ramp-up time `t_current_ramp_up` is determined as follows. +In the steady-state scenario (`i_pulsed_plant` = 0), the plasma current ramp-up time `t_current_ramp_up` is determined as follows. - If `tohsin` = 0, the rate of change of plasma current is 0.5 MA/s. The PF coil ramp time `t_precharge` and shutdown time `t_ramp_down` are (arbitrarily) set equal to `t_current_ramp_up`. - If `tohsin` $\neq$ 0, the plasma current ramp-up time `t_current_ramp_up` = `tohsin`, and the PF coil ramp and shutdown times are input parameters. -In the pulsed scenario, (`lpulse` = 1), the plasma current ramp-up time `t_current_ramp_up` is an input, and it +In the pulsed scenario, (`i_pulsed_plant` = 1), the plasma current ramp-up time `t_current_ramp_up` is an input, and it can be set as an iteration variable (65). The ramp-up and shutdown time in the pulsed case are set equal to `t_current_ramp_up`. To ensure that the plasma current ramp rate during start-up is prevented from being too high, as governed by the requirement to maintain plasma stability by ensuring that the induced diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 72b0b63845..2c33b854da 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -505,7 +505,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0262E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7167E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.6973E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.6973E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3365E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0362E+01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 585af5e5b6..fed807ed95 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 3b85ea70e3..0c2a5bfcd6 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index cf17c4c13c..b202734664 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index f156464fa3..ba73d27a84 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index c656a25b5d..7bbcfb6041 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -358,7 +358,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -1353,7 +1353,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -2348,7 +2348,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -3343,7 +3343,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -4338,7 +4338,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -5333,7 +5333,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -6328,7 +6328,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -7323,7 +7323,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -8318,7 +8318,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP diff --git a/process/physics.py b/process/physics.py index dca189b875..f2acd329d4 100644 --- a/process/physics.py +++ b/process/physics.py @@ -103,7 +103,7 @@ def calculate_volt_second_requirements( - vs_burn_required: Volt-seconds needed during flat-top (heat+burn) (Wb) - ind_plasma_total,: Internal and external plasma inductance V-s (Wb) - vs_res_ramp: Resistive losses in start-up volt-seconds (Wb) - - vs_total_required: Total volt-seconds needed (Wb) + - vs_plasma_total_required: Total volt-seconds needed (Wb) :rtype: tuple[float, float, float, float, float, float] :notes: @@ -171,7 +171,7 @@ def calculate_volt_second_requirements( # will be correct on subsequent calls. vs_burn_required = v_burn_resistive * (t_fusion_ramp + t_burn) - vs_total_required = vs_ramp_required + vs_burn_required + vs_plasma_total_required = vs_ramp_required + vs_burn_required return ( vs_plasma_internal, @@ -179,7 +179,7 @@ def calculate_volt_second_requirements( vs_burn_required, vs_self_ind_ramp, vs_res_ramp, - vs_total_required, + vs_plasma_total_required, v_plasma_loop_burn, ) @@ -2344,7 +2344,7 @@ def physics(self): physics_variables.vs_burn_required, physics_variables.vs_plasma_ind_ramp, physics_variables.vs_plasma_res_ramp, - physics_variables.vs_total_required, + physics_variables.vs_plasma_total_required, physics_variables.v_plasma_loop_burn, ) = calculate_volt_second_requirements( physics_variables.csawth, @@ -5449,9 +5449,9 @@ def outplas(self): po.osubhd(self.outfile, "Plasma Volt-second Requirements :") po.ovarre( self.outfile, - "Total volt-seconds required for pulse (Wb)", - "(vs_total_required)", - physics_variables.vs_total_required, + "Total plasma volt-seconds required for pulse (Wb)", + "(vs_plasma_total_required)", + physics_variables.vs_plasma_total_required, "OP ", ) po.ovarre( diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index fc11639963..961c51ea63 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -866,14 +866,14 @@ subroutine constraint_eqn_012(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! residual error in physical units; output string; units string !! Equation for volt-second capability lower limit !! #=# pfcoil - !! #=#=# fvs, vs_total_required + !! #=#=# fvs, vs_plasma_total_required !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. - !! vs_total_required : input real : total V-s needed (Wb) - !! vs_total_required (lower limit) is positive; vstot (available) is negative + !! vs_plasma_total_required : input real : total V-s needed (Wb) + !! vs_plasma_total_required (lower limit) is positive; vstot (available) is negative !! fvs : input real : f-value for flux-swing (V-s) requirement (STEADY STATE) !! vstot : input real : total flux swing for pulse (Wb) - use physics_variables, only: vs_total_required + use physics_variables, only: vs_plasma_total_required use constraint_variables, only: fvs use pfcoil_variables, only: vstot implicit none @@ -883,9 +883,9 @@ subroutine constraint_eqn_012(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 + fvs * vstot/vs_total_required - tmp_con = vs_total_required * (1.0D0 - tmp_cc) - tmp_err = vs_total_required * tmp_cc + tmp_cc = 1.0D0 + fvs * vstot/vs_plasma_total_required + tmp_con = vs_plasma_total_required * (1.0D0 - tmp_cc) + tmp_err = vs_plasma_total_required * tmp_cc tmp_symbol = '>' tmp_units = 'V.sec' diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index f0c3b12a49..62fa4d5dcc 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -876,7 +876,7 @@ module physics_variables real(dp) :: vs_plasma_res_ramp !! Plasma resistive flux consumption for plasma current ramp-up (Vs)(Wb) - real(dp) :: vs_total_required + real(dp) :: vs_plasma_total_required !! total V-s needed (Wb) real(dp) :: wallmw @@ -1120,7 +1120,7 @@ subroutine init_physics_variables vshift = 0.0D0 vs_plasma_ind_ramp = 0.0D0 vs_plasma_res_ramp = 0.0D0 - vs_total_required = 0.0D0 + vs_plasma_total_required = 0.0D0 wallmw = 0.0D0 wtgpd = 0.0D0 a_plasma_poloidal = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index e82539919e..e84a55a808 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -500,7 +500,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 30b29dd799..23c47fe228 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index d80b32d89a..5bcb423b77 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 8dac19929f..d2d9ea9b28 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -501,7 +501,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9603E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7266E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.5616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index acb35b74b3..9138ca455b 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -498,7 +498,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9482E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7112E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5011E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.5011E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9825E+01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index dc3b844d1a..d0f0a4a19a 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -503,7 +503,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9629E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.8476E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8020E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.8020E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3405E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9971E+01 OP @@ -1666,7 +1666,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0016E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7709E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8701E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.8701E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3345E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0164E+01 OP @@ -2829,7 +2829,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0417E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6995E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9230E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9230E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3268E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0314E+01 OP @@ -3992,7 +3992,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0515E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6373E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9186E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9186E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3194E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0093E+01 OP @@ -5155,7 +5155,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0113E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7056E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8754E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.8754E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3316E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0076E+01 OP @@ -6318,7 +6318,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9729E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7718E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8065E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.8065E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3384E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9907E+01 OP @@ -7481,7 +7481,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9822E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7090E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8016E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.8016E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3314E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9701E+01 OP @@ -8644,7 +8644,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0212E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6394E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8608E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.8608E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3207E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9753E+01 OP @@ -9807,7 +9807,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0617E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5690E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9150E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9150E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3051E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9666E+01 OP @@ -10970,7 +10970,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0713E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5115E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9148E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9148E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3029E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9602E+01 OP @@ -12133,7 +12133,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0306E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5818E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8616E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.8616E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3208E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9757E+01 OP @@ -13296,7 +13296,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9915E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.6496E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8033E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.8033E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3319E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9717E+01 OP @@ -14459,7 +14459,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0007E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5910E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8020E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.8020E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3288E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9626E+01 OP @@ -15622,7 +15622,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0398E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.5257E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.8639E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.8639E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3227E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9812E+01 OP @@ -16785,7 +16785,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 2.0806E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.4604E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9259E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9259E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3165E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0007E+01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 7c6428790c..ff44039fd2 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -358,7 +358,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -1353,7 +1353,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -2348,7 +2348,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -3343,7 +3343,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -4338,7 +4338,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -5333,7 +5333,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -6328,7 +6328,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -7323,7 +7323,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP @@ -8318,7 +8318,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.7778E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7276E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6812E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.9243E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.9243E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 23f3c43d45..9025ac45ea 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8005,7 +8005,7 @@ "vsohbn": 0.0, "vsohsu": 0.0, "vs_plasma_res_ramp": 0.0, - "vs_total_required": 0.0, + "vs_plasma_total_required": 0.0, "vssu": 0.0, "vstot": 0.0, "vte1_": 18755328.0, @@ -11115,7 +11115,7 @@ "vsohbn": "central solenoid flux swing for burn (Wb)", "vsohsu": "central solenoid flux swing for startup (Wb)", "vs_plasma_res_ramp": "resistive losses in startup V-s (Wb)", - "vs_total_required": "total V-s needed (Wb)", + "vs_plasma_total_required": "total V-s needed (Wb)", "vssu": "total flux swing for startup (`constraint eqn 51` to enforce vssu=vs_plasma_res_ramp+vs_plasma_ind_ramp) (Wb)", "vstot": "total flux swing for pulse (Wb)", "vte1_": "", @@ -19263,7 +19263,7 @@ "vshift", "vs_plasma_ind_ramp", "vs_plasma_res_ramp", - "vs_total_required", + "vs_plasma_total_required", "wallmw", "wtgpd", "a_plasma_poloidal", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 1b0f02f83c..9d70317e3d 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -498,7 +498,7 @@ Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________ 1.9482E-03 OP Normalized_collisionality_______________________________________________ (nu_star)_____________________ 3.7112E-03 OP Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________ 1.6815E+00 OP - Total_volt-second_requirement_(Wb)______________________________________ (vs_total_required)_______________________ 5.5011E+02 OP + Total_volt-second_requirement_(Wb)______________________________________ (vs_plasma_total_required)_______________________ 5.5011E+02 OP Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9825E+01 OP diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index bbff6f5f84..0cf379ed25 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1749,7 +1749,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_plasma_res_ramp: Any = None - expected_vs_total_required: Any = None + expected_vs_plasma_total_required: Any = None expected_v_plasma_loop_burn: Any = None @@ -1774,7 +1774,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_burn_required=42.109179697761263, expected_vs_plasma_ind_ramp=258.97124024420435, expected_vs_plasma_res_ramp=55.488435095110333, - expected_vs_total_required=356.56885503707593, + expected_vs_plasma_total_required=356.56885503707593, expected_v_plasma_loop_burn=0.0416922571264963, ), VoltSecondReqParam( @@ -1794,7 +1794,7 @@ class VoltSecondReqParam(NamedTuple): expected_vs_burn_required=0.41692257126496302, expected_vs_plasma_ind_ramp=258.97124024420435, expected_vs_plasma_res_ramp=55.488435095110333, - expected_vs_total_required=314.87659791057968, + expected_vs_plasma_total_required=314.87659791057968, expected_v_plasma_loop_burn=0.0416922571264963, ), ), @@ -1815,7 +1815,7 @@ def test_vscalc(voltsecondreqparam): vs_burn_required, vs_plasma_ind_ramp, vs_plasma_res_ramp, - vs_total_required, + vs_plasma_total_required, v_plasma_loop_burn, ) = calculate_volt_second_requirements( csawth=voltsecondreqparam.csawth, @@ -1849,8 +1849,8 @@ def test_vscalc(voltsecondreqparam): voltsecondreqparam.expected_vs_plasma_res_ramp ) - assert vs_total_required == pytest.approx( - voltsecondreqparam.expected_vs_total_required + assert vs_plasma_total_required == pytest.approx( + voltsecondreqparam.expected_vs_plasma_total_required ) assert v_plasma_loop_burn == pytest.approx( From 3810b5ce466d5fc4f14b4d99631754b201545f61 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 08:54:26 +0000 Subject: [PATCH 25/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vs=5Fburn=5Frequ?= =?UTF-8?q?ired'=20to=20'vs=5Fplasma=5Fburn=5Frequired'=20in=20physics=20v?= =?UTF-8?q?ariables=20and=20update=20related=20references?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/physics.py | 14 ++++----- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_physics.py | 12 ++++---- 18 files changed, 62 insertions(+), 62 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 2c33b854da..b4035f9441 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -509,7 +509,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3365E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0362E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.8572E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.8572E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6783E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1436E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index fed807ed95..658229ad74 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 0c2a5bfcd6..37e0c67915 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index b202734664..7a432ada9a 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index ba73d27a84..06085ba447 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 7bbcfb6041..46f29c9b00 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -362,7 +362,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -1357,7 +1357,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -2352,7 +2352,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -3347,7 +3347,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -4342,7 +4342,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -5337,7 +5337,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -6332,7 +6332,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -7327,7 +7327,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -8322,7 +8322,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 diff --git a/process/physics.py b/process/physics.py index f2acd329d4..2ad9a019c1 100644 --- a/process/physics.py +++ b/process/physics.py @@ -100,7 +100,7 @@ def calculate_volt_second_requirements( :return: A tuple containing: - vs_plasma_internal: Internal plasma volt-seconds (Wb) - ind_plasma_internal: Plasma inductance (H) - - vs_burn_required: Volt-seconds needed during flat-top (heat+burn) (Wb) + - vs_plasma_burn_required: Volt-seconds needed during flat-top (heat+burn) (Wb) - ind_plasma_total,: Internal and external plasma inductance V-s (Wb) - vs_res_ramp: Resistive losses in start-up volt-seconds (Wb) - vs_plasma_total_required: Total volt-seconds needed (Wb) @@ -170,13 +170,13 @@ def calculate_volt_second_requirements( # if the pulsed reactor option is used, but the value # will be correct on subsequent calls. - vs_burn_required = v_burn_resistive * (t_fusion_ramp + t_burn) - vs_plasma_total_required = vs_ramp_required + vs_burn_required + vs_plasma_burn_required = v_burn_resistive * (t_fusion_ramp + t_burn) + vs_plasma_total_required = vs_ramp_required + vs_plasma_burn_required return ( vs_plasma_internal, ind_plasma_total, - vs_burn_required, + vs_plasma_burn_required, vs_self_ind_ramp, vs_res_ramp, vs_plasma_total_required, @@ -2341,7 +2341,7 @@ def physics(self): ( physics_variables.vs_plasma_internal, physics_variables.ind_plasma, - physics_variables.vs_burn_required, + physics_variables.vs_plasma_burn_required, physics_variables.vs_plasma_ind_ramp, physics_variables.vs_plasma_res_ramp, physics_variables.vs_plasma_total_required, @@ -5483,8 +5483,8 @@ def outplas(self): po.ovarre( self.outfile, "V-s needed during flat-top (heat + burn times) (Wb)", - "(vs_burn_required)", - physics_variables.vs_burn_required, + "(vs_plasma_burn_required)", + physics_variables.vs_plasma_burn_required, "OP ", ) diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 62fa4d5dcc..68dc40ed63 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -861,7 +861,7 @@ module physics_variables real(dp) :: vol_plasma !! plasma volume (m3) - real(dp) :: vs_burn_required + real(dp) :: vs_plasma_burn_required !! V-s needed during flat-top (heat + burn times) (Wb) real(dp) :: v_plasma_loop_burn @@ -1115,7 +1115,7 @@ subroutine init_physics_variables triang = 0.36D0 triang95 = 0.24D0 vol_plasma = 0.0D0 - vs_burn_required = 0.0D0 + vs_plasma_burn_required = 0.0D0 v_plasma_loop_burn = 0.0D0 vshift = 0.0D0 vs_plasma_ind_ramp = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index e84a55a808..30f0c98366 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -504,7 +504,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 23c47fe228..f31c2ed1c6 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 5bcb423b77..fde95fa8bf 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d2d9ea9b28..2e7c717ecb 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -505,7 +505,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3585E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.7015E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 9138ca455b..4d84c90425 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -502,7 +502,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9825E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.6495E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.6495E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7455E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2290E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index d0f0a4a19a..388232848a 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -507,7 +507,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3405E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9971E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9617E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.9617E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6314E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1061E-01 @@ -1670,7 +1670,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3345E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0164E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0339E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0339E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6578E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1146E-01 @@ -2833,7 +2833,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3268E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0314E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0930E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0930E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6841E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1238E-01 @@ -3996,7 +3996,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3194E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0093E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0982E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0982E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7394E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1715E-01 @@ -5159,7 +5159,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3316E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0076E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0431E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0431E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7060E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1531E-01 @@ -6322,7 +6322,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3384E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9907E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9691E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.9691E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.6836E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1452E-01 @@ -7485,7 +7485,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3314E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9701E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9733E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.9733E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7375E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1915E-01 @@ -8648,7 +8648,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3207E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9753E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0426E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0426E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7705E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2074E-01 @@ -9811,7 +9811,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3051E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9666E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1132E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.1132E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8133E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2337E-01 @@ -10974,7 +10974,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3029E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9602E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1158E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.1158E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8590E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2713E-01 @@ -12137,7 +12137,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3208E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9757E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0432E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0432E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8106E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2391E-01 @@ -13300,7 +13300,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3319E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9717E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9742E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.9742E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7771E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2221E-01 @@ -14463,7 +14463,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3288E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9626E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.9769E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.9769E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8238E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2611E-01 @@ -15626,7 +15626,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3227E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9812E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.0431E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0431E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8476E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2685E-01 @@ -16789,7 +16789,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3165E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0007E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 3.1093E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.1093E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.8714E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2763E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index ff44039fd2..afcdbc8a7b 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -362,7 +362,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -1357,7 +1357,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -2352,7 +2352,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -3347,7 +3347,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -4342,7 +4342,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -5337,7 +5337,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -6332,7 +6332,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -7327,7 +7327,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 @@ -8322,7 +8322,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.9934E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.3054E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9025ac45ea..452e5fb5fe 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7994,7 +7994,7 @@ "vporttmax": 0.0, "vpumpn": 0.0, "vsbn": 0.0, - "vs_burn_required": 0.0, + "vs_plasma_burn_required": 0.0, "vsdum": 0.0, "vsefbn": 0.0, "vsefsu": 0.0, @@ -11104,7 +11104,7 @@ "vporttmax": "maximum available toroidal extent for vertical ports (m)", "vpumpn": "number of high vacuum pumps", "vsbn": "total flux swing available for burn (Wb)", - "vs_burn_required": "V-s needed during flat-top (heat + burn times) (Wb)", + "vs_plasma_burn_required": "V-s needed during flat-top (heat + burn times) (Wb)", "vsdum": "", "vsefbn": "flux swing from PF coils for burn (Wb)", "vsefsu": "flux swing from PF coils for startup (Wb)", @@ -19259,7 +19259,7 @@ "triang", "triang95", "vol_plasma", - "vs_burn_required", + "vs_plasma_burn_required", "vshift", "vs_plasma_ind_ramp", "vs_plasma_res_ramp", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 9d70317e3d..fc3560f3d1 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -502,7 +502,7 @@ Inductive_volt-seconds_(Wb)_____________________________________________ (vs_plasma_ind_ramp)_______________________ 2.3534E+02 OP Ejima_coefficient_______________________________________________________ (ejima_coeff)_______________________ 3.0000E-01 Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9825E+01 OP - Flat-top_resistive_(Wb)_________________________________________________ (vs_burn_required)_______________________ 2.6495E+02 OP + Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.6495E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (bscf_iter89)_________________ 3.7455E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2290E-01 diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 0cf379ed25..b2fe2391ec 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1743,7 +1743,7 @@ class VoltSecondReqParam(NamedTuple): expected_ind_plasma: Any = None - expected_vs_burn_required: Any = None + expected_vs_plasma_burn_required: Any = None expected_vs_plasma_ind_ramp: Any = None @@ -1771,7 +1771,7 @@ class VoltSecondReqParam(NamedTuple): t_fusion_ramp=10, expected_vs_plasma_internal=111.57651734747576, expected_ind_plasma=1.4075705307248088e-05, - expected_vs_burn_required=42.109179697761263, + expected_vs_plasma_burn_required=42.109179697761263, expected_vs_plasma_ind_ramp=258.97124024420435, expected_vs_plasma_res_ramp=55.488435095110333, expected_vs_plasma_total_required=356.56885503707593, @@ -1791,7 +1791,7 @@ class VoltSecondReqParam(NamedTuple): t_fusion_ramp=10, expected_vs_plasma_internal=111.57651734747576, expected_ind_plasma=1.4075705307248088e-05, - expected_vs_burn_required=0.41692257126496302, + expected_vs_plasma_burn_required=0.41692257126496302, expected_vs_plasma_ind_ramp=258.97124024420435, expected_vs_plasma_res_ramp=55.488435095110333, expected_vs_plasma_total_required=314.87659791057968, @@ -1812,7 +1812,7 @@ def test_vscalc(voltsecondreqparam): ( vs_plasma_internal, ind_plasma, - vs_burn_required, + vs_plasma_burn_required, vs_plasma_ind_ramp, vs_plasma_res_ramp, vs_plasma_total_required, @@ -1837,8 +1837,8 @@ def test_vscalc(voltsecondreqparam): assert ind_plasma == pytest.approx(voltsecondreqparam.expected_ind_plasma) - assert vs_burn_required == pytest.approx( - voltsecondreqparam.expected_vs_burn_required + assert vs_plasma_burn_required == pytest.approx( + voltsecondreqparam.expected_vs_plasma_burn_required ) assert vs_plasma_ind_ramp == pytest.approx( From 987c63ac3e726b5d44fb8c6e8b687d2f8c2c5881 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 09:41:43 +0000 Subject: [PATCH 26/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'res=5Ftime'=20to?= =?UTF-8?q?=20't=5Fplasma=5Fres=5Fdiffusion'=20in=20physics=20variables=20?= =?UTF-8?q?and=20update=20related=20references?= 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/costs_2015.py | 6 +++- process/physics.py | 6 ++-- source/fortran/physics_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_costs_2015.py | 10 ++++--- tests/unit/test_physics.py | 4 +-- 20 files changed, 65 insertions(+), 59 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index b4035f9441..e7d5f9206e 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -523,7 +523,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9627E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0562E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0010E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0010E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.3992E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 658229ad74..bbafaeba05 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -519,7 +519,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 37e0c67915..c413964ae2 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -519,7 +519,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 7a432ada9a..074e5a016f 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -519,7 +519,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 06085ba447..909d11d44a 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -519,7 +519,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 46f29c9b00..807b14ca8c 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -376,7 +376,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -1371,7 +1371,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -2366,7 +2366,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -3361,7 +3361,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -4356,7 +4356,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -5351,7 +5351,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -6346,7 +6346,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -7341,7 +7341,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -8336,7 +8336,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/process/costs_2015.py b/process/costs_2015.py index 09fdc5ea7d..abfeb852cc 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -1094,7 +1094,11 @@ def calc_remaining_subsystems(self): # Scale with total magnetic energy in the poloidal field / resistive diffusion time (W) # For ITER value see # K:\Power Plant Physics and Technology\PROCESS\PROCESS documentation papers\resistive diffusion time.xmcd or pdf - self.s_k[51] = pf_power_variables.ensxpfm * 1.0e6 / physics_variables.res_time + self.s_k[51] = ( + pf_power_variables.ensxpfm + * 1.0e6 + / physics_variables.t_plasma_res_diffusion + ) self.s_kref[51] = 8.0e9 / 953.0e0 self.s_cost[51] = ( self.s_cost_factor[51] diff --git a/process/physics.py b/process/physics.py index 2ad9a019c1..8d3f25b7c7 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2261,7 +2261,7 @@ def physics(self): ) # Resistive diffusion time = current penetration time ~ mu0.a^2/resistivity - physics_variables.res_time = res_diff_time( + physics_variables.t_plasma_res_diffusion = res_diff_time( physics_variables.rmajor, physics_variables.res_plasma, physics_variables.kappa95, @@ -5506,8 +5506,8 @@ def outplas(self): po.ovarre( self.outfile, "Resistive diffusion time (s)", - "(res_time)", - physics_variables.res_time, + "(t_plasma_res_diffusion)", + physics_variables.t_plasma_res_diffusion, "OP ", ) po.ovarre( diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 68dc40ed63..4f77656a23 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -795,7 +795,7 @@ module physics_variables real(dp) :: res_plasma !! plasma resistance (ohm) - real(dp) :: res_time + real(dp) :: t_plasma_res_diffusion !! plasma current resistive diffusion time (s) real(dp) :: a_plasma_surface @@ -1094,7 +1094,7 @@ subroutine init_physics_variables rnone = 0.0D0 f_res_plasma_neo = 0.0D0 res_plasma = 0.0D0 - res_time = 0.0D0 + t_plasma_res_diffusion = 0.0D0 a_plasma_surface = 0.0D0 a_plasma_surface_outboard = 0.0D0 i_single_null = 1 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 30f0c98366..f644e84dd3 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -518,7 +518,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index f31c2ed1c6..cce535e877 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -519,7 +519,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index fde95fa8bf..a0f10311d2 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -519,7 +519,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 2e7c717ecb..a14239c81e 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -519,7 +519,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.7450E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9755E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0619E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4181E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 4d84c90425..babc8d2d57 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -516,7 +516,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.6762E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9470E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0839E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0839E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4245E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 388232848a..66cb81bad3 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -521,7 +521,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.1078E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0689E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9916E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9916E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4126E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -1684,7 +1684,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0431E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0820E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9820E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9820E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4036E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -2847,7 +2847,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0227E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.1144E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9585E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9585E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.3947E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -4010,7 +4010,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9960E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0884E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9773E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9773E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.3964E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -5173,7 +5173,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9998E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0680E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9923E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9923E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4042E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -6336,7 +6336,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9635E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0504E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0053E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0053E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4131E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -7499,7 +7499,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9388E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0293E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0210E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0210E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4147E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -8662,7 +8662,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9711E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0529E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0034E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0034E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4067E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -9825,7 +9825,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0073E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0706E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 2.9903E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9903E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.3998E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -10988,7 +10988,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9907E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0501E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0054E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0054E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4003E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -12151,7 +12151,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9599E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0408E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0124E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0124E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4067E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -13314,7 +13314,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9340E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0207E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0274E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0274E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4146E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -14477,7 +14477,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9155E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9990E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0439E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0439E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4153E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -15640,7 +15640,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.9658E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0183E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0292E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0292E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4063E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -16803,7 +16803,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 4.0161E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 4.0375E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0148E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0148E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.3971E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index afcdbc8a7b..b0d91292fd 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -376,7 +376,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -1371,7 +1371,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -2366,7 +2366,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -3361,7 +3361,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -4356,7 +4356,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -5351,7 +5351,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -6346,7 +6346,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -7341,7 +7341,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 @@ -8336,7 +8336,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.1974E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 2.8865E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 4.8432E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.6558E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 452e5fb5fe..e784f4221a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3966,7 +3966,7 @@ "report_changes": 0.0, "reprat": 0.0, "required_radial_space": 0.0, - "res_time": 0.0, + "t_plasma_res_diffusion": 0.0, "resdl": [ 0.0, 0.0, @@ -10515,7 +10515,7 @@ "report_changes": "", "reprat": "IFE driver repetition rate (Hz)", "required_radial_space": "Required space between coil and plasma for blanket shield wall etc (m)", - "res_time": "plasma current resistive diffusion time (s)", + "t_plasma_res_diffusion": "plasma current resistive diffusion time (s)", "resdl": "", "residual_sig_hoop": "residual hoop stress in strucutal material (Pa)", "rfxf": "", @@ -19239,7 +19239,7 @@ "rnone", "f_res_plasma_neo", "res_plasma", - "res_time", + "t_plasma_res_diffusion", "a_plasma_surface", "a_plasma_surface_outboard", "i_single_null", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index fc3560f3d1..efa8efef43 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -516,7 +516,7 @@ Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 Loop_voltage_during_burn_(V)____________________________________________ (v_plasma_loop_burn)_______________________ 3.6762E-02 OP Plasma_resistance_(ohm)_________________________________________________ (res_plasma)_______________________ 3.9470E-09 OP - Resistive_diffusion_time_(s)____________________________________________ (res_time)____________________ 3.0839E+03 OP + Resistive_diffusion_time_(s)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0839E+03 OP Plasma_inductance_(H)___________________________________________________ (ind_plasma)_________________________ 1.4245E-05 OP Coefficient_for_sawtooth_effects_on_burn_V-s_requirement________________ (csawth)______________________ 1.0000E+00 Ratio_of_He_and_pellet_particle_confinement_times_______________________ (tauratio)____________________ 1.0000E+00 diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index f0e1849c36..695d9f0fd0 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -13735,7 +13735,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): fusion_power: Any = None - res_time: Any = None + t_plasma_res_diffusion: Any = None itr_sum: Any = None @@ -13785,7 +13785,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): pinjmw=43.745615131519273, pdivt=94.203763268233445, fusion_power=1726.9363495105574, - res_time=2562.1529343276788, + t_plasma_res_diffusion=2562.1529343276788, itr_sum=687546826.85995734, ensxpfm=34911.529178721656, pthermmw=2112.8165753998965, @@ -14881,7 +14881,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): pinjmw=43.745615131519266, pdivt=94.062415557688894, fusion_power=1726.1944723154274, - res_time=2562.1529343276788, + t_plasma_res_diffusion=2562.1529343276788, itr_sum=1176301401.3409874, ensxpfm=34908.848681194133, pthermmw=2111.8102173541502, @@ -16001,7 +16001,9 @@ def test_calc_remaining_subsystems( ) monkeypatch.setattr( - physics_variables, "res_time", calcremainingsubsystemsparam.res_time + physics_variables, + "t_plasma_res_diffusion", + calcremainingsubsystemsparam.t_plasma_res_diffusion, ) monkeypatch.setattr( diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index b2fe2391ec..b731bf0778 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -49,8 +49,8 @@ def test_calculate_poloidal_beta(): def test_res_diff_time(): """Test res_diff_time()""" - res_time = res_diff_time(9.137, 2.909e-9, 1.65) - assert res_time == pytest.approx(4784.3, abs=0.1) + t_plasma_res_diffusion = res_diff_time(9.137, 2.909e-9, 1.65) + assert t_plasma_res_diffusion == pytest.approx(4784.3, abs=0.1) def test_diamagnetic_fraction_hender(): From 5df0454d3e56e034e885cdae58beff3f7b9d1b7a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 10:29:02 +0000 Subject: [PATCH 27/31] Update obsolete variables list --- process/io/obsolete_vars.py | 3 +++ process/physics.py | 5 +++-- tests/unit/test_physics.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index ff05d30fdc..5fe700960e 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -198,6 +198,9 @@ "rhotfbus": "rho_tf_bus", "flhthresh": "fl_h_threshold", "ilhthresh": "i_l_h_threshold", + "rli": "ind_plasma_internal_norm", + "gamma": "ejima_coeff", + "lpulse": "i_pulsed_plant", } OBS_VARS_HELP = { diff --git a/process/physics.py b/process/physics.py index 8d3f25b7c7..5c05b27107 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2355,6 +2355,7 @@ def physics(self): physics_variables.rmajor, physics_variables.res_plasma, physics_variables.plasma_current, + times_variables.t_fusion_ramp, times_variables.t_burn, physics_variables.ind_plasma_internal_norm, ) @@ -5482,7 +5483,7 @@ def outplas(self): ) po.ovarre( self.outfile, - "V-s needed during flat-top (heat + burn times) (Wb)", + "Plasma volt-seconds needed for flat-top (heat + burn times) (Wb)", "(vs_plasma_burn_required)", physics_variables.vs_plasma_burn_required, "OP ", @@ -5505,7 +5506,7 @@ def outplas(self): po.ovarre( self.outfile, - "Resistive diffusion time (s)", + "Plasma resistive diffusion time (s)", "(t_plasma_res_diffusion)", physics_variables.t_plasma_res_diffusion, "OP ", diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index b731bf0778..6fe1eac9a9 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1828,7 +1828,7 @@ def test_vscalc(voltsecondreqparam): rmajor=voltsecondreqparam.rmajor, res_plasma=voltsecondreqparam.res_plasma, t_burn=voltsecondreqparam.t_burn, - t_fusion_ramp=voltsecondreqparam.t_fusion_ramp, + t_fusion_ramp=voltsecondreqparam.t_fusion_ramp, ) assert vs_plasma_internal == pytest.approx( From eba3928410abb10d0b9b31f24d0393a7955de50e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 11:19:16 +0000 Subject: [PATCH 28/31] :bug: Fix typo in inductive plasma current documentation --- .../physics-models/plasma_current/inductive_plasma_current.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md b/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md index 259572b6cc..90f00358ee 100644 --- a/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md +++ b/documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md @@ -124,7 +124,7 @@ $$ ### Steady current burn phase -At plasma current flat-top there is no self inductance contribution as the plasma current is expected to be at a constants value. However there is still a resistive contribution. +At plasma current flat-top there is no self inductance contribution as the plasma current is expected to be at a constant value. However there is still a resistive contribution. From f7f0278645ca6fb853d5be0315c3b58e3fe20337 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 11:26:44 +0000 Subject: [PATCH 29/31] =?UTF-8?q?=F0=9F=94=84=20Rename=20'gamma'=20to=20'e?= =?UTF-8?q?jima=5Fcoeff'=20in=20input=20data=20files=20for=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/integration/data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/regression/input_files/large_tokamak_once_through.IN.DAT | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 6045dfc7d1..08db363549 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -322,7 +322,7 @@ beta_norm_max = 3.0 * Troyon-like coefficient for beta scaling calculated fgwsep = 0.5 * fraction of Greenwald density to set as separatrix density; If `<0`; separatrix fkzohm = 1.02 * Zohm elongation scaling adjustment factor (`i_plasma_geometry=2; 3`) fvsbrnni = 0.4242184436680697 * fraction of the plasma current produced by non-inductive means (`iteration variable 44`) -gamma = 0.3 * Ejima coefficient for resistive startup V-s formula +ejima_coeff = 0.3 * Ejima coefficient for resistive startup V-s formula hfact = 1.185971818905028 * H factor on energy confinement times; radiation corrected (`iteration variable 10`); i_bootstrap_current = 4 * switch for bootstrap current scaling i_beta_component = 1 * switch for beta limit scaling (`constraint equation 24`) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 65b94958ac..be9d71dda6 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -257,7 +257,7 @@ dene = 7.983e+19 * Electron density (/m3) (iteration variable 6) beta_norm_max = 3.0 * (troyon-like) coefficient for beta scaling; fkzohm = 1.0245 * Zohm elongation scaling adjustment factor (i_plasma_geometry=2; 3) fvsbrnni = 0.4434 * Fraction of the plasma current produced by -gamma = 0.3 * Ejima coefficient for resistive startup v-s formula +ejima_coeff = 0.3 * Ejima coefficient for resistive startup v-s formula hfact = 1.1 * H factor on energy confinement times (iteration variable 10) i_bootstrap_current = 4 * Switch for bootstrap current scaling; i_beta_component = 1 * Switch for beta limit scaling (constraint equation 24); 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 dcf4b81bc6..80c62f63c2 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -322,7 +322,7 @@ beta_norm_max = 3.0 * Troyon-like coefficient for beta scaling calculated fgwsep = 0.5 * fraction of Greenwald density to set as separatrix density; If `<0`; separatrix fkzohm = 1.02 * Zohm elongation scaling adjustment factor (`i_plasma_geometry=2; 3`) fvsbrnni = 0.4242184436680697 * fraction of the plasma current produced by non-inductive means (`iteration variable 44`) -gamma = 0.3 * Ejima coefficient for resistive startup V-s formula +ejima_coeff = 0.3 * Ejima coefficient for resistive startup V-s formula hfact = 1.185971818905028 * H factor on energy confinement times; radiation corrected (`iteration variable 10`); i_bootstrap_current = 4 * switch for bootstrap current scaling i_beta_component = 1 * switch for beta limit scaling (`constraint equation 24`) From f10d3d55638197bfac2c0f002413afd4121c9cef Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 11:31:25 +0000 Subject: [PATCH 30/31] =?UTF-8?q?=F0=9F=94=84=20Update=20f=5Fres=5Fplasma?= =?UTF-8?q?=5Fneo=20calculation=20to=20include=20valid=20aspect=20ratio=20?= =?UTF-8?q?range?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/physics.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/process/physics.py b/process/physics.py index 5c05b27107..9e6c6643ae 100644 --- a/process/physics.py +++ b/process/physics.py @@ -3147,7 +3147,9 @@ def plasma_ohmic_heating( # Taken from ITER Physics Design Guidelines: 1989 # The expression is valid for aspect ratios in the range 2.5 to 4.0 - f_res_plasma_neo = 1.0 if rmajor / rminor < 2.5 else 4.3 - 0.6 * rmajor / rminor + f_res_plasma_neo = ( + 1.0 if 2.5 >= rmajor / rminor <= 4.0 else 4.3 - 0.6 * rmajor / rminor + ) res_plasma = res_plasma * f_res_plasma_neo From d9ab030d90f272092ddfb2a7387b7df221ef8360 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:00:21 +0000 Subject: [PATCH 31/31] =?UTF-8?q?=F0=9F=94=84=20Update=20documentation=20t?= =?UTF-8?q?o=20replace=20'rli'=20with=20'ind=5Fplasma=5Finternal=5Fnorm'?= =?UTF-8?q?=20for=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../physics-models/plasma_beta/plasma_beta.md | 16 ++++++++-------- .../plasma_current/plasma_current.md | 4 ++-- .../proc-pages/physics-models/plasma_geometry.md | 2 +- .../spherical_tokamak_once_through.IN.DAT | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_beta/plasma_beta.md b/documentation/proc-pages/physics-models/plasma_beta/plasma_beta.md index 4a4344890d..5077e0e217 100644 --- a/documentation/proc-pages/physics-models/plasma_beta/plasma_beta.md +++ b/documentation/proc-pages/physics-models/plasma_beta/plasma_beta.md @@ -123,7 +123,7 @@ be calculated. The following switch options are available below: This can be activated by stating `iprofile = 0` in the input file. -`alphaj`, `rli` and `beta_norm_max` are inputs. +`alphaj`, `ind_plasma_internal_norm` and `beta_norm_max` are inputs. --------- @@ -131,7 +131,7 @@ This can be activated by stating `iprofile = 0` in the input file. This can be activated by stating `iprofile = 1` in the input file. -`alphaj`, `rli` and `beta_norm_max` are calculated consistently. +`alphaj`, `ind_plasma_internal_norm` and `beta_norm_max` are calculated consistently. `beta_norm_max` is calculated using: @@ -149,7 +149,7 @@ This is only recommended for high aspect ratio tokamaks[^3]. This can be activated by stating `iprofile = 2` in the input file. -`alphaj` and `rli` are inputs. `beta_norm_max` calculated using: +`alphaj` and `ind_plasma_internal_norm` are inputs. `beta_norm_max` calculated using: $$ g=2.7(1+5\epsilon^{3.5}) @@ -224,7 +224,7 @@ $$ This can be activated by stating `iprofile = 3` in the input file. -`alphaj` and `rli` are inputs. `beta_norm_max` calculated using[^4]: +`alphaj` and `ind_plasma_internal_norm` are inputs. `beta_norm_max` calculated using[^4]: $$ g=3.12+3.5\epsilon^{1.7} @@ -299,7 +299,7 @@ $$ This can be activated by stating `iprofile = 4` in the input file. -`alphaj` and `beta_norm_max` are inputs. `rli` calculated from elongation [^4]. This is only recommended for spherical tokamaks. +`alphaj` and `beta_norm_max` are inputs. `ind_plasma_internal_norm` calculated from elongation [^4]. This is only recommended for spherical tokamaks. --------- @@ -307,7 +307,7 @@ This can be activated by stating `iprofile = 4` in the input file. This can be activated by stating `iprofile = 5` in the input file. -`alphaj` is an input. `rli` calculated from elongation and `beta_norm_max` calculated using $g=3.12+3.5\epsilon^{1.7}$ [^4]. This is only recommended for spherical tokamaks. +`alphaj` is an input. `ind_plasma_internal_norm` calculated from elongation and `beta_norm_max` calculated using $g=3.12+3.5\epsilon^{1.7}$ [^4]. This is only recommended for spherical tokamaks. --------- @@ -315,7 +315,7 @@ This can be activated by stating `iprofile = 5` in the input file. This can be activated by stating `iprofile = 6` in the input file. -`alphaj` and `c_beta` are inputs. `rli` calculated from elongation and `beta_norm_max` calculated using +`alphaj` and `c_beta` are inputs. `ind_plasma_internal_norm` calculated from elongation and `beta_norm_max` calculated using $$ C_{\beta}\approx\frac{(g-3.7)F_p}{12.5-3.5 F_p} @@ -327,7 +327,7 @@ where $F_p$ is the pressure peaking, $F_p = p_{\text{ax}} / \langle p \rangle$ a --------- -Further details on the calculation of `alphaj` and `rli` is given in [Plasma Current](./plasma_current.md). +Further details on the calculation of `alphaj` and `ind_plasma_internal_norm` is given in [Plasma Current](./plasma_current.md). ---------------------- diff --git a/documentation/proc-pages/physics-models/plasma_current/plasma_current.md b/documentation/proc-pages/physics-models/plasma_current/plasma_current.md index 3172f5cf01..feccb438b7 100644 --- a/documentation/proc-pages/physics-models/plasma_current/plasma_current.md +++ b/documentation/proc-pages/physics-models/plasma_current/plasma_current.md @@ -92,7 +92,7 @@ Instead of $q_a$, $q_{95}$ is used as in plasma configurations with divertors th ## Plasma Current Calculation | `calculate_plasma_current()` -This function calculates the plasma current shaping factor ($f_q$), plasma current ($I_{\text{p}}$), qstar ($q^*$), normalized beta ($\beta_{\text{N}}$) and then poloidal field and the profile settings for $\mathtt{alphaj}$ ($\alpha_J$) and $\mathtt{rli}$ ($l_{\mathtt{i}}$). This is done in 5 separate steps which are shown in the following numbered sections. +This function calculates the plasma current shaping factor ($f_q$), plasma current ($I_{\text{p}}$), qstar ($q^*$), normalized beta ($\beta_{\text{N}}$) and then poloidal field and the profile settings for $\mathtt{alphaj}$ ($\alpha_J$) and $\mathtt{ind_plasma_internal_norm}$ ($l_{\mathtt{i}}$). This is done in 5 separate steps which are shown in the following numbered sections. $$\begin{aligned} @@ -556,7 +556,7 @@ $$ A limited degree of self-consistency between the plasma current profile and other parameters can be enforced by setting switch `iprofile = 1`. This sets the current -profile peaking factor $\alpha_J$ (`alphaj`), the normalised internal inductance $l_i$ (`rli`) and beta limit $g$-factor (`beta_norm_max`) using the +profile peaking factor $\alpha_J$ (`alphaj`), the normalised internal inductance $l_i$ (`ind_plasma_internal_norm`) and beta limit $g$-factor (`beta_norm_max`) using the safety factor on axis `q0` and the cylindrical safety factor $q_*$ (`qstar`): $$\begin{aligned} diff --git a/documentation/proc-pages/physics-models/plasma_geometry.md b/documentation/proc-pages/physics-models/plasma_geometry.md index 9ca5211a07..fec099b565 100644 --- a/documentation/proc-pages/physics-models/plasma_geometry.md +++ b/documentation/proc-pages/physics-models/plasma_geometry.md @@ -193,7 +193,7 @@ will be inaccurate for single-null plasmas, `i_single_null = 1`) - `i_plasma_geometry = 8` -- The input values for `kappa` and `triang` are used directly and the 95% flux surface values are calculated using the FIESTA fit from `i_plasma_geometry = 7`. --------------------------------------------------------------------- -- `i_plasma_geometry = 9` -- The input values for `triang` and `rli` are used, `kappa` and the 95% flux +- `i_plasma_geometry = 9` -- The input values for `triang` and `ind_plasma_internal_norm` are used, `kappa` and the 95% flux surface values are calculated. $$ 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 f6146ad674..027e85c2da 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -355,7 +355,7 @@ kappa = 2.8 * plasma separatrix elongation (calculated if `i_plasma_geometry q = 5.835830999686161 * Safety factor 'near' plasma edge (`iteration variable 18`) equal to q95 q0 = 2.0 * safety factor on axis f_nd_alpha_electron = 0.08870796537675113 * thermal alpha density/electron density (`iteration variable 109`) -rli = 0.3 * plasma normalised internal inductance (calculated from alphaj if `iprofile=1`) +ind_plasma_internal_norm = 0.3 * plasma normalised internal inductance (calculated from alphaj if `iprofile=1`) rmajor = 4.5 * plasma major radius (m) (`iteration variable 3`) i_single_null = 0 * switch for single null / double null plasma; f_sync_reflect = 0.6 * synchrotron wall reflectivity factor @@ -377,7 +377,7 @@ triang = 0.5 * plasma separatrix triangularity (calculated if `i_plasma_geomet *-----------------Pulse Variables------------------* -lpulse = 0 * Switch for reactor model; +i_pulsed_plant = 0 * Switch for reactor model; *-----------------Rebco Variables------------------* @@ -436,7 +436,7 @@ f_vforce_inboard = 0.5 * Fraction of the total vertical force taken by the TF in *-----------------Times Variables------------------* -t_burn = 1000.0 * flat-top duration (s) (calculated if `lpulse=1`) +t_burn = 1000.0 * flat-top duration (s) (calculated if `i_pulsed_plant=1`) t_between_pulse = 100.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) *--------------------Utilities---------------------*