From 8e458fe5299778c7a895fb33969120f152fbc697 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:30:28 +0100 Subject: [PATCH 01/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20nbshinemw=20to=20?= =?UTF-8?q?p=5Fbeam=5Fshine=5Fthrough=5Fmw=20for=20clarity=20and=20consist?= =?UTF-8?q?ency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 16 ++++++++-------- process/io/sankey_funcs.py | 2 +- process/power.py | 10 +++++----- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_current_drive.py | 12 ++++++++---- 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index 5de626d5a9..e385ba2338 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -639,7 +639,7 @@ def cudriv(self, output: bool): ) # Shinethrough power (atoms that are not ionised) [MW]: - current_drive_variables.nbshinemw = ( + current_drive_variables.p_beam_shine_through_mw = ( current_drive_variables.pnbitot * current_drive_variables.nbshinef ) @@ -648,14 +648,14 @@ def cudriv(self, output: bool): current_drive_variables.forbitloss * ( current_drive_variables.pnbitot - - current_drive_variables.nbshinemw + - current_drive_variables.p_beam_shine_through_mw ) ) # Power deposited pinjmw1 = ( current_drive_variables.pnbitot - - current_drive_variables.nbshinemw + - current_drive_variables.p_beam_shine_through_mw - current_drive_variables.porbitlossmw ) pinjimw1 = pinjmw1 * current_drive_variables.fpion @@ -1019,7 +1019,7 @@ def cudriv(self, output: bool): "OP ", ) - # MDK rearranged and added current_drive_variables.nbshinemw + # MDK rearranged and added current_drive_variables.p_beam_shine_through_mw # if (abs(current_drive_variables.pnbeam) > 1.0e-8) : if ( (current_drive_variables.iefrf == 5) @@ -1120,8 +1120,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Beam shine-through power [MW]", - "(nbshinemw)", - current_drive_variables.nbshinemw, + "(p_beam_shine_through_mw)", + current_drive_variables.p_beam_shine_through_mw, "OP ", ) po.ovarrf( @@ -1140,9 +1140,9 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Total (MW)", - "(current_drive_variables.porbitlossmw+current_drive_variables.nbshinemw+current_drive_variables.pinjmw)", + "(current_drive_variables.porbitlossmw+current_drive_variables.p_beam_shine_through_mw+current_drive_variables.pinjmw)", current_drive_variables.porbitlossmw - + current_drive_variables.nbshinemw + + current_drive_variables.p_beam_shine_through_mw + pinjmw1, ) po.oblnkl(self.outfile) diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index e3acb6b415..016738debb 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -110,7 +110,7 @@ def plot_full_sankey( pthermfw_blkt - htpmwblkt - p_blkt_nuclear_heat_total_mw ) # Power extracted 1st wall (MW) # porbitloss = m_file.data['porbitloss'].get_scan(-1) # Charged P. on FW before thermalising - # nbshinemw = m_file.data['nbshinemw'].get_scan(-1) # Injection shine-through to 1st wall + # p_beam_shine_through_mw = m_file.data['p_beam_shine_through_mw'].get_scan(-1) # Injection shine-through to 1st wall # Initialising x and y variables for adjusting 'Plasma Heating' branch tip location y_adj_1 = 0 diff --git a/process/power.py b/process/power.py index ff18520a2e..1df87565d7 100644 --- a/process/power.py +++ b/process/power.py @@ -655,7 +655,7 @@ def power1(self): + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw - + current_drive_variables.nbshinemw + + current_drive_variables.p_beam_shine_through_mw ) elif fwbs_variables.i_blkt_dual_coolant == 1: self.pthermfw_blkt = ( @@ -666,7 +666,7 @@ def power1(self): + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw - + current_drive_variables.nbshinemw + + current_drive_variables.p_beam_shine_through_mw ) else: self.pthermfw_blkt = ( @@ -676,7 +676,7 @@ def power1(self): + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw - + current_drive_variables.nbshinemw + + current_drive_variables.p_beam_shine_through_mw ) elif fwbs_variables.i_coolant_pumping == 3: @@ -688,7 +688,7 @@ def power1(self): + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw - + current_drive_variables.nbshinemw + + current_drive_variables.p_beam_shine_through_mw ) else: @@ -699,7 +699,7 @@ def power1(self): + heat_transport_variables.htpmw_fw + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw - + current_drive_variables.nbshinemw + + current_drive_variables.p_beam_shine_through_mw ) # Total power deposited in blanket coolant (MW) (energy multiplication in fwbs_variables.p_blkt_nuclear_heat_total_mw already) self.pthermblkt = ( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index e48a142d1d..3f6f17e328 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -123,7 +123,7 @@ module current_drive_variables real(dp) :: pscf_scene !! Pfirsch-Schlüter current fraction, SCENE fit - real(dp) :: nbshinemw + real(dp) :: p_beam_shine_through_mw !! neutral beam shine-through power real(dp) :: feffcd diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 6888a04a82..c986bf4864 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3334,7 +3334,7 @@ "nbshield": 0.5, "nbshinef": 0.0, "nbshinefmax": 0.001, - "nbshinemw": 0.0, + "p_beam_shine_through_mw": 0.0, "ncalls": 0.0, "n_pf_cs_plasma_circuits": 0.0, "n_pf_coils_in_group": [ @@ -10072,7 +10072,7 @@ "nbshield": "neutral beam duct shielding thickness (m)", "nbshinef": "neutral beam shine-through fraction", "nbshinefmax": "maximum neutral beam shine-through fraction (`constraint equation 59`)", - "nbshinemw": "neutral beam shine-through power", + "p_beam_shine_through_mw": "neutral beam shine-through power", "ncalls": "ncalls : number of function calls during solution", "n_pf_cs_plasma_circuits": "number of PF circuits (including central solenoid and plasma)", "n_pf_coils_in_group": "number of PF coils in group j", @@ -17638,7 +17638,7 @@ "fpion", "pnbitot", "pscf_scene", - "nbshinemw", + "p_beam_shine_through_mw", "feffcd", "forbitloss", "frbeam", diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 224eec8572..7b0902816c 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -85,7 +85,7 @@ class CudrivParam(NamedTuple): pnbitot: Any = None - nbshinemw: Any = None + p_beam_shine_through_mw: Any = None pinjemw: Any = None @@ -235,7 +235,7 @@ class CudrivParam(NamedTuple): pwplh=0, echwpow=0, pnbitot=0, - nbshinemw=0, + p_beam_shine_through_mw=0, pinjemw=0, pinjimw=0, bigq=0, @@ -325,7 +325,7 @@ class CudrivParam(NamedTuple): pwplh=0, echwpow=240.99200038011492, pnbitot=0, - nbshinemw=0, + p_beam_shine_through_mw=0, pinjemw=120.49600019005746, pinjimw=0, bigq=0, @@ -464,7 +464,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "pnbitot", cudrivparam.pnbitot) - monkeypatch.setattr(current_drive_variables, "nbshinemw", cudrivparam.nbshinemw) + monkeypatch.setattr( + current_drive_variables, + "p_beam_shine_through_mw", + cudrivparam.p_beam_shine_through_mw, + ) monkeypatch.setattr(current_drive_variables, "pinjemw", cudrivparam.pinjemw) From d4f582e95777075e796f27d3fae0aa3dfa52466e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:33:28 +0100 Subject: [PATCH 02/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20pnbitot=20to=20p?= =?UTF-8?q?=5Fbeam=5Finjected=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 2 +- process/current_drive.py | 18 ++++++++++-------- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_costs_1990.py | 10 ++++++---- tests/unit/test_current_drive.py | 10 ++++++---- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/process/costs.py b/process/costs.py index 8d5255d602..13a46b4542 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1839,7 +1839,7 @@ def acc223(self): self.c2233 = ( 1.0e-6 * cost_variables.ucnbi - * (1.0e6 * current_drive_variables.pnbitot) ** exprf + * (1.0e6 * current_drive_variables.p_beam_injected) ** exprf ) if cost_variables.ifueltyp == 1: diff --git a/process/current_drive.py b/process/current_drive.py index e385ba2338..e118fd6f5c 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -631,7 +631,7 @@ def cudriv(self, output: bool): 0.999, current_drive_variables.forbitloss ) # Should never be needed - current_drive_variables.pnbitot = power1 / ( + current_drive_variables.p_beam_injected = power1 / ( 1.0e0 - current_drive_variables.forbitloss + current_drive_variables.forbitloss @@ -640,21 +640,22 @@ def cudriv(self, output: bool): # Shinethrough power (atoms that are not ionised) [MW]: current_drive_variables.p_beam_shine_through_mw = ( - current_drive_variables.pnbitot * current_drive_variables.nbshinef + current_drive_variables.p_beam_injected + * current_drive_variables.nbshinef ) # First orbit loss current_drive_variables.porbitlossmw = ( current_drive_variables.forbitloss * ( - current_drive_variables.pnbitot + current_drive_variables.p_beam_injected - current_drive_variables.p_beam_shine_through_mw ) ) # Power deposited pinjmw1 = ( - current_drive_variables.pnbitot + current_drive_variables.p_beam_injected - current_drive_variables.p_beam_shine_through_mw - current_drive_variables.porbitlossmw ) @@ -662,7 +663,8 @@ def cudriv(self, output: bool): pinjemw1 = pinjmw1 * (1.0e0 - current_drive_variables.fpion) current_drive_variables.pwpnb = ( - current_drive_variables.pnbitot / current_drive_variables.etanbi + current_drive_variables.p_beam_injected + / current_drive_variables.etanbi ) # neutral beam wall plug power pinjwp1 = current_drive_variables.pwpnb current_drive_variables.etacd = current_drive_variables.etanbi @@ -670,7 +672,7 @@ def cudriv(self, output: bool): current_drive_variables.gamcd = gamnb current_drive_variables.beam_current = ( 1.0e-3 - * (current_drive_variables.pnbitot * 1.0e6) + * (current_drive_variables.p_beam_injected * 1.0e6) / current_drive_variables.beam_energy ) # Neutral beam current (A) @@ -1149,8 +1151,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Beam power entering vacuum vessel (MW)", - "(pnbitot)", - current_drive_variables.pnbitot, + "(p_beam_injected)", + current_drive_variables.p_beam_injected, "OP ", ) diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 3f6f17e328..34095e24e5 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -117,7 +117,7 @@ module current_drive_variables real(dp) :: fpion !! fraction of beam energy to ions - real(dp) :: pnbitot + real(dp) :: p_beam_injected !! neutral beam power entering vacuum vessel real(dp) :: pscf_scene diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index c986bf4864..c162223265 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3527,7 +3527,7 @@ "plsepi": 1.0, "plsepo": 1.5, "pnbeam": 0.0, - "pnbitot": 0.0, + "p_beam_injected": 0.0, "pnetelin": 1000.0, "pnetelmw": 0.0, "neutron_power_total": 0.0, @@ -10250,7 +10250,7 @@ "plsepi": "poloidal length, x-point to inboard strike point (m)", "plsepo": "poloidal length, x-point to outboard strike point (m)", "pnbeam": "neutral beam injection power (MW)", - "pnbitot": "neutral beam power entering vacuum vessel", + "p_beam_injected": "neutral beam power entering vacuum vessel", "pnetelin": "required net electric power (MW) (`constraint equation 16`)", "pnetelmw": "net electric power (MW)", "neutron_power_total": "neutron fusion power (MW)", @@ -17636,7 +17636,7 @@ "etalh", "etanbi", "fpion", - "pnbitot", + "p_beam_injected", "pscf_scene", "p_beam_shine_through_mw", "feffcd", diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index d4814227c8..800e11c494 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2887,7 +2887,7 @@ class Acc223Param(NamedTuple): echpwr: Any = None - pnbitot: Any = None + p_beam_injected: Any = None dcdrv2: Any = None @@ -2947,7 +2947,7 @@ class Acc223Param(NamedTuple): plhybd=0, iefrf=10, echpwr=51.978447720428512, - pnbitot=0, + p_beam_injected=0, dcdrv2=59.899999999999999, mcdriv=1, cdriv2=244.90000000000001, @@ -2982,7 +2982,7 @@ class Acc223Param(NamedTuple): plhybd=0, iefrf=10, echpwr=51.978447720428512, - pnbitot=0, + p_beam_injected=0, dcdrv2=59.899999999999999, mcdriv=1, cdriv2=244.90000000000001, @@ -3042,7 +3042,9 @@ def test_acc223(acc223param, monkeypatch, costs): monkeypatch.setattr(current_drive_variables, "echpwr", acc223param.echpwr) - monkeypatch.setattr(current_drive_variables, "pnbitot", acc223param.pnbitot) + monkeypatch.setattr( + current_drive_variables, "p_beam_injected", acc223param.p_beam_injected + ) monkeypatch.setattr(ife_variables, "dcdrv2", acc223param.dcdrv2) diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 7b0902816c..c0ca7aee72 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -83,7 +83,7 @@ class CudrivParam(NamedTuple): echwpow: Any = None - pnbitot: Any = None + p_beam_injected: Any = None p_beam_shine_through_mw: Any = None @@ -234,7 +234,7 @@ class CudrivParam(NamedTuple): effcd=0, pwplh=0, echwpow=0, - pnbitot=0, + p_beam_injected=0, p_beam_shine_through_mw=0, pinjemw=0, pinjimw=0, @@ -324,7 +324,7 @@ class CudrivParam(NamedTuple): effcd=0.05000000000000001, pwplh=0, echwpow=240.99200038011492, - pnbitot=0, + p_beam_injected=0, p_beam_shine_through_mw=0, pinjemw=120.49600019005746, pinjimw=0, @@ -462,7 +462,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "echwpow", cudrivparam.echwpow) - monkeypatch.setattr(current_drive_variables, "pnbitot", cudrivparam.pnbitot) + monkeypatch.setattr( + current_drive_variables, "p_beam_injected", cudrivparam.p_beam_injected + ) monkeypatch.setattr( current_drive_variables, From 32f4b8fc15c7b8ced6ee74d952cdf26a6c30e73d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:34:46 +0100 Subject: [PATCH 03/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20forbitloss=20to?= =?UTF-8?q?=20f=5Fp=5Fbeam=5Forbit=5Floss=20for=20clarity=20and=20consiste?= =?UTF-8?q?ncy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NBI/nbi_overview.md | 2 +- process/current_drive.py | 20 +++++++++---------- process/input.py | 2 +- process/stellarator.py | 5 +++-- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 10 +++++----- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_current_drive.py | 10 ++++++---- 8 files changed, 28 insertions(+), 25 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md index 1dbc213677..f2d5af344a 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md @@ -14,7 +14,7 @@ If present, a neutral beam injection system needs sufficient space between the T ## Neutral beam losses -Input parameter `forbitloss` can be used to specify the fraction of the net injected neutral beam power that is lost between the beam particles' ionisation and thermalisation (known as the first orbit loss). This quantity cannot easily be calculated as it depends on the field ripple and other three-dimensional effects. The power lost is assumed to be absorbed by the first wall. +Input parameter `f_p_beam_orbit_loss` can be used to specify the fraction of the net injected neutral beam power that is lost between the beam particles' ionisation and thermalisation (known as the first orbit loss). This quantity cannot easily be calculated as it depends on the field ripple and other three-dimensional effects. The power lost is assumed to be absorbed by the first wall. The power in the beam atoms that are not ionised as they pass through the plasma (shine-through) is calculated by the code. There are two constraint equations that can be used to control the beam penetration and deposition, as follows: diff --git a/process/current_drive.py b/process/current_drive.py index e118fd6f5c..214770e69f 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -316,14 +316,14 @@ def cudriv(self, output: bool): # Account for first orbit losses # (power due to particles that are ionised but not thermalised) [MW]: # This includes a second order term in shinethrough*(first orbit loss) - current_drive_variables.forbitloss = min( - 0.999, current_drive_variables.forbitloss + current_drive_variables.f_p_beam_orbit_loss = min( + 0.999, current_drive_variables.f_p_beam_orbit_loss ) # Should never be needed pnbitotfix = current_drive_variables.pinjfixmw / ( 1.0e0 - - current_drive_variables.forbitloss - + current_drive_variables.forbitloss + - current_drive_variables.f_p_beam_orbit_loss + + current_drive_variables.f_p_beam_orbit_loss * current_drive_variables.nbshinef ) @@ -331,7 +331,7 @@ def cudriv(self, output: bool): nbshinemwfix = pnbitotfix * current_drive_variables.nbshinef # First orbit loss - porbitlossmwfix = current_drive_variables.forbitloss * ( + porbitlossmwfix = current_drive_variables.f_p_beam_orbit_loss * ( pnbitotfix - nbshinemwfix ) @@ -627,14 +627,14 @@ def cudriv(self, output: bool): # Account for first orbit losses # (power due to particles that are ionised but not thermalised) [MW]: # This includes a second order term in shinethrough*(first orbit loss) - current_drive_variables.forbitloss = min( - 0.999, current_drive_variables.forbitloss + current_drive_variables.f_p_beam_orbit_loss = min( + 0.999, current_drive_variables.f_p_beam_orbit_loss ) # Should never be needed current_drive_variables.p_beam_injected = power1 / ( 1.0e0 - - current_drive_variables.forbitloss - + current_drive_variables.forbitloss + - current_drive_variables.f_p_beam_orbit_loss + + current_drive_variables.f_p_beam_orbit_loss * current_drive_variables.nbshinef ) @@ -646,7 +646,7 @@ def cudriv(self, output: bool): # First orbit loss current_drive_variables.porbitlossmw = ( - current_drive_variables.forbitloss + current_drive_variables.f_p_beam_orbit_loss * ( current_drive_variables.p_beam_injected - current_drive_variables.p_beam_shine_through_mw diff --git a/process/input.py b/process/input.py index b857859c08..f15a327a8b 100644 --- a/process/input.py +++ b/process/input.py @@ -630,7 +630,7 @@ def __post_init__(self): "foh_stress": InputVariable( fortran.constraint_variables, float, range=(0.001, 1.0) ), - "forbitloss": InputVariable( + "f_p_beam_orbit_loss": InputVariable( fortran.current_drive_variables, float, range=(0.0, 0.999) ), "fpdivlim": InputVariable(fortran.physics_variables, float, range=(0.001, 1.0)), diff --git a/process/stellarator.py b/process/stellarator.py index 2f84117907..2b67e02fee 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4963,10 +4963,11 @@ def stheat(self, output: bool): current_drive_variables.nbshinef, ) = self.current_drive.culnbi() current_drive_variables.pnbeam = current_drive_variables.pheat * ( - 1 - current_drive_variables.forbitloss + 1 - current_drive_variables.f_p_beam_orbit_loss ) current_drive_variables.porbitlossmw = ( - current_drive_variables.pheat * current_drive_variables.forbitloss + current_drive_variables.pheat + * current_drive_variables.f_p_beam_orbit_loss ) current_drive_variables.pinjimw = current_drive_variables.pnbeam * fpion current_drive_variables.pinjemw = current_drive_variables.pnbeam * ( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 34095e24e5..1336ffa9b4 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -129,7 +129,7 @@ module current_drive_variables real(dp) :: feffcd !! current drive efficiency fudge factor (`iteration variable 47`) - real(dp) :: forbitloss + real(dp) :: f_p_beam_orbit_loss !! fraction of neutral beam power lost after ionisation but before !! thermalisation (orbit loss fraction) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index c162223265..546720a82c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1974,7 +1974,7 @@ "fnesep": 1.0, "fniterpump": 1.0, "foh_stress": 1.0, - "forbitloss": 0.0, + "f_p_beam_orbit_loss": 0.0, "fpdivlim": 1.0, "fpe1_": "wpe1_/(2*pi)", "fpeakb": 1.0, @@ -9531,7 +9531,7 @@ "fnesep": "f-value for Eich critical separatrix density\n (`constraint equation 76`, `iteration variable 144`)", "fniterpump": "f-value for constraint that number of pumps < tfno\n (`constraint equation 63`, `iteration variable 111`)", "foh_stress": "f-value for Tresca yield criterion in Central Solenoid\n (`constraint equation 72`, `iteration variable 123`)", - "forbitloss": "fraction of neutral beam power lost after ionisation but before\n thermalisation (orbit loss fraction)", + "f_p_beam_orbit_loss": "fraction of neutral beam power lost after ionisation but before\n thermalisation (orbit loss fraction)", "fpdivlim": "F-value for minimum pdivt (`constraint equation 80`)", "fpe1_": "", "fpeakb": "f-value for maximum toroidal field (`constraint equation 25`, `iteration variable 35`)", @@ -12643,7 +12643,7 @@ "lb": 0.001, "ub": 1.0 }, - "forbitloss": { + "f_p_beam_orbit_loss": { "lb": 0.0, "ub": 0.999 }, @@ -17640,7 +17640,7 @@ "pscf_scene", "p_beam_shine_through_mw", "feffcd", - "forbitloss", + "f_p_beam_orbit_loss", "frbeam", "f_tritium_beam", "gamcd", @@ -20098,7 +20098,7 @@ "fnesep": "real_variable", "fniterpump": "real_variable", "foh_stress": "real_variable", - "forbitloss": "real_variable", + "f_p_beam_orbit_loss": "real_variable", "fpdivlim": "real_variable", "fpeakb": "real_variable", "fpinj": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 85f6503839..da3f351376 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2752,7 +2752,7 @@ feffcd = 1.0 * DESCRIPTION: Width of neutral beam duct where it passes between the TF coils * JUSTIFICATION: Not used as no NBI used -*forbitloss +*f_p_beam_orbit_loss * DESCRIPTION: NBI power orbit loss fraction * JUSTIFICATION: Not used as no NBI used diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index c0ca7aee72..86c90e16cc 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -67,7 +67,7 @@ class CudrivParam(NamedTuple): etaech: Any = None - forbitloss: Any = None + f_p_beam_orbit_loss: Any = None pinjmw: Any = None @@ -226,7 +226,7 @@ class CudrivParam(NamedTuple): etacd=0, etacdfix=0, etaech=0.5, - forbitloss=0, + f_p_beam_orbit_loss=0, pinjmw=0, pwpnb=0, etanbi=0.29999999999999999, @@ -316,7 +316,7 @@ class CudrivParam(NamedTuple): etacd=0.5, etacdfix=0, etaech=0.5, - forbitloss=0, + f_p_beam_orbit_loss=0, pinjmw=120.49600019005746, pwpnb=0, etanbi=0.29999999999999999, @@ -446,7 +446,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "etaech", cudrivparam.etaech) - monkeypatch.setattr(current_drive_variables, "forbitloss", cudrivparam.forbitloss) + monkeypatch.setattr( + current_drive_variables, "f_p_beam_orbit_loss", cudrivparam.f_p_beam_orbit_loss + ) monkeypatch.setattr(current_drive_variables, "pinjmw", cudrivparam.pinjmw) From e642cc9398cf9b64cab52cd74a85e8e01211884c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:39:15 +0100 Subject: [PATCH 04/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20iefrf=20to=20i=5F?= =?UTF-8?q?hcd=5Fprimary=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NBI/culham_nb.md | 2 +- .../heating_and_current_drive/NBI/iter_nb.md | 2 +- .../RF/culham_electron_cyclotron.md | 2 +- .../RF/culham_lower_hybrid.md | 2 +- .../RF/cutoff_ecrh.md | 2 +- .../RF/ecrh_gamma.md | 2 +- .../RF/ehst_lower_hybrid.md | 2 +- ...stermacher_electron_cyclotron_resonance.md | 2 +- .../RF/fenstermacher_lower_hybrid.md | 2 +- .../heating_and_current_drive/RF/ic_model.md | 2 +- .../heating-and-current-drive.md | 32 ++++----- .../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/build.py | 2 +- process/buildings.py | 14 ++-- process/costs.py | 2 +- process/current_drive.py | 72 +++++++++---------- process/init.py | 4 +- process/input.py | 2 +- process/io/plot_proc.py | 28 +++++--- source/fortran/current_drive_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 ++++----- tests/integration/data/scan_MFILE.DAT | 20 +++--- .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 10 +-- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../spherical_tokamak_once_through.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_buildings.py | 10 +-- tests/unit/test_costs_1990.py | 10 +-- tests/unit/test_current_drive.py | 10 +-- 50 files changed, 187 insertions(+), 173 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md index ca1ce25326..ea06bd7b5f 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md @@ -1,6 +1,6 @@ # Culham Neutral Beam Model | `culnbi()` -- `iefrf/iefrffix` = 8 +- `i_hcd_primary/iefrffix` = 8 diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md index e6d2ef968d..0b127fab5e 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md @@ -1,6 +1,6 @@ # ITER Neutral Beam Model | `iternb()` -- `iefrf/iefrffix` = 5 +- `i_hcd_primary/iefrffix` = 5 | Output | Description | |----------|-------------| diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_electron_cyclotron.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_electron_cyclotron.md index b0246bff67..4658cdfe70 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_electron_cyclotron.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_electron_cyclotron.md @@ -1,6 +1,6 @@ # Culham Electron Cyclotron Model | `culecd()` -- `iefrf/iefrffix` = 7 +- `i_hcd_primary/iefrffix` = 7 This routine calculates the current drive parameters for a electron cyclotron system, based on the AEA FUS 172 model[^1] diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_lower_hybrid.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_lower_hybrid.md index e9be2ae5c9..a3055972d9 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_lower_hybrid.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_lower_hybrid.md @@ -1,6 +1,6 @@ # Culham Lower Hybrid | `cullhy()` -- `iefrf/iefrffix` = 6 +- `i_hcd_primary/iefrffix` = 6 This routine calculates the current drive parameters for a lower hybrid system, based on the AEA FUS 172 model. diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md index 1989210b4e..26e5ab7aca 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md @@ -1,6 +1,6 @@ # ECRH with Cutoff -- `iefrf/iefrffix` = 13 +- `i_hcd_primary/iefrffix` = 13 | Input | Description | |-------|-------------| diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md index 399eb1f932..4be7abf113 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md @@ -1,6 +1,6 @@ # ECRH User Input Gamma Model -- `iefrf/iefrffix` = 10 +- `i_hcd_primary/iefrffix` = 10 This model allows the user to input a scaling factor to the current drive efficiency with the variable `gamma_ecrh`. The value of this variable should follow the value and form of the expression below: diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ehst_lower_hybrid.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ehst_lower_hybrid.md index 15bff14676..e0d9f69ce9 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ehst_lower_hybrid.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ehst_lower_hybrid.md @@ -1,5 +1,5 @@ # Ehst Lower Hybrid -- `iefrf/iefrffix` = 4 +- `i_hcd_primary/iefrffix` = 4 $$ \text{Current drive efficiency [A/W]} = \frac{T_{\text{e}}^{0.77} (0.034 + 0.196\beta)}{R_0 n_{\text{e},20}}\frac{\frac{32}{5+Z_{\text{eff}}}+2+\frac{\frac{12\left(6+Z_{\text{eff}}\right)}{5+Z_{\text{eff}}}}{3+Z_{\text{eff}}}+\frac{3.76}{Z_{\text{eff}}}}{12.507} $$ diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_electron_cyclotron_resonance.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_electron_cyclotron_resonance.md index 47165b65b7..2ef11cc625 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_electron_cyclotron_resonance.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_electron_cyclotron_resonance.md @@ -1,6 +1,6 @@ # Fenstermacher Electron Cyclotron Resonance -- `iefrf/iefrffix` = 3 +- `i_hcd_primary/iefrffix` = 3 $$ \text{Current drive efficiency [A/W]} = \frac{0.21 T_{\langle e,n_{\text{e}} \rangle}}{R_0n_{\text{e,20}}(31.0-(\log{n_{\text{e}}}/2)+(\log{(T_\text{e}}\times1000))} $$ diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_lower_hybrid.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_lower_hybrid.md index a085f17fb3..d88ee4ca22 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_lower_hybrid.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_lower_hybrid.md @@ -1,6 +1,6 @@ # Fenstermacher Lower Hybrid -- `iefrf/iefrffix` = 1: +- `i_hcd_primary/iefrffix` = 1: $$ \text{Current drive efficiency [A/W]} = 0.36 \frac{(1+(T_{\text{e}}/25)^{1.16})}{R_{0} n_{\text{e},20}} diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ic_model.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ic_model.md index fa8855f893..3793582031 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ic_model.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ic_model.md @@ -1,6 +1,6 @@ # Ion cyclotron model -- `iefrf/iefrffix` = 2 +- `i_hcd_primary/iefrffix` = 2 $$ \text{Current drive efficiency [A/W]} = \frac{\frac{0.063 T_{\langle \text{e}, n_{\text{e}}\rangle}}{2+Z_{\text{eff}}}}{R_0n_{\text{e,20}}} diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md index f6bf579f8d..f6082501a0 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md @@ -4,21 +4,21 @@ The use of inductive current drive leads to pulsed plant operation because of the limited flux swing that can be achieved using the central solenoid. This poses problems due to the fact that fatigue failures may result, and there would be a need for thermal storage to maintain output of electricity between pulses, and supply power for starting a new pulse.However, the plasma current can also be produced and maintained (partially or wholly) using non-inductive means which, in principle, removes this restriction. `PROCESS` contains a number of auxiliary current drive schemes, including various RF methods (Lower Hybrid, Electron Cyclotron, Electron Bernstein Wave, and Ion Cyclotron (Fast Wave) current drives) and also Neutral Beam current drive systems. The code calculates the efficiency and the resulting power requirements of the chosen system. -The fraction of the required plasma current to be produced by non-inductive means, `fvsbrnni`, should be set, and flag `irfcd` should be set to 0 for purely inductive scenarios, or 1 otherwise. The current drive efficiency model to be used in this latter case is defined by the value of switch `iefrf`: - -- `iefrf` = 1: [Fenstermacher Lower Hybrid model](RF/fenstermacher_lower_hybrid.md) -- `iefrf` = 2: [Ion cyclotron model](RF/ic_model.md)[^1], -- `iefrf` = 3: [Fenstermacher electron cyclotron resonance model](RF/fenstermacher_electron_cyclotron_resonance.md) -- `iefrf` = 4: [Ehst Lower Hybrid model](RF/ehst_lower_hybrid.md) -- `iefrf` = 5: [ITER neutral beam model](NBI/iter_nb.md)[^1],[^2], -- `iefrf` = 6: [Culham Lower Hybrid model](RF/culham_lower_hybrid.md)[^2], -- `iefrf` = 7: [Culham electron cyclotron model](RF/culham_electron_cyclotron.md)[^2], -- `iefrf` = 8: [Culham neutral beam model](NBI/culham_nb.md)[^2], -- `iefrf` = 9: Oscillating Field current drive :warning: (OBSOLETE-REMOVED), -- `iefrf` = 10: [ECRH user input gamma](RF/ecrh_gamma.md), -- `iefrf` = 11: ECRH "HARE" model [^3] :warning: (OBSOLETE-REMOVED), -- `iefrf` = 12: [EBW user scaling input. Scaling](RF/ebw_freethy.md) (S. Freethy) -- `iefrf` = 13: [ECRH O-mode cutoff with $Z_{\text{eff}}$ and $T_{\text{e}}$](RF/cutoff_ecrh.md) (S. Freethy) [^4], +The fraction of the required plasma current to be produced by non-inductive means, `fvsbrnni`, should be set, and flag `irfcd` should be set to 0 for purely inductive scenarios, or 1 otherwise. The current drive efficiency model to be used in this latter case is defined by the value of switch `i_hcd_primary`: + +- `i_hcd_primary` = 1: [Fenstermacher Lower Hybrid model](RF/fenstermacher_lower_hybrid.md) +- `i_hcd_primary` = 2: [Ion cyclotron model](RF/ic_model.md)[^1], +- `i_hcd_primary` = 3: [Fenstermacher electron cyclotron resonance model](RF/fenstermacher_electron_cyclotron_resonance.md) +- `i_hcd_primary` = 4: [Ehst Lower Hybrid model](RF/ehst_lower_hybrid.md) +- `i_hcd_primary` = 5: [ITER neutral beam model](NBI/iter_nb.md)[^1],[^2], +- `i_hcd_primary` = 6: [Culham Lower Hybrid model](RF/culham_lower_hybrid.md)[^2], +- `i_hcd_primary` = 7: [Culham electron cyclotron model](RF/culham_electron_cyclotron.md)[^2], +- `i_hcd_primary` = 8: [Culham neutral beam model](NBI/culham_nb.md)[^2], +- `i_hcd_primary` = 9: Oscillating Field current drive :warning: (OBSOLETE-REMOVED), +- `i_hcd_primary` = 10: [ECRH user input gamma](RF/ecrh_gamma.md), +- `i_hcd_primary` = 11: ECRH "HARE" model [^3] :warning: (OBSOLETE-REMOVED), +- `i_hcd_primary` = 12: [EBW user scaling input. Scaling](RF/ebw_freethy.md) (S. Freethy) +- `i_hcd_primary` = 13: [ECRH O-mode cutoff with $Z_{\text{eff}}$ and $T_{\text{e}}$](RF/cutoff_ecrh.md) (S. Freethy) [^4], !!! Warning "Warning" At present, the neutral beam models do not include the effect of an edge transport barrier (pedestal) in the plasma profile. @@ -31,7 +31,7 @@ Similarly the lower bound on required heating and current drive power can be set ### Secondary current drive -It is possible to have more than one type of heating and current drive system in `PROCESS`. This can be enabled by setting the `iefrffix` switch to the desired current drive scheme, following the same numbered selection for `iefrf`. +It is possible to have more than one type of heating and current drive system in `PROCESS`. This can be enabled by setting the `iefrffix` switch to the desired current drive scheme, following the same numbered selection for `i_hcd_primary`. The power injected by the secondary current drive scheme has to be set to a fixed value. This value can be set with the `pinjfixmw` variable. ## Plasma heating only diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index d09e93128d..e2f6749326 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -532,7 +532,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.6946E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 2.1293E-01 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 @@ -1649,7 +1649,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 79a9057b36..937648dc7f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -528,7 +528,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.7282E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 @@ -1643,7 +1643,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 7b06d13d7e..d7e22947fb 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -528,7 +528,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.7282E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 @@ -1643,7 +1643,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index fa3cdf5c99..833e357044 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -528,7 +528,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.7282E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 @@ -1644,7 +1644,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 5419f4dd16..935ec729da 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -528,7 +528,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.7282E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 @@ -1644,7 +1644,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 1b266eca8c..41657beb82 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -454,7 +454,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 8e1b35b513..448ab9a21d 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -385,7 +385,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -1380,7 +1380,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -2375,7 +2375,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -3370,7 +3370,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -4365,7 +4365,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -5360,7 +5360,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -6355,7 +6355,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -7350,7 +7350,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -8345,7 +8345,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -9145,7 +9145,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) *-------------Current Drive Variables--------------* bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; -iefrf = 10 * Switch for current drive efficiency model; +i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) etaech = 0.4 * ECRH wall-plug efficiency pinjalw = 51.0 * Maximum allowable value for injected power (mw) diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index fdfb0aa206..7be6b57580 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -454,7 +454,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/process/build.py b/process/build.py index 151bd7d3b5..5bd6242a46 100644 --- a/process/build.py +++ b/process/build.py @@ -2421,7 +2421,7 @@ def calculate_radial_build(self, output: bool) -> None: radius, ) - if (current_drive_variables.iefrf in [5, 8]) or ( + if (current_drive_variables.i_hcd_primary in [5, 8]) or ( current_drive_variables.iefrffix in [5, 8] ): po.ovarre( diff --git a/process/buildings.py b/process/buildings.py index a6632e95c4..d78876c265 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -440,8 +440,10 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): # Heating and Current Drive facility # Dimensions based upon estimates from M. Henderson, HCD Development Group - # current_drive_variables.iefrf = switch for current drive model - if (current_drive_variables.iefrf == 5) or (current_drive_variables.iefrf == 8): + # current_drive_variables.i_hcd_primary = switch for current drive model + if (current_drive_variables.i_hcd_primary == 5) or ( + current_drive_variables.i_hcd_primary == 8 + ): # NBI technology will be situated within the reactor building buildings_variables.reactor_hall_l = ( buildings_variables.reactor_hall_l @@ -998,8 +1000,8 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): "(reactor_hall_h)", buildings_variables.reactor_hall_h, ) - if (current_drive_variables.iefrf == 5) or ( - current_drive_variables.iefrf == 8 + if (current_drive_variables.i_hcd_primary == 5) or ( + current_drive_variables.i_hcd_primary == 8 ): po.ocmmnt( self.outfile, @@ -1092,8 +1094,8 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): hotcell_vol_ext, ) po.oblnkl(self.outfile) - if (current_drive_variables.iefrf != 5) and ( - current_drive_variables.iefrf != 8 + if (current_drive_variables.i_hcd_primary != 5) and ( + current_drive_variables.i_hcd_primary != 8 ): po.ovarre( self.outfile, diff --git a/process/costs.py b/process/costs.py index 13a46b4542..c5d8276773 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1814,7 +1814,7 @@ def acc223(self): # Account 223.2 : Lower Hybrid or ICH - if current_drive_variables.iefrf != 2: + if current_drive_variables.i_hcd_primary != 2: self.c2232 = ( 1.0e-6 * cost_variables.uclh diff --git a/process/current_drive.py b/process/current_drive.py index 214770e69f..a1ae491496 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -363,7 +363,7 @@ def cudriv(self, output: bool): ) # Fenstermacher Lower Hybrid model - if current_drive_variables.iefrf == 1: + if current_drive_variables.i_hcd_primary == 1: effrfss = ( (0.36e0 * (1.0e0 + (physics_variables.te / 25.0e0) ** 1.16e0)) / (physics_variables.rmajor * dene20) @@ -371,7 +371,7 @@ def cudriv(self, output: bool): ) current_drive_variables.effcd = effrfss # Ion-Cyclotron current drive - elif current_drive_variables.iefrf == 2: + elif current_drive_variables.i_hcd_primary == 2: effrfss = ( 0.63e0 * 0.1e0 @@ -382,7 +382,7 @@ def cudriv(self, output: bool): ) current_drive_variables.effcd = effrfss # Fenstermacher Electron Cyclotron Resonance model - elif current_drive_variables.iefrf == 3: + elif current_drive_variables.i_hcd_primary == 3: effrfss = ( 0.21e0 * physics_variables.ten @@ -391,7 +391,7 @@ def cudriv(self, output: bool): ) current_drive_variables.effcd = effrfss # Ehst Lower Hybrid / Fast Wave current drive - elif current_drive_variables.iefrf == 4: + elif current_drive_variables.i_hcd_primary == 4: effrfss = ( physics_variables.te**0.77e0 * (0.034e0 + 0.196e0 * physics_variables.beta) @@ -409,7 +409,7 @@ def cudriv(self, output: bool): ) current_drive_variables.effcd = effrfss # ITER Neutral Beam current drive - elif current_drive_variables.iefrf == 5: + elif current_drive_variables.i_hcd_primary == 5: ( effnbss, current_drive_variables.fpion, @@ -418,17 +418,17 @@ def cudriv(self, output: bool): effnbss = effnbss * current_drive_variables.feffcd current_drive_variables.effcd = effnbss # Culham Lower Hybrid current drive model - elif current_drive_variables.iefrf == 6: + elif current_drive_variables.i_hcd_primary == 6: effrfss = self.cullhy() effrfss = effrfss * current_drive_variables.feffcd current_drive_variables.effcd = effrfss # Culham ECCD model - elif current_drive_variables.iefrf == 7: + elif current_drive_variables.i_hcd_primary == 7: effrfss = self.culecd() effrfss = effrfss * current_drive_variables.feffcd current_drive_variables.effcd = effrfss # Culham Neutral Beam model - elif current_drive_variables.iefrf == 8: + elif current_drive_variables.i_hcd_primary == 8: ( effnbss, current_drive_variables.fpion, @@ -437,7 +437,7 @@ def cudriv(self, output: bool): effnbss = effnbss * current_drive_variables.feffcd current_drive_variables.effcd = effnbss # ECRH user input gamma - elif current_drive_variables.iefrf == 10: + elif current_drive_variables.i_hcd_primary == 10: current_drive_variables.gamcd = current_drive_variables.gamma_ecrh # Absolute current drive efficiency @@ -446,7 +446,7 @@ def cudriv(self, output: bool): ) current_drive_variables.effcd = effrfss # EBW scaling - elif current_drive_variables.iefrf == 12: + elif current_drive_variables.i_hcd_primary == 12: # Scaling author Simon Freethy # Ref : PROCESS issue 1262 @@ -493,7 +493,7 @@ def cudriv(self, output: bool): ) effrfss = effrfss * density_factor - elif current_drive_variables.iefrf == 13: + elif current_drive_variables.i_hcd_primary == 13: # ECCD model for O-mode cut-off with added Te and Zeff dependance # Scaling author: Simon Freethy # Ref : PROCESS issue #2994 @@ -551,7 +551,7 @@ def cudriv(self, output: bool): current_drive_variables.effcd = effrfss * cutoff_factor else: raise ProcessValueError( - f"Current drive switch is invalid: {current_drive_variables.iefrf = }" + f"Current drive switch is invalid: {current_drive_variables.i_hcd_primary = }" ) # Compute current drive wall plug and injected powers (MW) and efficiencies @@ -561,7 +561,7 @@ def cudriv(self, output: bool): ) # LHCD or ICCD - if current_drive_variables.iefrf in [1, 2, 4, 6]: + if current_drive_variables.i_hcd_primary in [1, 2, 4, 6]: # Injected power current_drive_variables.plhybd = ( 1.0e-6 @@ -589,7 +589,7 @@ def cudriv(self, output: bool): gamrf = effrfss * (dene20 * physics_variables.rmajor) current_drive_variables.gamcd = gamrf # ECCD - elif current_drive_variables.iefrf in [3, 7, 10, 12, 13]: + elif current_drive_variables.i_hcd_primary in [3, 7, 10, 12, 13]: # Injected power (set to close to close the Steady-state current equilibrium) current_drive_variables.echpwr = ( 1.0e-6 @@ -611,7 +611,7 @@ def cudriv(self, output: bool): # Wall plug to injector efficiency pinjwp1 = current_drive_variables.echwpow current_drive_variables.etacd = current_drive_variables.etaech - elif current_drive_variables.iefrf in [5, 8]: + elif current_drive_variables.i_hcd_primary in [5, 8]: # MDK. See Gitlab issue #248, and scanned note. power1 = ( 1.0e-6 @@ -720,21 +720,21 @@ def cudriv(self, output: bool): po.oblnkl(self.outfile) return - if current_drive_variables.iefrf in [1, 4, 6]: + if current_drive_variables.i_hcd_primary in [1, 4, 6]: po.ocmmnt(self.outfile, "Lower Hybrid Current Drive") - elif current_drive_variables.iefrf == 2: + elif current_drive_variables.i_hcd_primary == 2: po.ocmmnt(self.outfile, "Ion Cyclotron Current Drive") - elif current_drive_variables.iefrf in [3, 7]: + elif current_drive_variables.i_hcd_primary in [3, 7]: po.ocmmnt(self.outfile, "Electron Cyclotron Current Drive") - elif current_drive_variables.iefrf in [5, 8]: + elif current_drive_variables.i_hcd_primary in [5, 8]: po.ocmmnt(self.outfile, "Neutral Beam Current Drive") - elif current_drive_variables.iefrf == 10: + elif current_drive_variables.i_hcd_primary == 10: po.ocmmnt( self.outfile, "Electron Cyclotron Current Drive (user input gamma_CD)" ) - elif current_drive_variables.iefrf == 12: + elif current_drive_variables.i_hcd_primary == 12: po.ocmmnt(self.outfile, "EBW current drive") - elif current_drive_variables.iefrf == 13: + elif current_drive_variables.i_hcd_primary == 13: po.ocmmnt( self.outfile, "Electron Cyclotron Current Drive (O-mode cutoff with Zeff & Te)", @@ -743,8 +743,8 @@ def cudriv(self, output: bool): po.ovarin( self.outfile, "Current drive efficiency model", - "(iefrf)", - current_drive_variables.iefrf, + "(i_hcd_primary)", + current_drive_variables.i_hcd_primary, ) if current_drive_variables.iefrffix in [1, 4, 6]: @@ -870,28 +870,28 @@ def cudriv(self, output: bool): current_drive_variables.etacd, ) - if current_drive_variables.iefrf == 10: + if current_drive_variables.i_hcd_primary == 10: po.ovarre( self.outfile, "ECRH plasma heating efficiency", "(gamma_ecrh)", current_drive_variables.gamma_ecrh, ) - if current_drive_variables.iefrf == 12: + if current_drive_variables.i_hcd_primary == 12: po.ovarre( self.outfile, "EBW plasma heating efficiency", "(xi_ebw)", current_drive_variables.xi_ebw, ) - if current_drive_variables.iefrf in [12, 13]: + if current_drive_variables.i_hcd_primary in [12, 13]: po.ovarre( self.outfile, "EC harmonic number", "(harnum)", current_drive_variables.harnum, ) - if current_drive_variables.iefrf == 13: + if current_drive_variables.i_hcd_primary == 13: po.ovarin( self.outfile, "EC cutoff wave mode switch", @@ -1024,8 +1024,8 @@ def cudriv(self, output: bool): # MDK rearranged and added current_drive_variables.p_beam_shine_through_mw # if (abs(current_drive_variables.pnbeam) > 1.0e-8) : if ( - (current_drive_variables.iefrf == 5) - or (current_drive_variables.iefrf == 8) + (current_drive_variables.i_hcd_primary == 5) + or (current_drive_variables.i_hcd_primary == 8) or (current_drive_variables.iefrffix == 5) or (current_drive_variables.iefrffix == 8) ): @@ -1035,8 +1035,8 @@ def cudriv(self, output: bool): "(beam_energy)", current_drive_variables.beam_energy, ) - if (current_drive_variables.iefrf == 5) or ( - current_drive_variables.iefrf == 8 + if (current_drive_variables.i_hcd_primary == 5) or ( + current_drive_variables.i_hcd_primary == 8 ): po.ovarre( self.outfile, @@ -1057,8 +1057,8 @@ def cudriv(self, output: bool): "OP ", ) - if (current_drive_variables.iefrf == 5) or ( - current_drive_variables.iefrf == 8 + if (current_drive_variables.i_hcd_primary == 5) or ( + current_drive_variables.i_hcd_primary == 8 ): po.ovarre( self.outfile, "Beam efficiency (A/W)", "(effnbss)", effnbss, "OP " @@ -1109,8 +1109,8 @@ def cudriv(self, output: bool): po.oblnkl(self.outfile) po.ocmmnt(self.outfile, "Neutral beam power balance :") po.ocmmnt(self.outfile, "----------------------------") - if (current_drive_variables.iefrf == 5) or ( - current_drive_variables.iefrf == 8 + if (current_drive_variables.i_hcd_primary == 5) or ( + current_drive_variables.i_hcd_primary == 8 ): po.ovarrf( self.outfile, diff --git a/process/init.py b/process/init.py index a53c2ae5d2..2ee60a6557 100644 --- a/process/init.py +++ b/process/init.py @@ -1011,8 +1011,8 @@ def check_process(inputs): # noqa: ARG001 # If there is no NBI, then hot beam density should be zero if fortran.current_drive_variables.irfcd == 1: if ( - fortran.current_drive_variables.iefrf != 5 - and fortran.current_drive_variables.iefrf != 8 + fortran.current_drive_variables.i_hcd_primary != 5 + and fortran.current_drive_variables.i_hcd_primary != 8 ): fortran.physics_variables.f_nd_beam_electron = 0.0 else: diff --git a/process/input.py b/process/input.py index f15a327a8b..8067aa9abf 100644 --- a/process/input.py +++ b/process/input.py @@ -1488,7 +1488,7 @@ def __post_init__(self): "i_blkt_dual_coolant": InputVariable( fortran.fwbs_variables, int, choices=[0, 1, 2] ), - "iefrf": InputVariable(fortran.current_drive_variables, int, range=(1, 13)), + "i_hcd_primary": InputVariable(fortran.current_drive_variables, int, range=(1, 13)), "iefrffix": InputVariable(fortran.current_drive_variables, int, range=(0, 13)), "i_blkt_liquid_breeder_channel_type": InputVariable( fortran.fwbs_variables, int, choices=[0, 1, 2] diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 0b8ab0f38c..d679eeccad 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -506,7 +506,7 @@ def color_key(axis, mfile_data, scan, colour_scheme): ("PF coils", "none"), ] - if (mfile_data.data["iefrf"].get_scan(scan) in [5, 8]) or ( + if (mfile_data.data["i_hcd_primary"].get_scan(scan) in [5, 8]) or ( mfile_data.data["iefrffix"].get_scan(scan) in [5, 8] ): labels.append(("NB duct shield", NBSHIELD_COLOUR[colour_scheme - 1])) @@ -648,8 +648,8 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): facecolor=TFC_COLOUR[colour_scheme - 1], ) - iefrf = mfile_data.data["iefrf"].get_scan(scan) - if (iefrf == 5) or (iefrf == 8): + i_hcd_primary = mfile_data.data["i_hcd_primary"].get_scan(scan) + if (i_hcd_primary == 5) or (i_hcd_primary == 8): # Neutral beam geometry a = w b = dr_tf_outboard @@ -3032,23 +3032,29 @@ def plot_current_drive_info(axis, mfile_data, scan): xmax = 1 ymin = -16 ymax = 1 - iefrf = mfile_data.data["iefrf"].get_scan(scan) + i_hcd_primary = mfile_data.data["i_hcd_primary"].get_scan(scan) nbi = False ecrh = False ebw = False lhcd = False iccd = False - if (iefrf == 5) or (iefrf == 8): + if (i_hcd_primary == 5) or (i_hcd_primary == 8): nbi = True axis.text(-0.05, 1, "Neutral Beam Current Drive:", ha="left", va="center") - if (iefrf == 3) or (iefrf == 7) or (iefrf == 10) or (iefrf == 11) or (iefrf == 13): + if ( + (i_hcd_primary == 3) + or (i_hcd_primary == 7) + or (i_hcd_primary == 10) + or (i_hcd_primary == 11) + or (i_hcd_primary == 13) + ): ecrh = True axis.text(-0.05, 1, "Electron Cyclotron Current Drive:", ha="left", va="center") - if iefrf == 12: + if i_hcd_primary == 12: ebw = True axis.text(-0.05, 1, "Electron Bernstein Wave Drive:", ha="left", va="center") - if iefrf in [1, 4, 6]: + if i_hcd_primary in [1, 4, 6]: lhcd = True axis.text( -0.05, @@ -3057,7 +3063,7 @@ def plot_current_drive_info(axis, mfile_data, scan): ha="left", va="center", ) - if iefrf == 2: + if i_hcd_primary == 2: iccd = True axis.text(-0.05, 1, "Ion Cyclotron Current Drive:", ha="left", va="center") @@ -3803,10 +3809,10 @@ def main(args=None): global rtanmax global beamwd - iefrf = int(m_file.data["iefrf"].get_scan(scan)) + i_hcd_primary = int(m_file.data["i_hcd_primary"].get_scan(scan)) iefrffix = int(m_file.data["iefrffix"].get_scan(scan)) - if (iefrf in [5, 8]) or (iefrffix in [5, 8]): + if (i_hcd_primary in [5, 8]) or (iefrffix in [5, 8]): nbshield = m_file.data["nbshield"].get_scan(scan) rtanbeam = m_file.data["rtanbeam"].get_scan(scan) rtanmax = m_file.data["rtanmax"].get_scan(scan) diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 1336ffa9b4..224b3caca4 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -148,7 +148,7 @@ module current_drive_variables real(dp) :: xi_ebw !! User scaling input for EBW plasma heating. Default 0.43 - integer :: iefrf + integer :: i_hcd_primary !! Switch for current drive efficiency model: !! !! - =1 Fenstermacher Lower Hybrid diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 66ad7139ba..caa654a5c4 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -527,7 +527,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.7282E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 @@ -1642,7 +1642,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 3a1650544f..8a08bc861c 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -528,7 +528,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.7282E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 @@ -1643,7 +1643,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 10d9065b2a..7f9a6db639 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -528,7 +528,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.7282E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 @@ -1643,7 +1643,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 9d7b41d9da..95f0db6634 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -528,7 +528,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.7282E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 @@ -1643,7 +1643,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 3ce1fa730d..d4714e3cbb 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -453,7 +453,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index eec61a63c9..dc269cf439 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -525,7 +525,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.7174E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 @@ -1644,7 +1644,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index c7d9f28a27..a5662ddad3 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -163,7 +163,7 @@ output_costs = 1 * Switch for costs output; bootstrap_current_fraction_max = 0.95 * maximum fraction of plasma current from bootstrap; if `bscfmax < 0`; etaech = 0.5 * ECH wall plug to injector efficiency gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) -iefrf = 10 * Switch for current drive efficiency model; +i_hcd_primary = 10 * Switch for current drive efficiency model; pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) pinjalw = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 7550c0e1c9..121ab9d69d 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -166,7 +166,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) *-------------Current Drive Variables--------------* bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; -iefrf = 10 * Switch for current drive efficiency model; +i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) etaech = 0.4 * ECRH wall-plug efficiency pinjalw = 51.0 * Maximum allowable value for injected power (mw) diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index aaa2aca428..56516aafa6 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -530,7 +530,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5332E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -1693,7 +1693,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5255E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -2856,7 +2856,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5269E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.5891E-01 @@ -4019,7 +4019,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5404E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -5182,7 +5182,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5329E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -6345,7 +6345,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5194E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -7508,7 +7508,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5322E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -8671,7 +8671,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5325E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -9834,7 +9834,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5315E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -10997,7 +10997,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5484E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -12160,7 +12160,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5510E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -13323,7 +13323,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5481E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -14486,7 +14486,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5640E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -15649,7 +15649,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5713E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -16812,7 +16812,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.5790E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 @@ -17930,7 +17930,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index c32050fc23..65ec13a6ba 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -385,7 +385,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -1380,7 +1380,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -2375,7 +2375,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -3370,7 +3370,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -4365,7 +4365,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -5360,7 +5360,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -6355,7 +6355,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -7350,7 +7350,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -8345,7 +8345,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.3962E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 @@ -9145,7 +9145,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) *-------------Current Drive Variables--------------* bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; -iefrf = 10 * Switch for current drive efficiency model; +i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) etaech = 0.4 * ECRH wall-plug efficiency pinjalw = 51.0 * Maximum allowable value for injected power (mw) diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 9cb3d0124a..79806c6d8a 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -166,7 +166,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) *-------------Current Drive Variables--------------* bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; -iefrf = 10 * Switch for current drive efficiency model; +i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) etaech = 0.4 * ECRH wall-plug efficiency pinjalw = 51.0 * Maximum allowable value for injected power (mw) diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index c03898ed21..82918a0aa7 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -166,7 +166,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) *-------------Current Drive Variables--------------* bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; -iefrf = 10 * Switch for current drive efficiency model; +i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) etaech = 0.4 * ECRH wall-plug efficiency pinjalw = 51.0 * Maximum allowable value for injected power (mw) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 546720a82c..390785a035 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2429,7 +2429,7 @@ "INT_DEFAULT" ], "idivrt": 2.0, - "iefrf": 5.0, + "i_hcd_primary": 5.0, "iefrffix": 0.0, "i_beta_fast_alpha": 1.0, "ife": 0.0, @@ -9768,7 +9768,7 @@ "i_diamagnetic_current": "switch for diamagnetic current scaling\n
    \n
  • =0 Do not calculate
    • \n
  • =1 Use original TART scaling
    • \n
  • =2 Use SCENE scaling
    • \n
", "idiags": "", "idivrt": "number of divertors (calculated from `i_single_null`)", - "iefrf": "Switch for current drive efficiency model:\n
    \n
  • =1 Fenstermacher Lower Hybrid
    • \n
  • =2 Ion Cyclotron current drive
    • \n
  • =3 Fenstermacher ECH
    • \n
  • =4 Ehst Lower Hybrid
    • \n
  • =5 ITER Neutral Beam
    • \n
  • =6 new Culham Lower Hybrid model
    • \n
  • =7 new Culham ECCD model
    • \n
  • =8 new Culham Neutral Beam model
    • \n
  • =9 RFP option removed in PROCESS (issue #508)
    • \n
  • =10 ECRH user input gamma
    • \n
  • =11 ECRH \"HARE\" model (E. Poli, Physics of Plasmas 2019)
    • \n
  • =12 EBW user scaling input. Scaling (S. Freethy)
    • \n
", + "i_hcd_primary": "Switch for current drive efficiency model:\n
    \n
  • =1 Fenstermacher Lower Hybrid
    • \n
  • =2 Ion Cyclotron current drive
    • \n
  • =3 Fenstermacher ECH
    • \n
  • =4 Ehst Lower Hybrid
    • \n
  • =5 ITER Neutral Beam
    • \n
  • =6 new Culham Lower Hybrid model
    • \n
  • =7 new Culham ECCD model
    • \n
  • =8 new Culham Neutral Beam model
    • \n
  • =9 RFP option removed in PROCESS (issue #508)
    • \n
  • =10 ECRH user input gamma
    • \n
  • =11 ECRH \"HARE\" model (E. Poli, Physics of Plasmas 2019)
    • \n
  • =12 EBW user scaling input. Scaling (S. Freethy)
    • \n
", "iefrffix": "Switch for 2nd current drive efficiency model:\n
    \n
  • =0 No fixed current drive
    • \n
  • =1 Fenstermacher Lower Hybrid
    • \n
  • =2 Ion Cyclotron current drive
    • \n
  • =3 Fenstermacher ECH
    • \n
  • =4 Ehst Lower Hybrid
    • \n
  • =5 ITER Neutral Beam
    • \n
  • =6 new Culham Lower Hybrid model
    • \n
  • =7 new Culham ECCD model
    • \n
  • =8 new Culham Neutral Beam model
    • \n
  • =9 RFP option removed in PROCESS (issue #508)
    • \n
  • =10 ECRH user input gamma
    • \n
  • =11 ECRH \"HARE\" model (E. Poli, Physics of Plasmas 2019)
    • \n
  • =12 EBW user scaling input. Scaling (S. Freethy)
    • \n
", "i_beta_fast_alpha": "switch for fast alpha pressure calculation\n
    \n
  • =0 ITER physics rules (Uckan) fit
    • \n
  • =1 Modified fit (D. Ward) - better at high temperature
    • \n
", "ife": "Switch for IFE option:\n
    \n
  • =0 use tokamak, RFP or stellarator model
    • \n
  • =1 use IFE model
    • \n
", @@ -13207,7 +13207,7 @@ "lb": 0, "ub": 2 }, - "iefrf": { + "i_hcd_primary": { "lb": 1, "ub": 12 }, @@ -17646,7 +17646,7 @@ "gamcd", "gamma_ecrh", "xi_ebw", - "iefrf", + "i_hcd_primary", "iefrffix", "irfcd", "nbshinef", @@ -20242,7 +20242,7 @@ "i_plasma_current": "int_variable", "i_density_limit": "int_variable", "i_diamagnetic_current": "int_variable", - "iefrf": "int_variable", + "i_hcd_primary": "int_variable", "iefrffix": "int_variable", "i_beta_fast_alpha": "int_variable", "ife": "int_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 558a41178f..591d8aee27 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -456,7 +456,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 21a8877461..5879da9589 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -438,7 +438,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 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 6eec76ee58..10055b0d99 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -163,7 +163,7 @@ output_costs = 1 * Switch for costs output; bootstrap_current_fraction_max = 0.95 * maximum fraction of plasma current from bootstrap; if `bootstrap_current_fraction_max < 0`; etaech = 0.5 * ECH wall plug to injector efficiency gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) -iefrf = 10 * Switch for current drive efficiency model; +i_hcd_primary = 10 * Switch for current drive efficiency model; pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) pinjalw = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) 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 522e88e780..5a40f141be 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -199,7 +199,7 @@ harnum = 2 * cyclotron harmonic frequency number; used in cut-off function wave_mode = 0 * Switch for ECRH wave mode ; etaech = 0.45 * ECH wall plug to injector efficiency feffcd = 1.0 * current drive efficiency fudge factor (`iteration variable 47`) -iefrf = 13 * Switch for current drive efficiency model; +i_hcd_primary = 13 * Switch for current drive efficiency model; irfcd = 1 * Switch for current drive calculation; pinjalw = 150.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index da3f351376..0c98651e04 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2671,7 +2671,7 @@ irfcd = 1 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Primary H&CD System ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -iefrf = 13 +i_hcd_primary = 13 * DESCRIPTION Switch for Current Drive Efficiency Model (10: ECRH User Input gamma) * 1 Fenstermacher Lower Hybrid * 2 Ion Cyclotron current drive diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 31005741ce..8cd3ddf02a 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -454,7 +454,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index d013ea3436..4a9ddcea3c 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -525,7 +525,7 @@ Burn-up_fraction________________________________________________________ (burnup)______________________ 1.7174E-01 # Energy confinement times, and required H-factors : # # Current Drive System # - Current_drive_efficiency_model__________________________________________ (iefrf)_______________________ 10 + Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 @@ -1645,7 +1645,7 @@ t_precharge = 500.0 bootstrap_current_fraction_max = 0.95 * Switch for current drive efficiency model -iefrf = 10 +i_hcd_primary = 10 * ECRH gamma_CD (user input) gamma_ecrh = 0.30 diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py index 111a6e4b21..78ee83dfb6 100644 --- a/tests/unit/test_buildings.py +++ b/tests/unit/test_buildings.py @@ -130,7 +130,7 @@ class BldgsSizesParam(NamedTuple): qnty_sfty_fac: Any hotcell_h: Any hot_sepdist: Any - iefrf: Any + i_hcd_primary: Any n_tf_coils: Any i_tf_sup: Any r_pf_coil_outer_max: Any @@ -273,7 +273,7 @@ class BldgsSizesParam(NamedTuple): qnty_sfty_fac=2, hotcell_h=12, hot_sepdist=2, - iefrf=10, + i_hcd_primary=10, n_tf_coils=16, i_tf_sup=1, r_pf_coil_outer_max=18.98258241468535, @@ -412,7 +412,7 @@ class BldgsSizesParam(NamedTuple): qnty_sfty_fac=2, hotcell_h=12, hot_sepdist=2, - iefrf=10, + i_hcd_primary=10, n_tf_coils=16, i_tf_sup=1, r_pf_coil_outer_max=18.982980877139834, @@ -671,7 +671,9 @@ def test_bldgs_sizes(buildings, bldgssizesparam, monkeypatch): ) monkeypatch.setattr(buildings_variables, "hotcell_h", bldgssizesparam.hotcell_h) monkeypatch.setattr(buildings_variables, "hot_sepdist", bldgssizesparam.hot_sepdist) - monkeypatch.setattr(current_drive_variables, "iefrf", bldgssizesparam.iefrf) + monkeypatch.setattr( + current_drive_variables, "i_hcd_primary", bldgssizesparam.i_hcd_primary + ) monkeypatch.setattr(tfcoil_variables, "n_tf_coils", bldgssizesparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "i_tf_sup", bldgssizesparam.i_tf_sup) monkeypatch.setattr( diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 800e11c494..c916394399 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2883,7 +2883,7 @@ class Acc223Param(NamedTuple): plhybd: Any = None - iefrf: Any = None + i_hcd_primary: Any = None echpwr: Any = None @@ -2945,7 +2945,7 @@ class Acc223Param(NamedTuple): cdcost=0, fcdfuel=0.10000000000000001, plhybd=0, - iefrf=10, + i_hcd_primary=10, echpwr=51.978447720428512, p_beam_injected=0, dcdrv2=59.899999999999999, @@ -2980,7 +2980,7 @@ class Acc223Param(NamedTuple): cdcost=140.341808845157, fcdfuel=0.10000000000000001, plhybd=0, - iefrf=10, + i_hcd_primary=10, echpwr=51.978447720428512, p_beam_injected=0, dcdrv2=59.899999999999999, @@ -3038,7 +3038,9 @@ def test_acc223(acc223param, monkeypatch, costs): monkeypatch.setattr(current_drive_variables, "plhybd", acc223param.plhybd) - monkeypatch.setattr(current_drive_variables, "iefrf", acc223param.iefrf) + monkeypatch.setattr( + current_drive_variables, "i_hcd_primary", acc223param.i_hcd_primary + ) monkeypatch.setattr(current_drive_variables, "echpwr", acc223param.echpwr) diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 86c90e16cc..6f212556c1 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -37,7 +37,7 @@ class CudrivParam(NamedTuple): porbitlossmw: Any = None - iefrf: Any = None + i_hcd_primary: Any = None iefrffix: Any = None @@ -211,7 +211,7 @@ class CudrivParam(NamedTuple): plhybd=0, beam_current=0, porbitlossmw=0, - iefrf=10, + i_hcd_primary=10, iefrffix=0, pheat=75, pheatfix=0, @@ -301,7 +301,7 @@ class CudrivParam(NamedTuple): plhybd=0, beam_current=0, porbitlossmw=0, - iefrf=10, + i_hcd_primary=10, iefrffix=0, pheat=75, pheatfix=0, @@ -416,7 +416,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): current_drive_variables, "porbitlossmw", cudrivparam.porbitlossmw ) - monkeypatch.setattr(current_drive_variables, "iefrf", cudrivparam.iefrf) + monkeypatch.setattr( + current_drive_variables, "i_hcd_primary", cudrivparam.i_hcd_primary + ) monkeypatch.setattr(current_drive_variables, "iefrffix", cudrivparam.iefrffix) From 9dd374632bb1b1ccef27383ba769f0914858b49b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:40:20 +0100 Subject: [PATCH 05/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20iefrffix=20to=20i?= =?UTF-8?q?=5Fhcd=5Fsecondary=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NBI/culham_nb.md | 2 +- .../heating_and_current_drive/NBI/iter_nb.md | 2 +- .../RF/culham_electron_cyclotron.md | 2 +- .../RF/culham_lower_hybrid.md | 2 +- .../RF/cutoff_ecrh.md | 2 +- .../RF/ecrh_gamma.md | 2 +- .../RF/ehst_lower_hybrid.md | 2 +- ...stermacher_electron_cyclotron_resonance.md | 2 +- .../RF/fenstermacher_lower_hybrid.md | 2 +- .../heating_and_current_drive/RF/ic_model.md | 2 +- .../heating-and-current-drive.md | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- process/build.py | 2 +- process/current_drive.py | 76 +++++++++---------- process/input.py | 4 +- process/io/plot_proc.py | 42 +++++----- source/fortran/current_drive_variables.f90 | 2 +- .../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/ref_dicts.json | 10 +-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_current_drive.py | 10 ++- 29 files changed, 97 insertions(+), 93 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md index ea06bd7b5f..5777796069 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md @@ -1,6 +1,6 @@ # Culham Neutral Beam Model | `culnbi()` -- `i_hcd_primary/iefrffix` = 8 +- `i_hcd_primary/i_hcd_secondary` = 8 diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md index 0b127fab5e..231972761f 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md @@ -1,6 +1,6 @@ # ITER Neutral Beam Model | `iternb()` -- `i_hcd_primary/iefrffix` = 5 +- `i_hcd_primary/i_hcd_secondary` = 5 | Output | Description | |----------|-------------| diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_electron_cyclotron.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_electron_cyclotron.md index 4658cdfe70..d96828bd92 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_electron_cyclotron.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_electron_cyclotron.md @@ -1,6 +1,6 @@ # Culham Electron Cyclotron Model | `culecd()` -- `i_hcd_primary/iefrffix` = 7 +- `i_hcd_primary/i_hcd_secondary` = 7 This routine calculates the current drive parameters for a electron cyclotron system, based on the AEA FUS 172 model[^1] diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_lower_hybrid.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_lower_hybrid.md index a3055972d9..54d815f807 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_lower_hybrid.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/culham_lower_hybrid.md @@ -1,6 +1,6 @@ # Culham Lower Hybrid | `cullhy()` -- `i_hcd_primary/iefrffix` = 6 +- `i_hcd_primary/i_hcd_secondary` = 6 This routine calculates the current drive parameters for a lower hybrid system, based on the AEA FUS 172 model. diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md index 26e5ab7aca..92af22f8bd 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md @@ -1,6 +1,6 @@ # ECRH with Cutoff -- `i_hcd_primary/iefrffix` = 13 +- `i_hcd_primary/i_hcd_secondary` = 13 | Input | Description | |-------|-------------| diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md index 4be7abf113..d8c4b4b300 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md @@ -1,6 +1,6 @@ # ECRH User Input Gamma Model -- `i_hcd_primary/iefrffix` = 10 +- `i_hcd_primary/i_hcd_secondary` = 10 This model allows the user to input a scaling factor to the current drive efficiency with the variable `gamma_ecrh`. The value of this variable should follow the value and form of the expression below: diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ehst_lower_hybrid.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ehst_lower_hybrid.md index e0d9f69ce9..d9d8bbce47 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ehst_lower_hybrid.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ehst_lower_hybrid.md @@ -1,5 +1,5 @@ # Ehst Lower Hybrid -- `i_hcd_primary/iefrffix` = 4 +- `i_hcd_primary/i_hcd_secondary` = 4 $$ \text{Current drive efficiency [A/W]} = \frac{T_{\text{e}}^{0.77} (0.034 + 0.196\beta)}{R_0 n_{\text{e},20}}\frac{\frac{32}{5+Z_{\text{eff}}}+2+\frac{\frac{12\left(6+Z_{\text{eff}}\right)}{5+Z_{\text{eff}}}}{3+Z_{\text{eff}}}+\frac{3.76}{Z_{\text{eff}}}}{12.507} $$ diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_electron_cyclotron_resonance.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_electron_cyclotron_resonance.md index 2ef11cc625..0cbdc459a1 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_electron_cyclotron_resonance.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_electron_cyclotron_resonance.md @@ -1,6 +1,6 @@ # Fenstermacher Electron Cyclotron Resonance -- `i_hcd_primary/iefrffix` = 3 +- `i_hcd_primary/i_hcd_secondary` = 3 $$ \text{Current drive efficiency [A/W]} = \frac{0.21 T_{\langle e,n_{\text{e}} \rangle}}{R_0n_{\text{e,20}}(31.0-(\log{n_{\text{e}}}/2)+(\log{(T_\text{e}}\times1000))} $$ diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_lower_hybrid.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_lower_hybrid.md index d88ee4ca22..11c72f2714 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_lower_hybrid.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_lower_hybrid.md @@ -1,6 +1,6 @@ # Fenstermacher Lower Hybrid -- `i_hcd_primary/iefrffix` = 1: +- `i_hcd_primary/i_hcd_secondary` = 1: $$ \text{Current drive efficiency [A/W]} = 0.36 \frac{(1+(T_{\text{e}}/25)^{1.16})}{R_{0} n_{\text{e},20}} diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ic_model.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ic_model.md index 3793582031..c1cff1ae44 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ic_model.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ic_model.md @@ -1,6 +1,6 @@ # Ion cyclotron model -- `i_hcd_primary/iefrffix` = 2 +- `i_hcd_primary/i_hcd_secondary` = 2 $$ \text{Current drive efficiency [A/W]} = \frac{\frac{0.063 T_{\langle \text{e}, n_{\text{e}}\rangle}}{2+Z_{\text{eff}}}}{R_0n_{\text{e,20}}} diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md index f6082501a0..28326d26e4 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md @@ -31,7 +31,7 @@ Similarly the lower bound on required heating and current drive power can be set ### Secondary current drive -It is possible to have more than one type of heating and current drive system in `PROCESS`. This can be enabled by setting the `iefrffix` switch to the desired current drive scheme, following the same numbered selection for `i_hcd_primary`. +It is possible to have more than one type of heating and current drive system in `PROCESS`. This can be enabled by setting the `i_hcd_secondary` switch to the desired current drive scheme, following the same numbered selection for `i_hcd_primary`. The power injected by the secondary current drive scheme has to be set to a fixed value. This value can be set with the `pinjfixmw` variable. ## Plasma heating only diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 937648dc7f..7d2140146a 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -529,7 +529,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 + Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index d7e22947fb..327af1d0a4 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -529,7 +529,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 + Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 833e357044..5b41043880 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -529,7 +529,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 + Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 935ec729da..b3e9db3b59 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -529,7 +529,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 + Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 diff --git a/process/build.py b/process/build.py index 5bd6242a46..b67abe7096 100644 --- a/process/build.py +++ b/process/build.py @@ -2422,7 +2422,7 @@ def calculate_radial_build(self, output: bool) -> None: ) if (current_drive_variables.i_hcd_primary in [5, 8]) or ( - current_drive_variables.iefrffix in [5, 8] + current_drive_variables.i_hcd_secondary in [5, 8] ): po.ovarre( self.mfile, diff --git a/process/current_drive.py b/process/current_drive.py index a1ae491496..b47258ba83 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -52,7 +52,7 @@ def cudriv(self, output: bool): # To stop issues with input file we force # zero secondary heating if no injection method - if current_drive_variables.iefrffix == 0: + if current_drive_variables.i_hcd_secondary == 0: current_drive_variables.pheatfix = 0.0 # check for unphysically large heating in @@ -70,10 +70,10 @@ def cudriv(self, output: bool): # If present we must calculate second current drive # efficiencies in units of Amps/Watt using the fixed # values from user input - # current_drive_variables.iefrffix | switch for fixed current drive efficiency model + # current_drive_variables.i_hcd_secondary | switch for fixed current drive efficiency model # Fenstermacher Lower Hybrid model - if current_drive_variables.iefrffix == 1: + if current_drive_variables.i_hcd_secondary == 1: effrfssfix = ( (0.36e0 * (1.0e0 + (physics_variables.te / 25.0e0) ** 1.16e0)) / (physics_variables.rmajor * dene20) @@ -81,7 +81,7 @@ def cudriv(self, output: bool): ) effcdfix = effrfssfix # Ion-Cyclotron current drive - elif current_drive_variables.iefrffix == 2: + elif current_drive_variables.i_hcd_secondary == 2: effrfssfix = ( 0.63e0 * 0.1e0 @@ -92,7 +92,7 @@ def cudriv(self, output: bool): ) effcdfix = effrfssfix # Fenstermacher Electron Cyclotron Resonance model - elif current_drive_variables.iefrffix == 3: + elif current_drive_variables.i_hcd_secondary == 3: effrfssfix = ( 0.21e0 * physics_variables.ten @@ -101,7 +101,7 @@ def cudriv(self, output: bool): ) effcdfix = effrfssfix # Ehst Lower Hybrid / Fast Wave current drive - elif current_drive_variables.iefrffix == 4: + elif current_drive_variables.i_hcd_secondary == 4: effrfssfix = ( physics_variables.te**0.77e0 * (0.034e0 + 0.196e0 * physics_variables.beta) @@ -118,7 +118,7 @@ def cudriv(self, output: bool): * current_drive_variables.feffcd ) effcdfix = effrfssfix - elif current_drive_variables.iefrffix == 5: + elif current_drive_variables.i_hcd_secondary == 5: ( effnbss, current_drive_variables.fpion, @@ -127,17 +127,17 @@ def cudriv(self, output: bool): effnbssfix = effnbss * current_drive_variables.feffcd effcdfix = effnbssfix # Culham Lower Hybrid current drive model - elif current_drive_variables.iefrffix == 6: + elif current_drive_variables.i_hcd_secondary == 6: effrfss = self.cullhy() effrfssfix = effrfss * current_drive_variables.feffcd effcdfix = effrfssfix # Culham ECCD model - elif current_drive_variables.iefrffix == 7: + elif current_drive_variables.i_hcd_secondary == 7: effrfss = self.culecd() effrfssfix = effrfss * current_drive_variables.feffcd effcdfix = effrfssfix # Culham Neutral Beam model - elif current_drive_variables.iefrffix == 8: + elif current_drive_variables.i_hcd_secondary == 8: ( effnbss, current_drive_variables.fpion, @@ -146,7 +146,7 @@ def cudriv(self, output: bool): effnbssfix = effnbss * current_drive_variables.feffcd effcdfix = effnbssfix # ECRH user input gamma - elif current_drive_variables.iefrffix == 10: + elif current_drive_variables.i_hcd_secondary == 10: # Normalised current drive efficiency gamma current_drive_variables.gamcd = current_drive_variables.gamma_ecrh @@ -156,7 +156,7 @@ def cudriv(self, output: bool): ) effcdfix = effrfssfix # EBW scaling - elif current_drive_variables.iefrffix == 12: + elif current_drive_variables.i_hcd_secondary == 12: # Scaling author Simon Freethy # Ref : PROCESS issue 1262 # Normalised current drive efficiency gamma @@ -200,7 +200,7 @@ def cudriv(self, output: bool): effcdfix = effcdfix * density_factor effrfssfix = effrfssfix * density_factor - elif current_drive_variables.iefrffix == 13: + elif current_drive_variables.i_hcd_secondary == 13: # ECCD model for O-mode cut-off with added Te and Zeff dependance # Scaling author: Simon Freethy # Ref : PROCESS issue #2994 @@ -256,12 +256,12 @@ def cudriv(self, output: bool): ) ) effcdfix = effrfssfix * cutoff_factor - elif current_drive_variables.iefrffix != 0: + elif current_drive_variables.i_hcd_secondary != 0: raise ProcessValueError( - f"Current drive switch is invalid: {current_drive_variables.iefrffix = }" + f"Current drive switch is invalid: {current_drive_variables.i_hcd_secondary = }" ) - if current_drive_variables.iefrffix in [1, 2, 4, 6]: + if current_drive_variables.i_hcd_secondary in [1, 2, 4, 6]: # Injected power pinjemwfix = current_drive_variables.pinjfixmw @@ -288,7 +288,7 @@ def cudriv(self, output: bool): aux_current_fraction_fix = ( auxiliary_cdfix / physics_variables.plasma_current ) - elif current_drive_variables.iefrffix in [3, 7, 10, 12, 13]: + elif current_drive_variables.i_hcd_secondary in [3, 7, 10, 12, 13]: # Injected power pinjemwfix = current_drive_variables.pinjfixmw @@ -312,7 +312,7 @@ def cudriv(self, output: bool): aux_current_fraction_fix = ( auxiliary_cdfix / physics_variables.plasma_current ) - elif current_drive_variables.iefrffix in [5, 8]: + elif current_drive_variables.i_hcd_secondary in [5, 8]: # Account for first orbit losses # (power due to particles that are ionised but not thermalised) [MW]: # This includes a second order term in shinethrough*(first orbit loss) @@ -747,21 +747,21 @@ def cudriv(self, output: bool): current_drive_variables.i_hcd_primary, ) - if current_drive_variables.iefrffix in [1, 4, 6]: + if current_drive_variables.i_hcd_secondary in [1, 4, 6]: po.ocmmnt(self.outfile, "Lower Hybrid Current Drive") - elif current_drive_variables.iefrffix == 2: + elif current_drive_variables.i_hcd_secondary == 2: po.ocmmnt(self.outfile, "Ion Cyclotron Current Drive") - elif current_drive_variables.iefrffix in [3, 7]: + elif current_drive_variables.i_hcd_secondary in [3, 7]: po.ocmmnt(self.outfile, "Electron Cyclotron Current Drive") - elif current_drive_variables.iefrffix in [5, 8]: + elif current_drive_variables.i_hcd_secondary in [5, 8]: po.ocmmnt(self.outfile, "Neutral Beam Current Drive") - elif current_drive_variables.iefrffix == 10: + elif current_drive_variables.i_hcd_secondary == 10: po.ocmmnt( self.outfile, "Electron Cyclotron Current Drive (user input gamma_CD)" ) - elif current_drive_variables.iefrffix == 12: + elif current_drive_variables.i_hcd_secondary == 12: po.ocmmnt(self.outfile, "EBW current drive") - elif current_drive_variables.iefrffix == 13: + elif current_drive_variables.i_hcd_secondary == 13: po.ocmmnt( self.outfile, "Electron Cyclotron Current Drive (O-mode cutoff with Zeff & Te)", @@ -770,8 +770,8 @@ def cudriv(self, output: bool): po.ovarin( self.outfile, "Secondary current drive efficiency model", - "(iefrffix)", - current_drive_variables.iefrffix, + "(i_hcd_secondary)", + current_drive_variables.i_hcd_secondary, ) if physics_variables.ignite == 1: @@ -812,7 +812,7 @@ def cudriv(self, output: bool): "(bootstrap_current_fraction_max)", current_drive_variables.bootstrap_current_fraction_max, ) - if current_drive_variables.iefrffix != 0: + if current_drive_variables.i_hcd_secondary != 0: po.ovarre( self.outfile, "Power injected for main current drive (MW)", @@ -840,7 +840,7 @@ def cudriv(self, output: bool): auxiliary_cd, "OP ", ) - if current_drive_variables.iefrffix != 0: + if current_drive_variables.i_hcd_secondary != 0: po.ovarre( self.outfile, "Secondary auxiliary current drive (A)", @@ -899,7 +899,7 @@ def cudriv(self, output: bool): current_drive_variables.wave_mode, ) - if current_drive_variables.iefrffix != 0: + if current_drive_variables.i_hcd_secondary != 0: po.ovarre( self.outfile, "Secondary current drive efficiency (A/W)", @@ -1026,8 +1026,8 @@ def cudriv(self, output: bool): if ( (current_drive_variables.i_hcd_primary == 5) or (current_drive_variables.i_hcd_primary == 8) - or (current_drive_variables.iefrffix == 5) - or (current_drive_variables.iefrffix == 8) + or (current_drive_variables.i_hcd_secondary == 5) + or (current_drive_variables.i_hcd_secondary == 8) ): po.ovarre( self.outfile, @@ -1046,8 +1046,8 @@ def cudriv(self, output: bool): "OP ", ) - if (current_drive_variables.iefrffix == 5) or ( - current_drive_variables.iefrffix == 8 + if (current_drive_variables.i_hcd_secondary == 5) or ( + current_drive_variables.i_hcd_secondary == 8 ): po.ovarre( self.outfile, @@ -1064,8 +1064,8 @@ def cudriv(self, output: bool): self.outfile, "Beam efficiency (A/W)", "(effnbss)", effnbss, "OP " ) - if (current_drive_variables.iefrffix == 5) or ( - current_drive_variables.iefrffix == 8 + if (current_drive_variables.i_hcd_secondary == 5) or ( + current_drive_variables.i_hcd_secondary == 8 ): po.ovarre( self.outfile, @@ -1156,8 +1156,8 @@ def cudriv(self, output: bool): "OP ", ) - if (current_drive_variables.iefrffix == 5) or ( - current_drive_variables.iefrffix == 8 + if (current_drive_variables.i_hcd_secondary == 5) or ( + current_drive_variables.i_hcd_secondary == 8 ): po.oblnkl(self.outfile) po.ocmmnt(self.outfile, "Secondary fixed neutral beam power balance :") diff --git a/process/input.py b/process/input.py index 8067aa9abf..382c67eef0 100644 --- a/process/input.py +++ b/process/input.py @@ -1489,7 +1489,9 @@ def __post_init__(self): fortran.fwbs_variables, int, choices=[0, 1, 2] ), "i_hcd_primary": InputVariable(fortran.current_drive_variables, int, range=(1, 13)), - "iefrffix": InputVariable(fortran.current_drive_variables, int, range=(0, 13)), + "i_hcd_secondary": InputVariable( + fortran.current_drive_variables, int, range=(0, 13) + ), "i_blkt_liquid_breeder_channel_type": InputVariable( fortran.fwbs_variables, int, choices=[0, 1, 2] ), diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index d679eeccad..ddff2b4bea 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -507,7 +507,7 @@ def color_key(axis, mfile_data, scan, colour_scheme): ] if (mfile_data.data["i_hcd_primary"].get_scan(scan) in [5, 8]) or ( - mfile_data.data["iefrffix"].get_scan(scan) in [5, 8] + mfile_data.data["i_hcd_secondary"].get_scan(scan) in [5, 8] ): labels.append(("NB duct shield", NBSHIELD_COLOUR[colour_scheme - 1])) labels.append(("Cryostat", CRYOSTAT_COLOUR[colour_scheme - 1])) @@ -3067,25 +3067,25 @@ def plot_current_drive_info(axis, mfile_data, scan): iccd = True axis.text(-0.05, 1, "Ion Cyclotron Current Drive:", ha="left", va="center") - if "iefrffix" in mfile_data.data: + if "i_hcd_secondary" in mfile_data.data: secondary_heating = "" - iefrffix = mfile_data.data["iefrffix"].get_scan(scan) + i_hcd_secondary = mfile_data.data["i_hcd_secondary"].get_scan(scan) - if (iefrffix == 5) or (iefrffix == 8): + if (i_hcd_secondary == 5) or (i_hcd_secondary == 8): secondary_heating = "NBI" if ( - (iefrffix == 3) - or (iefrffix == 7) - or (iefrffix == 10) - or (iefrffix == 11) - or (iefrffix == 13) + (i_hcd_secondary == 3) + or (i_hcd_secondary == 7) + or (i_hcd_secondary == 10) + or (i_hcd_secondary == 11) + or (i_hcd_secondary == 13) ): secondary_heating = "ECH" - if iefrffix == 12: + if i_hcd_secondary == 12: secondary_heating = "EBW" - if iefrffix in [1, 4, 6]: + if i_hcd_secondary in [1, 4, 6]: secondary_heating = "LHCD" - if iefrffix == 2: + if i_hcd_secondary == 2: secondary_heating = "ICCD" axis.set_ylim([ymin, ymax]) @@ -3098,7 +3098,7 @@ def plot_current_drive_info(axis, mfile_data, scan): pdivt = mfile_data.data["pdivt"].get_scan(scan) pdivr = pdivt / mfile_data.data["rmajor"].get_scan(scan) - if mfile_data.data["iefrffix"].get_scan(scan) != 0: + if mfile_data.data["i_hcd_secondary"].get_scan(scan) != 0: pinjmwfix = mfile_data.data["pinjmwfix"].get_scan(scan) pdivnr = ( @@ -3142,8 +3142,8 @@ def plot_current_drive_info(axis, mfile_data, scan): (flh, r"$\frac{P_{\mathrm{div}}}{P_{\mathrm{LH}}}$", ""), (hstar, "H* (non-rad. corr.)", ""), ] - # iefrffix is now always in the MFILE with = 0 meaning no fixed heating - if mfile_data.data["iefrffix"].get_scan(scan) != 0: + # i_hcd_secondary is now always in the MFILE with = 0 meaning no fixed heating + if mfile_data.data["i_hcd_secondary"].get_scan(scan) != 0: data.insert( 1, ("pinjmwfix", f"{secondary_heating} secondary auxiliary power", "MW") ) @@ -3169,7 +3169,7 @@ def plot_current_drive_info(axis, mfile_data, scan): (flh, r"$\frac{P_{\mathrm{div}}}{P_{\mathrm{LH}}}$", ""), (hstar, "H* (non-rad. corr.)", ""), ] - if mfile_data.data["iefrffix"].get_scan(scan) != 0: + if mfile_data.data["i_hcd_secondary"].get_scan(scan) != 0: data.insert( 1, ("pinjmwfix", f"{secondary_heating} secondary auxiliary power", "MW") ) @@ -3198,7 +3198,7 @@ def plot_current_drive_info(axis, mfile_data, scan): (flh, r"$\frac{P_{\mathrm{div}}}{P_{\mathrm{LH}}}$", ""), (hstar, "H* (non-rad. corr.)", ""), ] - if "iefrffix" in mfile_data.data: + if "i_hcd_secondary" in mfile_data.data: data.insert( 1, ("pinjmwfix", f"{secondary_heating} secondary auxiliary power", "MW") ) @@ -3227,7 +3227,7 @@ def plot_current_drive_info(axis, mfile_data, scan): (flh, r"$\frac{P_{\mathrm{div}}}{P_{\mathrm{LH}}}$", ""), (hstar, "H* (non-rad. corr.)", ""), ] - if "iefrffix" in mfile_data.data: + if "i_hcd_secondary" in mfile_data.data: data.insert( 1, ("pinjmwfix", f"{secondary_heating} secondary auxiliary power", "MW") ) @@ -3256,7 +3256,7 @@ def plot_current_drive_info(axis, mfile_data, scan): (flh, r"$\frac{P_{\mathrm{div}}}{P_{\mathrm{LH}}}$", ""), (hstar, "H* (non-rad. corr.)", ""), ] - if "iefrffix" in mfile_data.data: + if "i_hcd_secondary" in mfile_data.data: data.insert( 1, ("pinjmwfix", f"{secondary_heating} secondary auxiliary power", "MW") ) @@ -3810,9 +3810,9 @@ def main(args=None): global beamwd i_hcd_primary = int(m_file.data["i_hcd_primary"].get_scan(scan)) - iefrffix = int(m_file.data["iefrffix"].get_scan(scan)) + i_hcd_secondary = int(m_file.data["i_hcd_secondary"].get_scan(scan)) - if (i_hcd_primary in [5, 8]) or (iefrffix in [5, 8]): + if (i_hcd_primary in [5, 8]) or (i_hcd_secondary in [5, 8]): nbshield = m_file.data["nbshield"].get_scan(scan) rtanbeam = m_file.data["rtanbeam"].get_scan(scan) rtanmax = m_file.data["rtanmax"].get_scan(scan) diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 224b3caca4..754870d8ac 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -164,7 +164,7 @@ module current_drive_variables !! - =11 ECRH "HARE" model (E. Poli, Physics of Plasmas 2019). Removed in #1811. !! - =12 EBW user scaling input. Scaling (S. Freethy) - integer :: iefrffix + integer :: i_hcd_secondary !! Switch for 2nd current drive efficiency model: !! !! - =0 No fixed current drive diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index caa654a5c4..481cec48cc 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -528,7 +528,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 + Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 8a08bc861c..6dc917b9e8 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -529,7 +529,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 + Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 7f9a6db639..92887eb217 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -529,7 +529,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 + Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 95f0db6634..8a036b0ce6 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -529,7 +529,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 + Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index dc269cf439..d36eeed7b0 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -526,7 +526,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 + Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 4.7098E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 390785a035..cb1b1809a3 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2430,7 +2430,7 @@ ], "idivrt": 2.0, "i_hcd_primary": 5.0, - "iefrffix": 0.0, + "i_hcd_secondary": 0.0, "i_beta_fast_alpha": 1.0, "ife": 0.0, "ifedrv": 2.0, @@ -9769,7 +9769,7 @@ "idiags": "", "idivrt": "number of divertors (calculated from `i_single_null`)", "i_hcd_primary": "Switch for current drive efficiency model:\n
    \n
  • =1 Fenstermacher Lower Hybrid
    • \n
  • =2 Ion Cyclotron current drive
    • \n
  • =3 Fenstermacher ECH
    • \n
  • =4 Ehst Lower Hybrid
    • \n
  • =5 ITER Neutral Beam
    • \n
  • =6 new Culham Lower Hybrid model
    • \n
  • =7 new Culham ECCD model
    • \n
  • =8 new Culham Neutral Beam model
    • \n
  • =9 RFP option removed in PROCESS (issue #508)
    • \n
  • =10 ECRH user input gamma
    • \n
  • =11 ECRH \"HARE\" model (E. Poli, Physics of Plasmas 2019)
    • \n
  • =12 EBW user scaling input. Scaling (S. Freethy)
    • \n
", - "iefrffix": "Switch for 2nd current drive efficiency model:\n
    \n
  • =0 No fixed current drive
    • \n
  • =1 Fenstermacher Lower Hybrid
    • \n
  • =2 Ion Cyclotron current drive
    • \n
  • =3 Fenstermacher ECH
    • \n
  • =4 Ehst Lower Hybrid
    • \n
  • =5 ITER Neutral Beam
    • \n
  • =6 new Culham Lower Hybrid model
    • \n
  • =7 new Culham ECCD model
    • \n
  • =8 new Culham Neutral Beam model
    • \n
  • =9 RFP option removed in PROCESS (issue #508)
    • \n
  • =10 ECRH user input gamma
    • \n
  • =11 ECRH \"HARE\" model (E. Poli, Physics of Plasmas 2019)
    • \n
  • =12 EBW user scaling input. Scaling (S. Freethy)
    • \n
", + "i_hcd_secondary": "Switch for 2nd current drive efficiency model:\n
    \n
  • =0 No fixed current drive
    • \n
  • =1 Fenstermacher Lower Hybrid
    • \n
  • =2 Ion Cyclotron current drive
    • \n
  • =3 Fenstermacher ECH
    • \n
  • =4 Ehst Lower Hybrid
    • \n
  • =5 ITER Neutral Beam
    • \n
  • =6 new Culham Lower Hybrid model
    • \n
  • =7 new Culham ECCD model
    • \n
  • =8 new Culham Neutral Beam model
    • \n
  • =9 RFP option removed in PROCESS (issue #508)
    • \n
  • =10 ECRH user input gamma
    • \n
  • =11 ECRH \"HARE\" model (E. Poli, Physics of Plasmas 2019)
    • \n
  • =12 EBW user scaling input. Scaling (S. Freethy)
    • \n
", "i_beta_fast_alpha": "switch for fast alpha pressure calculation\n
    \n
  • =0 ITER physics rules (Uckan) fit
    • \n
  • =1 Modified fit (D. Ward) - better at high temperature
    • \n
", "ife": "Switch for IFE option:\n
    \n
  • =0 use tokamak, RFP or stellarator model
    • \n
  • =1 use IFE model
    • \n
", "ifedrv": "Switch for type of IFE driver:\n
    \n
  • =-1 use gainve, etave for gain and driver efficiency
    • \n
  • =0 use tgain, drveff for gain and driver efficiency
    • \n
  • =1 use laser driver based on SOMBRERO design
    • \n
  • =2 use heavy ion beam driver based on OSIRIS
    • \n
  • =3 Input pfusife, rrin and drveff
    • \n
", @@ -13211,7 +13211,7 @@ "lb": 1, "ub": 12 }, - "iefrffix": { + "i_hcd_secondary": { "lb": 0, "ub": 12 }, @@ -17647,7 +17647,7 @@ "gamma_ecrh", "xi_ebw", "i_hcd_primary", - "iefrffix", + "i_hcd_secondary", "irfcd", "nbshinef", "nbshield", @@ -20243,7 +20243,7 @@ "i_density_limit": "int_variable", "i_diamagnetic_current": "int_variable", "i_hcd_primary": "int_variable", - "iefrffix": "int_variable", + "i_hcd_secondary": "int_variable", "i_beta_fast_alpha": "int_variable", "ife": "int_variable", "ifedrv": "int_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 0c98651e04..0a1ccdb3eb 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2721,7 +2721,7 @@ feffcd = 1.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Secondary H&CD System ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -*iefrffix = +*i_hcd_secondary = * DESCRIPTION: Switch for 2nd current drive efficiency model * JUSTIFICATION: Not used, ECRH only diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 4a9ddcea3c..a988ec0936 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -526,7 +526,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Secondary_current_drive_efficiency_model________________________________ (iefrffix)____________________ 0 + Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 4.7098E+00 diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 6f212556c1..9db547ad79 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -39,7 +39,7 @@ class CudrivParam(NamedTuple): i_hcd_primary: Any = None - iefrffix: Any = None + i_hcd_secondary: Any = None pheat: Any = None @@ -212,7 +212,7 @@ class CudrivParam(NamedTuple): beam_current=0, porbitlossmw=0, i_hcd_primary=10, - iefrffix=0, + i_hcd_secondary=0, pheat=75, pheatfix=0, pinjfixmw=0, @@ -302,7 +302,7 @@ class CudrivParam(NamedTuple): beam_current=0, porbitlossmw=0, i_hcd_primary=10, - iefrffix=0, + i_hcd_secondary=0, pheat=75, pheatfix=0, pinjfixmw=0, @@ -420,7 +420,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): current_drive_variables, "i_hcd_primary", cudrivparam.i_hcd_primary ) - monkeypatch.setattr(current_drive_variables, "iefrffix", cudrivparam.iefrffix) + monkeypatch.setattr( + current_drive_variables, "i_hcd_secondary", cudrivparam.i_hcd_secondary + ) monkeypatch.setattr(current_drive_variables, "pheat", cudrivparam.pheat) From 999bf822a5d753f88be2870863bf83c38e969dba Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:42:20 +0100 Subject: [PATCH 06/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20nbshinef=20to=20f?= =?UTF-8?q?=5Fp=5Fbeam=5Fshine=5Fthrough=20for=20clarity=20and=20consisten?= =?UTF-8?q?cy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 22 ++++++++++--------- process/stellarator.py | 6 ++--- source/fortran/constraint_equations.f90 | 8 +++---- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 ++--- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_current_drive.py | 12 ++++++---- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index b47258ba83..cc048a68db 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -122,7 +122,7 @@ def cudriv(self, output: bool): ( effnbss, current_drive_variables.fpion, - current_drive_variables.nbshinef, + current_drive_variables.f_p_beam_shine_through, ) = self.iternb() effnbssfix = effnbss * current_drive_variables.feffcd effcdfix = effnbssfix @@ -141,7 +141,7 @@ def cudriv(self, output: bool): ( effnbss, current_drive_variables.fpion, - current_drive_variables.nbshinef, + current_drive_variables.f_p_beam_shine_through, ) = self.culnbi() effnbssfix = effnbss * current_drive_variables.feffcd effcdfix = effnbssfix @@ -324,11 +324,13 @@ def cudriv(self, output: bool): 1.0e0 - current_drive_variables.f_p_beam_orbit_loss + current_drive_variables.f_p_beam_orbit_loss - * current_drive_variables.nbshinef + * current_drive_variables.f_p_beam_shine_through ) # Shinethrough power (atoms that are not ionised) [MW]: - nbshinemwfix = pnbitotfix * current_drive_variables.nbshinef + nbshinemwfix = ( + pnbitotfix * current_drive_variables.f_p_beam_shine_through + ) # First orbit loss porbitlossmwfix = current_drive_variables.f_p_beam_orbit_loss * ( @@ -413,7 +415,7 @@ def cudriv(self, output: bool): ( effnbss, current_drive_variables.fpion, - current_drive_variables.nbshinef, + current_drive_variables.f_p_beam_shine_through, ) = self.iternb() effnbss = effnbss * current_drive_variables.feffcd current_drive_variables.effcd = effnbss @@ -432,7 +434,7 @@ def cudriv(self, output: bool): ( effnbss, current_drive_variables.fpion, - current_drive_variables.nbshinef, + current_drive_variables.f_p_beam_shine_through, ) = self.culnbi() effnbss = effnbss * current_drive_variables.feffcd current_drive_variables.effcd = effnbss @@ -635,13 +637,13 @@ def cudriv(self, output: bool): 1.0e0 - current_drive_variables.f_p_beam_orbit_loss + current_drive_variables.f_p_beam_orbit_loss - * current_drive_variables.nbshinef + * current_drive_variables.f_p_beam_shine_through ) # Shinethrough power (atoms that are not ionised) [MW]: current_drive_variables.p_beam_shine_through_mw = ( current_drive_variables.p_beam_injected - * current_drive_variables.nbshinef + * current_drive_variables.f_p_beam_shine_through ) # First orbit loss @@ -1094,8 +1096,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Beam shine-through fraction", - "(nbshinef)", - current_drive_variables.nbshinef, + "(f_p_beam_shine_through)", + current_drive_variables.f_p_beam_shine_through, "OP ", ) po.ovarre( diff --git a/process/stellarator.py b/process/stellarator.py index 2b67e02fee..ded67c8ff9 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4960,7 +4960,7 @@ def stheat(self, output: bool): ( effnbss, fpion, - current_drive_variables.nbshinef, + current_drive_variables.f_p_beam_shine_through, ) = self.current_drive.culnbi() current_drive_variables.pnbeam = current_drive_variables.pheat * ( 1 - current_drive_variables.f_p_beam_orbit_loss @@ -5067,8 +5067,8 @@ def stheat(self, output: bool): po.ovarre( self.outfile, "Neutral beam shine-through fraction", - "(nbshinef)", - current_drive_variables.nbshinef, + "(f_p_beam_shine_through)", + current_drive_variables.f_p_beam_shine_through, ) po.ovarre( self.outfile, diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index acac493def..536177da89 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2378,18 +2378,18 @@ subroutine constraint_eqn_059(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fnbshinef : input real : f-value for maximum neutral beam shine-through fraction !! nbshinefmax : input real : maximum neutral beam shine-through fraction - !! nbshinef : input real : neutral beam shine-through fraction + !! f_p_beam_shine_through : input real : neutral beam shine-through fraction use constraint_variables, only: fnbshinef, nbshinefmax - use current_drive_variables, only: nbshinef + use current_drive_variables, only: f_p_beam_shine_through implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con real(dp), intent(out) :: tmp_err character(len=1), intent(out) :: tmp_symbol character(len=10), intent(out) :: tmp_units - tmp_cc = nbshinef/nbshinefmax - 1.0D0 * fnbshinef + tmp_cc = nbshinef/nbshinefmax - 1.0D0 * f_p_beam_shine_through tmp_con = nbshinefmax * (1.0D0 - tmp_cc) - tmp_err = nbshinef * tmp_cc + tmp_err = f_p_beam_shine_through * tmp_cc tmp_symbol = '<' tmp_units = '' end subroutine constraint_eqn_059 diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 754870d8ac..100e2015a6 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -187,7 +187,7 @@ module current_drive_variables !! - =0 turned off !! - =1 turned on - real(dp) :: nbshinef + real(dp) :: f_p_beam_shine_through !! neutral beam shine-through fraction real(dp) :: nbshield diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index cb1b1809a3..1f7ca6861f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3332,7 +3332,7 @@ "n_blkt_inboard_modules_toroidal": 32.0, "n_blkt_outboard_modules_toroidal": 48.0, "nbshield": 0.5, - "nbshinef": 0.0, + "f_p_beam_shine_through": 0.0, "nbshinefmax": 0.001, "p_beam_shine_through_mw": 0.0, "ncalls": 0.0, @@ -10070,7 +10070,7 @@ "n_blkt_inboard_modules_toroidal": "number of inboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`)", "n_blkt_outboard_modules_toroidal": "number of outboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`)", "nbshield": "neutral beam duct shielding thickness (m)", - "nbshinef": "neutral beam shine-through fraction", + "f_p_beam_shine_through": "neutral beam shine-through fraction", "nbshinefmax": "maximum neutral beam shine-through fraction (`constraint equation 59`)", "p_beam_shine_through_mw": "neutral beam shine-through power", "ncalls": "ncalls : number of function calls during solution", @@ -17649,7 +17649,7 @@ "i_hcd_primary", "i_hcd_secondary", "irfcd", - "nbshinef", + "f_p_beam_shine_through", "nbshield", "pheat", "pheatfix", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 0a1ccdb3eb..9b4b303533 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2808,7 +2808,7 @@ feffcd = 1.0 *icc = 59 * DESCRIPTION: Constraint equation for neutral beam shine-through fraction upper limit * JUSTIFICATION: Turned off, not using NBI -* VARIABLES: nbshinefmax (maximum neutral beam shine-through fraction). nbshinef calculated in situ +* VARIABLES: nbshinefmax (maximum neutral beam shine-through fraction). f_p_beam_shine_through calculated in situ *nbshinefmax = * DESCRIPTION: Maximum neutral beam shine-through fraction (`constraint equation 59`) (default = 1.0D-3) diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 9db547ad79..fcb6cafad6 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -53,7 +53,7 @@ class CudrivParam(NamedTuple): fpion: Any = None - nbshinef: Any = None + f_p_beam_shine_through: Any = None gamcd: Any = None @@ -219,7 +219,7 @@ class CudrivParam(NamedTuple): irfcd=1, feffcd=1, fpion=0.5, - nbshinef=0, + f_p_beam_shine_through=0, gamcd=0, gamma_ecrh=0.30000000000000004, etalh=0.29999999999999999, @@ -309,7 +309,7 @@ class CudrivParam(NamedTuple): irfcd=1, feffcd=1, fpion=0.5, - nbshinef=0, + f_p_beam_shine_through=0, gamcd=0.30000000000000004, gamma_ecrh=0.30000000000000004, etalh=0.29999999999999999, @@ -436,7 +436,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "fpion", cudrivparam.fpion) - monkeypatch.setattr(current_drive_variables, "nbshinef", cudrivparam.nbshinef) + monkeypatch.setattr( + current_drive_variables, + "f_p_beam_shine_through", + cudrivparam.f_p_beam_shine_through, + ) monkeypatch.setattr(current_drive_variables, "gamcd", cudrivparam.gamcd) From 4866056efefa03bc7338b7d10d1863fb76e33d5f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:44:25 +0100 Subject: [PATCH 07/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20nbshinefmax=20to?= =?UTF-8?q?=20f=5Fp=5Fbeam=5Fshine=5Fthrough=5Fmax=20for=20clarity=20and?= =?UTF-8?q?=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating_and_current_drive/NBI/nbi_overview.md | 2 +- process/input.py | 2 +- source/fortran/constraint_equations.f90 | 12 ++++++------ source/fortran/constraint_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 10 +++++----- tests/regression/input_files/st_regression.IN.DAT | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md index f2d5af344a..2f491451d5 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md @@ -19,7 +19,7 @@ Input parameter `f_p_beam_orbit_loss` can be used to specify the fraction of the The power in the beam atoms that are not ionised as they pass through the plasma (shine-through) is calculated by the code. There are two constraint equations that can be used to control the beam penetration and deposition, as follows: - It is necessary to use a beam energy that simultaneously gives adequate penetration of the beam to the centre of the plasma and tolerable shine-through of the beam on the wall after the beam has traversed the plasma. The number of exponential decay lengths, $\tau$, for the beam power to fall before it reaches the plasma centre should be in the region of ~ 4-6[^2],. Constraint equation no. 14 may be used to force $\tau$ to be equal to the value given by input parameter `tbeamin`, and is therefore in effect a beam energy consistency equation. -- Alternatively, constraint equation no. 59 with iteration variable no. 105 (`fnbshineef`) may be used to ensure that the beam power fraction emerging from the plasma is no more than the value given by input parameter `nbshinefmax`. +- Alternatively, constraint equation no. 59 with iteration variable no. 105 (`fnbshineef`) may be used to ensure that the beam power fraction emerging from the plasma is no more than the value given by input parameter `f_p_beam_shine_through_max`. It is recommended that only one of these two constraint equations is used during a run. diff --git a/process/input.py b/process/input.py index 382c67eef0..8d89ad6438 100644 --- a/process/input.py +++ b/process/input.py @@ -908,7 +908,7 @@ def __post_init__(self): "nbshield": InputVariable( fortran.current_drive_variables, float, range=(0.01, 0.5) ), - "nbshinefmax": InputVariable( + "f_p_beam_shine_through_max": InputVariable( fortran.constraint_variables, float, range=(1e-20, 0.1) ), "neped": InputVariable(fortran.physics_variables, float, range=(0.0, 1e21)), diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 536177da89..e0d0a4ad91 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2298,7 +2298,7 @@ subroutine constraint_eqn_056(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! residual error in physical units; output string; units string !! Equation for power through separatrix / major radius upper limit !! #=# current_drive - !! #=#=# fnbshinef, nbshinefmax + !! #=#=# fnbshinef, f_p_beam_shine_through_max !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fpsepr : input real : f-value for maximum Psep/R limit @@ -2373,13 +2373,13 @@ subroutine constraint_eqn_059(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! residual error in physical units; output string; units string !! Equation for neutral beam shine-through fraction upper limit !! #=# current_drive - !! #=#=# fnbshinef, nbshinefmax + !! #=#=# fnbshinef, f_p_beam_shine_through_max !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fnbshinef : input real : f-value for maximum neutral beam shine-through fraction - !! nbshinefmax : input real : maximum neutral beam shine-through fraction + !! f_p_beam_shine_through_max : input real : maximum neutral beam shine-through fraction !! f_p_beam_shine_through : input real : neutral beam shine-through fraction - use constraint_variables, only: fnbshinef, nbshinefmax + use constraint_variables, only: fnbshinef, f_p_beam_shine_through_max use current_drive_variables, only: f_p_beam_shine_through implicit none real(dp), intent(out) :: tmp_cc @@ -2387,8 +2387,8 @@ subroutine constraint_eqn_059(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) real(dp), intent(out) :: tmp_err character(len=1), intent(out) :: tmp_symbol character(len=10), intent(out) :: tmp_units - tmp_cc = nbshinef/nbshinefmax - 1.0D0 * f_p_beam_shine_through - tmp_con = nbshinefmax * (1.0D0 - tmp_cc) + tmp_cc = nbshinef/f_p_beam_shine_through_max - 1.0D0 * f_p_beam_shine_through + tmp_con = f_p_beam_shine_through_max * (1.0D0 - tmp_cc) tmp_err = f_p_beam_shine_through * tmp_cc tmp_symbol = '<' tmp_units = '' diff --git a/source/fortran/constraint_variables.f90 b/source/fortran/constraint_variables.f90 index ffb4df99ec..123ee1f5b1 100644 --- a/source/fortran/constraint_variables.f90 +++ b/source/fortran/constraint_variables.f90 @@ -232,7 +232,7 @@ module constraint_variables real(dp) :: mvalim !! maximum MVA limit (`constraint equation 19`) - real(dp) :: nbshinefmax + real(dp) :: f_p_beam_shine_through_max !! maximum neutral beam shine-through fraction (`constraint equation 59`) real(dp) :: nflutfmax @@ -380,7 +380,7 @@ subroutine init_constraint_variables i_q95_fixed = 0 pflux_fw_rad_max = 1.0D0 mvalim = 40.0D0 - nbshinefmax = 1.0D-3 + f_p_beam_shine_through_max = 1.0D-3 nflutfmax = 1.0D23 pdivtlim = 150.0D0 f_fw_rad_max = 3.33D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 1f7ca6861f..3bcda751f2 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3333,7 +3333,7 @@ "n_blkt_outboard_modules_toroidal": 48.0, "nbshield": 0.5, "f_p_beam_shine_through": 0.0, - "nbshinefmax": 0.001, + "f_p_beam_shine_through_max": 0.001, "p_beam_shine_through_mw": 0.0, "ncalls": 0.0, "n_pf_cs_plasma_circuits": 0.0, @@ -10071,7 +10071,7 @@ "n_blkt_outboard_modules_toroidal": "number of outboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`)", "nbshield": "neutral beam duct shielding thickness (m)", "f_p_beam_shine_through": "neutral beam shine-through fraction", - "nbshinefmax": "maximum neutral beam shine-through fraction (`constraint equation 59`)", + "f_p_beam_shine_through_max": "maximum neutral beam shine-through fraction (`constraint equation 59`)", "p_beam_shine_through_mw": "neutral beam shine-through power", "ncalls": "ncalls : number of function calls during solution", "n_pf_cs_plasma_circuits": "number of PF circuits (including central solenoid and plasma)", @@ -13631,7 +13631,7 @@ "lb": 0.01, "ub": 0.5 }, - "nbshinefmax": { + "f_p_beam_shine_through_max": { "lb": 1e-20, "ub": 0.1 }, @@ -17281,7 +17281,7 @@ "gammax", "pflux_fw_rad_max", "mvalim", - "nbshinefmax", + "f_p_beam_shine_through_max", "nflutfmax", "pdivtlim", "f_fw_rad_max", @@ -20355,7 +20355,7 @@ "n_blkt_inboard_modules_toroidal": "int_variable", "n_blkt_outboard_modules_toroidal": "int_variable", "nbshield": "real_variable", - "nbshinefmax": "real_variable", + "f_p_beam_shine_through_max": "real_variable", "n_pf_coils_in_group": "int_array", "neped": "real_variable", "neqns": "int_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 9b4b303533..e784d09e68 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2808,9 +2808,9 @@ feffcd = 1.0 *icc = 59 * DESCRIPTION: Constraint equation for neutral beam shine-through fraction upper limit * JUSTIFICATION: Turned off, not using NBI -* VARIABLES: nbshinefmax (maximum neutral beam shine-through fraction). f_p_beam_shine_through calculated in situ +* VARIABLES: f_p_beam_shine_through_max (maximum neutral beam shine-through fraction). f_p_beam_shine_through calculated in situ -*nbshinefmax = +*f_p_beam_shine_through_max = * DESCRIPTION: Maximum neutral beam shine-through fraction (`constraint equation 59`) (default = 1.0D-3) * JUSTIFICATION: Not set, as not using icc = 59 From 38a787bf2061b5a294c7b76175840802b5fa890a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:50:24 +0100 Subject: [PATCH 08/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20porbitlossmw=20to?= =?UTF-8?q?=20p=5Fbeam=5Forbit=5Floss=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 18 +++++++++--------- process/dcll.py | 2 +- process/hcpb.py | 2 +- process/objectives.py | 2 +- process/power.py | 14 +++++++------- process/stellarator.py | 14 +++++++------- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_ccfe_hcpb.py | 10 ++++++---- tests/unit/test_current_drive.py | 8 ++++---- tests/unit/test_dcll.py | 10 +++++----- 11 files changed, 45 insertions(+), 43 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index cc048a68db..6ad30a3d67 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -37,7 +37,7 @@ def cudriv(self, output: bool): current_drive_variables.plhybd = 0.0e0 current_drive_variables.beam_current = 0.0e0 beam_current_fix = 0.0e0 - current_drive_variables.porbitlossmw = 0.0e0 + current_drive_variables.p_beam_orbit_loss = 0.0e0 porbitlossmwfix = 0.0e0 pinjmw1 = 0.0 @@ -647,7 +647,7 @@ def cudriv(self, output: bool): ) # First orbit loss - current_drive_variables.porbitlossmw = ( + current_drive_variables.p_beam_orbit_loss = ( current_drive_variables.f_p_beam_orbit_loss * ( current_drive_variables.p_beam_injected @@ -659,7 +659,7 @@ def cudriv(self, output: bool): pinjmw1 = ( current_drive_variables.p_beam_injected - current_drive_variables.p_beam_shine_through_mw - - current_drive_variables.porbitlossmw + - current_drive_variables.p_beam_orbit_loss ) pinjimw1 = pinjmw1 * current_drive_variables.fpion pinjemw1 = pinjmw1 * (1.0e0 - current_drive_variables.fpion) @@ -699,7 +699,7 @@ def cudriv(self, output: bool): if ( abs( current_drive_variables.pinjmw - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_plasma_ohmic_mw ) < 1.0e-6 @@ -708,7 +708,7 @@ def cudriv(self, output: bool): else: current_drive_variables.bigq = physics_variables.fusion_power / ( current_drive_variables.pinjmw - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_plasma_ohmic_mw ) @@ -1117,8 +1117,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Beam first orbit loss power (MW)", - "(porbitlossmw)", - current_drive_variables.porbitlossmw, + "(p_beam_orbit_loss)", + current_drive_variables.p_beam_orbit_loss, "OP ", ) po.ovarrf( @@ -1144,8 +1144,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Total (MW)", - "(current_drive_variables.porbitlossmw+current_drive_variables.p_beam_shine_through_mw+current_drive_variables.pinjmw)", - current_drive_variables.porbitlossmw + "(current_drive_variables.p_beam_orbit_loss+current_drive_variables.p_beam_shine_through_mw+current_drive_variables.pinjmw)", + current_drive_variables.p_beam_orbit_loss + current_drive_variables.p_beam_shine_through_mw + pinjmw1, ) diff --git a/process/dcll.py b/process/dcll.py index e02fc67ebe..be80f624c7 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -205,7 +205,7 @@ def dcll_neutronics_and_power(self, output: bool): fwbs_variables.p_fw_rad_total_mw * build_variables.a_fw_outboard / build_variables.a_fw_total - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw ) fwbs_variables.psurffwi = fwbs_variables.p_fw_rad_total_mw * ( diff --git a/process/hcpb.py b/process/hcpb.py index 2c242be33b..ae106d03f7 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -701,7 +701,7 @@ def powerflow_calc(self, output: bool): fwbs_variables.p_fw_rad_total_mw * build_variables.a_fw_outboard / build_variables.a_fw_total - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw ) fwbs_variables.psurffwi = fwbs_variables.p_fw_rad_total_mw * ( diff --git a/process/objectives.py b/process/objectives.py index 1d9e51ec07..fe033b2fe3 100644 --- a/process/objectives.py +++ b/process/objectives.py @@ -74,7 +74,7 @@ def objective_function(minmax: int) -> float: case 5: objective_metric = physics_variables.fusion_power / ( current_drive_variables.pinjmw - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_plasma_ohmic_mw ) case 6: diff --git a/process/power.py b/process/power.py index 1df87565d7..900bab5888 100644 --- a/process/power.py +++ b/process/power.py @@ -653,7 +653,7 @@ def power1(self): * (1 - fwbs_variables.f_nuc_pow_bz_liq) ) + primary_pumping_variables.htpmw_fw_blkt - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw + current_drive_variables.p_beam_shine_through_mw ) @@ -664,7 +664,7 @@ def power1(self): + fwbs_variables.p_fw_rad_total_mw + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw + current_drive_variables.p_beam_shine_through_mw ) @@ -674,7 +674,7 @@ def power1(self): + fwbs_variables.p_fw_rad_total_mw + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw + current_drive_variables.p_beam_shine_through_mw ) @@ -686,7 +686,7 @@ def power1(self): + fwbs_variables.p_fw_rad_total_mw + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw + current_drive_variables.p_beam_shine_through_mw ) @@ -697,7 +697,7 @@ def power1(self): fwbs_variables.p_fw_nuclear_heat_total_mw + fwbs_variables.p_fw_rad_total_mw + heat_transport_variables.htpmw_fw - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw + current_drive_variables.p_beam_shine_through_mw ) @@ -790,13 +790,13 @@ def power1(self): # Secondary heat (some of it... rest calculated in POWER2) # Wall plug injection power # MDK - # heat_transport_variables.pinjwp = (current_drive_variables.pinjmw + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw)/etacd + # heat_transport_variables.pinjwp = (current_drive_variables.pinjmw + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw)/etacd # heat_transport_variables.pinjwp calculated in current_drive.f90 # Waste injection power if physics_variables.ignite == 0: # MDK - # pinjht = heat_transport_variables.pinjwp - current_drive_variables.pinjmw - current_drive_variables.porbitlossmw - physics_variables.p_fw_alpha_mw + # pinjht = heat_transport_variables.pinjwp - current_drive_variables.pinjmw - current_drive_variables.p_beam_orbit_loss - physics_variables.p_fw_alpha_mw heat_transport_variables.pinjht = ( heat_transport_variables.pinjwp - current_drive_variables.pinjmw ) diff --git a/process/stellarator.py b/process/stellarator.py index ded67c8ff9..04104b4862 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1230,7 +1230,7 @@ def stfwbs(self, output: bool): heat_transport_variables.htpmw_fw = heat_transport_variables.fpumpfw * ( fwbs_variables.p_fw_nuclear_heat_total_mw + fwbs_variables.p_fw_rad_total_mw - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss ) heat_transport_variables.htpmw_blkt = ( heat_transport_variables.fpumpblkt @@ -1485,7 +1485,7 @@ def stfwbs(self, output: bool): + p_fw_outboard_nuclear_heat_mw + psurffwi + psurffwo - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss ) ) heat_transport_variables.htpmw_blkt = ( @@ -4965,7 +4965,7 @@ def stheat(self, output: bool): current_drive_variables.pnbeam = current_drive_variables.pheat * ( 1 - current_drive_variables.f_p_beam_orbit_loss ) - current_drive_variables.porbitlossmw = ( + current_drive_variables.p_beam_orbit_loss = ( current_drive_variables.pheat * current_drive_variables.f_p_beam_orbit_loss ) @@ -5004,7 +5004,7 @@ def stheat(self, output: bool): if ( abs( current_drive_variables.pinjmw - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_plasma_ohmic_mw ) < 1e-6 @@ -5013,7 +5013,7 @@ def stheat(self, output: bool): else: current_drive_variables.bigq = physics_variables.fusion_power / ( current_drive_variables.pinjmw - + current_drive_variables.porbitlossmw + + current_drive_variables.p_beam_orbit_loss + physics_variables.p_plasma_ohmic_mw ) @@ -5073,8 +5073,8 @@ def stheat(self, output: bool): po.ovarre( self.outfile, "Neutral beam orbit loss power (MW)", - "(porbitlossmw)", - current_drive_variables.porbitlossmw, + "(p_beam_orbit_loss)", + current_drive_variables.p_beam_orbit_loss, ) po.ovarre( self.outfile, diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 100e2015a6..031250c025 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -223,7 +223,7 @@ module current_drive_variables real(dp) :: pnbeam !! neutral beam injection power (MW) - real(dp) :: porbitlossmw + real(dp) :: p_beam_orbit_loss !! neutral beam power lost after ionisation but before thermalisation (orbit loss power) (MW) real(dp) :: ps_current_fraction diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 3bcda751f2..e1c59e3a64 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3568,7 +3568,7 @@ 0.0, 0.0 ], - "porbitlossmw": 0.0, + "p_beam_orbit_loss": 0.0, "p_plasma_outer_rad_mw": 0.0, "p_plasma_loss_mw": 0.0, "powfmax": 1500.0, @@ -10285,7 +10285,7 @@ "poisson_ins": "Insulation Poisson's ratio. Default: Kapton.\n Source : DuPont\u2122 Kapton\u00ae HN datasheet.", "poisson_steel": "Steel Poisson's ratio", "poloidalpower": "Poloidal power usage at time t (MW)", - "porbitlossmw": "neutral beam power lost after ionisation but before thermalisation (orbit loss power) (MW)", + "p_beam_orbit_loss": "neutral beam power lost after ionisation but before thermalisation (orbit loss power) (MW)", "p_plasma_outer_rad_mw": "radiation power from outer zone (MW)", "p_plasma_loss_mw": "heating power (= transport loss power) (MW) used in confinement time calculation", "powfmax": "maximum fusion power (MW) (`constraint equation 9`)", @@ -17661,7 +17661,7 @@ "plasipf", "plhybd", "pnbeam", - "porbitlossmw", + "p_beam_orbit_loss", "ps_current_fraction", "pwplh", "pwpnb", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 6bfe21e6ac..dc74067461 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -791,7 +791,7 @@ class PowerflowCalcParam(NamedTuple): a_fw_total: Any = None - porbitlossmw: Any = None + p_beam_orbit_loss: Any = None f_ster_div_single: Any = None @@ -884,7 +884,7 @@ class PowerflowCalcParam(NamedTuple): PowerflowCalcParam( a_fw_outboard=988.92586580655245, a_fw_total=1601.1595634509963, - porbitlossmw=0, + p_beam_orbit_loss=0, f_ster_div_single=0.115, p_div_rad_total_mw=0, p_fw_hcd_rad_total_mw=0, @@ -931,7 +931,7 @@ class PowerflowCalcParam(NamedTuple): PowerflowCalcParam( a_fw_outboard=1168.1172772224481, a_fw_total=1891.2865102700493, - porbitlossmw=0, + p_beam_orbit_loss=0, f_ster_div_single=0.115, p_div_rad_total_mw=33.056596978820579, p_fw_hcd_rad_total_mw=0, @@ -997,7 +997,9 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr(build_variables, "a_fw_total", powerflowcalcparam.a_fw_total) monkeypatch.setattr( - current_drive_variables, "porbitlossmw", powerflowcalcparam.porbitlossmw + current_drive_variables, + "p_beam_orbit_loss", + powerflowcalcparam.p_beam_orbit_loss, ) monkeypatch.setattr( diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index fcb6cafad6..8f20b3530b 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -35,7 +35,7 @@ class CudrivParam(NamedTuple): beam_current: Any = None - porbitlossmw: Any = None + p_beam_orbit_loss: Any = None i_hcd_primary: Any = None @@ -210,7 +210,7 @@ class CudrivParam(NamedTuple): pnbeam=0, plhybd=0, beam_current=0, - porbitlossmw=0, + p_beam_orbit_loss=0, i_hcd_primary=10, i_hcd_secondary=0, pheat=75, @@ -300,7 +300,7 @@ class CudrivParam(NamedTuple): pnbeam=0, plhybd=0, beam_current=0, - porbitlossmw=0, + p_beam_orbit_loss=0, i_hcd_primary=10, i_hcd_secondary=0, pheat=75, @@ -413,7 +413,7 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): ) monkeypatch.setattr( - current_drive_variables, "porbitlossmw", cudrivparam.porbitlossmw + current_drive_variables, "p_beam_orbit_loss", cudrivparam.p_beam_orbit_loss ) monkeypatch.setattr( diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 3218404d4f..37a8e2542e 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -29,7 +29,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): a_fw_total: Any = None - porbitlossmw: Any = None + p_beam_orbit_loss: Any = None f_ster_div_single: Any = None @@ -92,7 +92,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): DcllNeutronicsAndPowerParam( a_fw_outboard=988.92586580655245, a_fw_total=1601.1595634509963, - porbitlossmw=0, + p_beam_orbit_loss=0, f_ster_div_single=0.115, p_div_rad_total_mw=0, p_div_nuclear_heat_total_mw=0, @@ -124,7 +124,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): DcllNeutronicsAndPowerParam( a_fw_outboard=1168.1172772224481, a_fw_total=1891.2865102700493, - porbitlossmw=0, + p_beam_orbit_loss=0, f_ster_div_single=0.115, p_div_rad_total_mw=33.056596978820579, p_div_nuclear_heat_total_mw=182.58994516305046, @@ -178,8 +178,8 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl monkeypatch.setattr( current_drive_variables, - "porbitlossmw", - dcllneutronicsandpowerparam.porbitlossmw, + "p_beam_orbit_loss", + dcllneutronicsandpowerparam.p_beam_orbit_loss, ) monkeypatch.setattr( From f16201347d55b2bc256c037dc795e9170cf67fc6 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:52:04 +0100 Subject: [PATCH 09/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20nbshield=20to=20d?= =?UTF-8?q?x=5Fbeam=5Fshield=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NBI/nbi_overview.md | 2 +- process/build.py | 5 ++++- process/current_drive.py | 4 ++-- process/input.py | 2 +- process/io/plot_proc.py | 16 ++++++++-------- process/stellarator.py | 4 ++-- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 10 +++++----- .../regression/input_files/st_regression.IN.DAT | 2 +- tests/unit/test_build.py | 10 ++++++---- tests/unit/test_current_drive.py | 10 ++++++---- 11 files changed, 37 insertions(+), 30 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md index 2f491451d5..992f32b917 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md @@ -5,7 +5,7 @@ ## Neutral beam access -If present, a neutral beam injection system needs sufficient space between the TF coils to be able to intercept the plasma tangentially. The major radius `rtanbeam` at which the centre-line of the beam is tangential to the toroidal direction is user-defined using input parameter `frbeam`, which is the ratio of `rtanbeam` to the plasma major radius `rmajor`. The maximum possible tangency radius `rtanmax` is determined by the geometry of the TF coils - see Figure 1, and this can be enforced using constraint equation no. 20 with iteration variable no. 33 (`fportsz`). The thickness of the beam duct walls may be set using input parameter `nbshield`. +If present, a neutral beam injection system needs sufficient space between the TF coils to be able to intercept the plasma tangentially. The major radius `rtanbeam` at which the centre-line of the beam is tangential to the toroidal direction is user-defined using input parameter `frbeam`, which is the ratio of `rtanbeam` to the plasma major radius `rmajor`. The maximum possible tangency radius `rtanmax` is determined by the geometry of the TF coils - see Figure 1, and this can be enforced using constraint equation no. 20 with iteration variable no. 33 (`fportsz`). The thickness of the beam duct walls may be set using input parameter `dx_beam_shield`.
![NBI Port Size](../images/portsize.png){ width = "300"} diff --git a/process/build.py b/process/build.py index b67abe7096..a1843c8888 100644 --- a/process/build.py +++ b/process/build.py @@ -68,7 +68,10 @@ def portsz(self): b = 1e10 # Width of beam duct, including shielding on both sides (m) - c = current_drive_variables.beamwd + 2.0e0 * current_drive_variables.nbshield + c = ( + current_drive_variables.beamwd + + 2.0e0 * current_drive_variables.dx_beam_shield + ) # Major radius of inner edge of outboard TF coil (m) d = build_variables.r_tf_outboard_mid - 0.5e0 * b diff --git a/process/current_drive.py b/process/current_drive.py index 6ad30a3d67..56c08c809d 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -1218,8 +1218,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Beam duct shielding thickness (m)", - "(nbshield)", - current_drive_variables.nbshield, + "(dx_beam_shield)", + current_drive_variables.dx_beam_shield, ) po.ovarre( self.outfile, diff --git a/process/input.py b/process/input.py index 8d89ad6438..9375ee4750 100644 --- a/process/input.py +++ b/process/input.py @@ -905,7 +905,7 @@ def __post_init__(self): "nbi_sys_w": InputVariable( fortran.buildings_variables, float, range=(10.0, 1000.0) ), - "nbshield": InputVariable( + "dx_beam_shield": InputVariable( fortran.current_drive_variables, float, range=(0.01, 0.5) ), "f_p_beam_shine_through_max": InputVariable( diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index ddff2b4bea..9a29e1ac46 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -634,7 +634,7 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): n_tf_coils=n_tf_coils, r3=r3, r4=r4, - w=w + nbshield, + w=w + dx_beam_shield, facecolor=NBSHIELD_COLOUR[colour_scheme - 1], ) # Overlay TF coil segments @@ -653,7 +653,7 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): # Neutral beam geometry a = w b = dr_tf_outboard - c = beamwd + 2 * nbshield + c = beamwd + 2 * dx_beam_shield d = r3 e = np.sqrt(a**2 + (d + b) ** 2) # Coordinates of the inner and outer edges of the beam at its tangency point @@ -666,12 +666,12 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): youter = router * np.sin(beta) # Corner of TF coils xcorner = r4 - ycorner = w + nbshield + ycorner = w + dx_beam_shield axis.plot( [xinner, xcorner], [yinner, ycorner], linestyle="dotted", color="black" ) - x = xcorner + c * np.cos(beta) - nbshield * np.cos(beta) - y = ycorner + c * np.sin(beta) - nbshield * np.sin(beta) + x = xcorner + c * np.cos(beta) - dx_beam_shield * np.cos(beta) + y = ycorner + c * np.sin(beta) - dx_beam_shield * np.sin(beta) axis.plot([xouter, x], [youter, y], linestyle="dotted", color="black") # Ranges @@ -3804,7 +3804,7 @@ def main(args=None): # To be re-inergrated to resistives when in-plane stresses is integrated casthi = m_file.data["casthi"].get_scan(scan) - global nbshield + global dx_beam_shield global rtanbeam global rtanmax global beamwd @@ -3813,12 +3813,12 @@ def main(args=None): i_hcd_secondary = int(m_file.data["i_hcd_secondary"].get_scan(scan)) if (i_hcd_primary in [5, 8]) or (i_hcd_secondary in [5, 8]): - nbshield = m_file.data["nbshield"].get_scan(scan) + dx_beam_shield = m_file.data["dx_beam_shield"].get_scan(scan) rtanbeam = m_file.data["rtanbeam"].get_scan(scan) rtanmax = m_file.data["rtanmax"].get_scan(scan) beamwd = m_file.data["beamwd"].get_scan(scan) else: - nbshield = rtanbeam = rtanmax = beamwd = 0.0 + dx_beam_shield = rtanbeam = rtanmax = beamwd = 0.0 # Pedestal profile parameters global ipedestal diff --git a/process/stellarator.py b/process/stellarator.py index 04104b4862..ac434a597c 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5079,8 +5079,8 @@ def stheat(self, output: bool): po.ovarre( self.outfile, "Beam duct shielding thickness (m)", - "(nbshield)", - current_drive_variables.nbshield, + "(dx_beam_shield)", + current_drive_variables.dx_beam_shield, ) po.ovarre( self.outfile, diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 031250c025..0b8b963adf 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -190,7 +190,7 @@ module current_drive_variables real(dp) :: f_p_beam_shine_through !! neutral beam shine-through fraction - real(dp) :: nbshield + real(dp) :: dx_beam_shield !! neutral beam duct shielding thickness (m) real(dp) :: pheat diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e1c59e3a64..2d4622a40d 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3331,7 +3331,7 @@ "n_blkt_outboard_modules_poloidal": 8.0, "n_blkt_inboard_modules_toroidal": 32.0, "n_blkt_outboard_modules_toroidal": 48.0, - "nbshield": 0.5, + "dx_beam_shield": 0.5, "f_p_beam_shine_through": 0.0, "f_p_beam_shine_through_max": 0.001, "p_beam_shine_through_mw": 0.0, @@ -10069,7 +10069,7 @@ "n_blkt_outboard_modules_poloidal": "number of outboard blanket modules in poloidal direction (`i_thermal_electric_conversion>1`)", "n_blkt_inboard_modules_toroidal": "number of inboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`)", "n_blkt_outboard_modules_toroidal": "number of outboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`)", - "nbshield": "neutral beam duct shielding thickness (m)", + "dx_beam_shield": "neutral beam duct shielding thickness (m)", "f_p_beam_shine_through": "neutral beam shine-through fraction", "f_p_beam_shine_through_max": "maximum neutral beam shine-through fraction (`constraint equation 59`)", "p_beam_shine_through_mw": "neutral beam shine-through power", @@ -13627,7 +13627,7 @@ "lb": 8, "ub": 96 }, - "nbshield": { + "dx_beam_shield": { "lb": 0.01, "ub": 0.5 }, @@ -17650,7 +17650,7 @@ "i_hcd_secondary", "irfcd", "f_p_beam_shine_through", - "nbshield", + "dx_beam_shield", "pheat", "pheatfix", "pinjalw", @@ -20354,7 +20354,7 @@ "n_blkt_outboard_modules_poloidal": "int_variable", "n_blkt_inboard_modules_toroidal": "int_variable", "n_blkt_outboard_modules_toroidal": "int_variable", - "nbshield": "real_variable", + "dx_beam_shield": "real_variable", "f_p_beam_shine_through_max": "real_variable", "n_pf_coils_in_group": "int_array", "neped": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index e784d09e68..51baeb6275 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2772,7 +2772,7 @@ feffcd = 1.0 * DESCRIPTION: Leading coeff. for NB beta fraction * JUSTIFICATION: Not used as no NBI used -*nbshield +*dx_beam_shield * DESCRIPTION: Wall thickness of neutral beam duct (m) * JUSTIFICATION: Not used as no NBI used diff --git a/tests/unit/test_build.py b/tests/unit/test_build.py index cd958524ce..0cf489eb31 100644 --- a/tests/unit/test_build.py +++ b/tests/unit/test_build.py @@ -322,7 +322,7 @@ class PortszParam(NamedTuple): rtanmax: Any = None - nbshield: Any = None + dx_beam_shield: Any = None beamwd: Any = None @@ -347,7 +347,7 @@ class PortszParam(NamedTuple): dr_tf_outboard=1.208, rtanbeam=0, rtanmax=0, - nbshield=0.5, + dx_beam_shield=0.5, beamwd=0.57999999999999996, frbeam=1.05, rmajor=8.8901000000000003, @@ -361,7 +361,7 @@ class PortszParam(NamedTuple): dr_tf_outboard=1.208, rtanbeam=9.3346050000000016, rtanmax=14.735821603386416, - nbshield=0.5, + dx_beam_shield=0.5, beamwd=0.57999999999999996, frbeam=1.05, rmajor=8.8901000000000003, @@ -398,7 +398,9 @@ def test_portsz(portszparam, monkeypatch, build): monkeypatch.setattr(current_drive_variables, "rtanmax", portszparam.rtanmax) - monkeypatch.setattr(current_drive_variables, "nbshield", portszparam.nbshield) + monkeypatch.setattr( + current_drive_variables, "dx_beam_shield", portszparam.dx_beam_shield + ) monkeypatch.setattr(current_drive_variables, "beamwd", portszparam.beamwd) diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 8f20b3530b..db7b047121 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -101,7 +101,7 @@ class CudrivParam(NamedTuple): pinjalw: Any = None - nbshield: Any = None + dx_beam_shield: Any = None frbeam: Any = None @@ -243,7 +243,7 @@ class CudrivParam(NamedTuple): bootstrap_current_fraction_max=0.95000000000000007, taubeam=0, pinjalw=200, - nbshield=0.5, + dx_beam_shield=0.5, frbeam=1.05, rtanbeam=0, rtanmax=0, @@ -333,7 +333,7 @@ class CudrivParam(NamedTuple): bootstrap_current_fraction_max=0.95000000000000007, taubeam=0, pinjalw=200, - nbshield=0.5, + dx_beam_shield=0.5, frbeam=1.05, rtanbeam=8.4000000000000004, rtanmax=13.179564451855533, @@ -504,7 +504,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "pinjalw", cudrivparam.pinjalw) - monkeypatch.setattr(current_drive_variables, "nbshield", cudrivparam.nbshield) + monkeypatch.setattr( + current_drive_variables, "dx_beam_shield", cudrivparam.dx_beam_shield + ) monkeypatch.setattr(current_drive_variables, "frbeam", cudrivparam.frbeam) From a4dcdf89f2c819e02d169c9592886855214db6d6 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:53:43 +0100 Subject: [PATCH 10/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20pinjalw=20to=20p?= =?UTF-8?q?=5Fhcd=5Finjected=5Fmax=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating-and-current-drive.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/mfile_to_csv_vars.json | 2 +- examples/data/scan_MFILE.DAT | 20 ++++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/current_drive.py | 12 +++---- process/input.py | 2 +- process/io/mfile_to_csv_vars.json | 2 +- source/fortran/constraint_equations.f90 | 16 +++++----- source/fortran/current_drive_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- .../integration/data/morris_method_output.txt | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 20 ++++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 10 +++--- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../spherical_tokamak_once_through.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_current_drive.py | 10 +++--- 37 files changed, 102 insertions(+), 100 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md index 28326d26e4..8670a1a6a7 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md @@ -26,7 +26,7 @@ The fraction of the required plasma current to be produced by non-inductive mean It is sometimes useful to adjust artificially the current drive efficiency values produced by these routines. This can be achieved by setting the scaling coefficients `feffcd`. The wall plug to plasma efficiencies can also be adjusted, by changing the relevant variable (`etaech`, `etalh`, `etanbi` or `etaof`). ### Power limits -The maximum amount of desired heating and current drive power can be set with `pinjalw`. This limit can be enforced by activating constraint equation 30 (`icc=30`). +The maximum amount of desired heating and current drive power can be set with `p_hcd_injected_max`. This limit can be enforced by activating constraint equation 30 (`icc=30`). Similarly the lower bound on required heating and current drive power can be set with `auxmin`. This limit can be enforced by activating constraint equation 40 (`icc=40`). ### Secondary current drive diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index e2f6749326..a891a54e62 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -550,7 +550,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.1495E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5213E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5043E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.8939E+02 @@ -1271,7 +1271,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 7d2140146a..e8c825f865 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -548,7 +548,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 @@ -1266,7 +1266,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 327af1d0a4..cb1ad10825 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -548,7 +548,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 @@ -1266,7 +1266,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 5b41043880..90f0480b14 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -548,7 +548,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 @@ -1266,7 +1266,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index b3e9db3b59..e51feb2cb6 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -548,7 +548,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 @@ -1266,7 +1266,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 41657beb82..25a39630b1 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -78,7 +78,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/examples/data/mfile_to_csv_vars.json b/examples/data/mfile_to_csv_vars.json index 01c82202d4..0a6c9766ea 100644 --- a/examples/data/mfile_to_csv_vars.json +++ b/examples/data/mfile_to_csv_vars.json @@ -1,7 +1,7 @@ { "vars": [ "minmax", - "pinjalw", + "p_hcd_injected_max", "pnetelin", "ripmax", "t_burn_min", diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 448ab9a21d..821ff13b1b 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -403,7 +403,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -1398,7 +1398,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -2393,7 +2393,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -3388,7 +3388,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -4383,7 +4383,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -5378,7 +5378,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -6373,7 +6373,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -7368,7 +7368,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -8363,7 +8363,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -9148,7 +9148,7 @@ bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) etaech = 0.4 * ECRH wall-plug efficiency -pinjalw = 51.0 * Maximum allowable value for injected power (mw) +p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 *----------------Divertor Variables----------------* diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 7be6b57580..1bd6634721 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -78,7 +78,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/process/current_drive.py b/process/current_drive.py index 56c08c809d..d0fcf673d5 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -1138,8 +1138,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Maximum allowable beam power (MW)", - "(pinjalw)", - current_drive_variables.pinjalw, + "(p_hcd_injected_max)", + current_drive_variables.p_hcd_injected_max, ) po.ovarrf( self.outfile, @@ -1188,8 +1188,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Maximum allowable beam power (MW)", - "(pinjalw)", - current_drive_variables.pinjalw, + "(p_hcd_injected_max)", + current_drive_variables.p_hcd_injected_max, ) po.ovarrf( self.outfile, @@ -1253,8 +1253,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Maximum allowable ECRH power (MW)", - "(pinjalw)", - current_drive_variables.pinjalw, + "(p_hcd_injected_max)", + current_drive_variables.p_hcd_injected_max, ) po.ovarre( self.outfile, diff --git a/process/input.py b/process/input.py index 9375ee4750..113feb59f4 100644 --- a/process/input.py +++ b/process/input.py @@ -960,7 +960,7 @@ def __post_init__(self): ), "pibv": InputVariable(fortran.buildings_variables, float, range=(1000.0, 100000.0)), "pifecr": InputVariable(fortran.ife_variables, float, range=(0.0, 100.0)), - "pinjalw": InputVariable( + "p_hcd_injected_max": InputVariable( fortran.current_drive_variables, float, range=(0.0, 1000.0) ), "pinjfixmw": InputVariable( diff --git a/process/io/mfile_to_csv_vars.json b/process/io/mfile_to_csv_vars.json index 01c82202d4..0a6c9766ea 100644 --- a/process/io/mfile_to_csv_vars.json +++ b/process/io/mfile_to_csv_vars.json @@ -1,7 +1,7 @@ { "vars": [ "minmax", - "pinjalw", + "p_hcd_injected_max", "pnetelin", "ripmax", "t_burn_min", diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index e0d0a4ad91..49c7e3a3d7 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -366,11 +366,11 @@ subroutine constraint_err_016() subroutine constraint_err_030() !! Error in: Equation for injection power upper limit !! author: P B Lloyd, CCFE, Culham Science Centre - use current_drive_variables, only: pinjmw, pinjalw + use current_drive_variables, only: pinjmw, p_hcd_injected_max use constraint_variables, only: fpinj implicit none write(*,*) 'fpinj = ', fpinj - write(*,*) 'pinjalw = ', pinjalw + write(*,*) 'p_hcd_injected_max = ', p_hcd_injected_max write(*,*) 'pinjmw = ', pinjmw end subroutine @@ -1495,13 +1495,13 @@ subroutine constraint_eqn_030(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! residual error in physical units; output string; units string !! Equation for injection power upper limit !! #=# current_drive - !! #=#=# fpinj, pinjalw + !! #=#=# fpinj, p_hcd_injected_max !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! pinjmw : input real : total auxiliary injected power (MW) !! fpinj : input real : f-value for injection power - !! pinjalw : input real : Maximum allowable value for injected power (MW) - use current_drive_variables, only: pinjmw, pinjalw + !! p_hcd_injected_max : input real : Maximum allowable value for injected power (MW) + use current_drive_variables, only: pinjmw, p_hcd_injected_max use constraint_variables, only: fpinj implicit none real(dp), intent(out) :: tmp_cc @@ -1510,9 +1510,9 @@ subroutine constraint_eqn_030(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 = pinjmw/pinjalw - 1.0D0 * fpinj - tmp_con = pinjalw - tmp_err = pinjalw - pinjmw / fpinj + tmp_cc = pinjmw/p_hcd_injected_max - 1.0D0 * fpinj + tmp_con = p_hcd_injected_max + tmp_err = p_hcd_injected_max - pinjmw / fpinj tmp_symbol = '<' tmp_units = 'MW' diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 0b8b963adf..ea69e8c694 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -199,7 +199,7 @@ module current_drive_variables real(dp) :: pheatfix !! secondary fixed heating power not used for current drive (MW) - real(dp) :: pinjalw + real(dp) :: p_hcd_injected_max !! maximum allowable value for injected power (MW) (`constraint equation 30`) real(dp) :: pinjemw diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 481cec48cc..5d4b64ad62 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -547,7 +547,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 @@ -1265,7 +1265,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 6dc917b9e8..fcf43dc6d2 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -548,7 +548,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 @@ -1266,7 +1266,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 92887eb217..464a41dbd3 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -548,7 +548,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 @@ -1266,7 +1266,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 8a036b0ce6..5d406a7ee7 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -548,7 +548,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 @@ -1266,7 +1266,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index d4714e3cbb..c19ebb524d 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -78,7 +78,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index d36eeed7b0..c5c104dd21 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -545,7 +545,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3624E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.9710E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5942E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7129E+02 @@ -1269,7 +1269,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index a5662ddad3..599ada326a 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -165,7 +165,7 @@ etaech = 0.5 * ECH wall plug to injector efficiency gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) i_hcd_primary = 10 * Switch for current drive efficiency model; pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) -pinjalw = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) +p_hcd_injected_max = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) *-------------------Dcll Module--------------------* diff --git a/tests/integration/data/morris_method_output.txt b/tests/integration/data/morris_method_output.txt index ba961991c2..2ed866d392 100644 --- a/tests/integration/data/morris_method_output.txt +++ b/tests/integration/data/morris_method_output.txt @@ -14,7 +14,7 @@ feffcd 0.000000 0.000000 0.000000 0.000000 etath 19.600000 19.600000 18.064253 6.309154 etaiso -9.200000 9.300000 17.142204 5.925170 boundl(18) 329.750000 331.250000 321.868005 114.045215 -pinjalw 61.455000 89.755000 134.764099 41.682556 +p_hcd_injected_max 61.455000 89.755000 134.764099 41.682556 alstroh 39.900000 39.900000 21.792675 7.810740 alstrtf -50.500000 51.200000 104.756121 35.704599 bmxlim -604.895000 604.895000 439.234118 151.254709 diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 121ab9d69d..1c22f48770 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -169,7 +169,7 @@ bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) etaech = 0.4 * ECRH wall-plug efficiency -pinjalw = 51.0 * Maximum allowable value for injected power (mw) +p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 *----------------Divertor Variables----------------* diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 56516aafa6..00617cc79d 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -549,7 +549,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.9070E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9996E+02 @@ -1712,7 +1712,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0452E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0647E+02 @@ -2875,7 +2875,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.1394E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5559E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5112E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1163E+02 @@ -4038,7 +4038,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.1153E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1107E+02 @@ -5201,7 +5201,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0782E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0691E+02 @@ -6364,7 +6364,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0864E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9993E+02 @@ -7527,7 +7527,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0680E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9926E+02 @@ -8690,7 +8690,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0605E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0503E+02 @@ -9853,7 +9853,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0220E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1023E+02 @@ -11016,7 +11016,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0090E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1014E+02 @@ -12179,7 +12179,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0601E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0509E+02 @@ -13342,7 +13342,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0647E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9941E+02 @@ -14505,7 +14505,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0495E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9920E+02 @@ -15668,7 +15668,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0246E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0529E+02 @@ -16831,7 +16831,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0010E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1139E+02 @@ -17561,7 +17561,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 65ec13a6ba..c4828c26ba 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -403,7 +403,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -1398,7 +1398,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -2393,7 +2393,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -3388,7 +3388,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -4383,7 +4383,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -5378,7 +5378,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -6373,7 +6373,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -7368,7 +7368,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -8363,7 +8363,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 @@ -9148,7 +9148,7 @@ bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) etaech = 0.4 * ECRH wall-plug efficiency -pinjalw = 51.0 * Maximum allowable value for injected power (mw) +p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 *----------------Divertor Variables----------------* diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 79806c6d8a..007c18d1d9 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -169,7 +169,7 @@ bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) etaech = 0.4 * ECRH wall-plug efficiency -pinjalw = 51.0 * Maximum allowable value for injected power (mw) +p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 *----------------Divertor Variables----------------* diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 82918a0aa7..95d10f97c6 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -169,7 +169,7 @@ bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) etaech = 0.4 * ECRH wall-plug efficiency -pinjalw = 51.0 * Maximum allowable value for injected power (mw) +p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 *----------------Divertor Variables----------------* diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 2d4622a40d..e975a80326 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3505,7 +3505,7 @@ "pibv": 20000.0, "piepv": 0.0, "pifecr": 10.0, - "pinjalw": 150.0, + "p_hcd_injected_max": 150.0, "pinjemw": 0.0, "pinjfixmw": 0.0, "pinjht": 0.0, @@ -10228,7 +10228,7 @@ "pibv": "power injection building volume (m3)", "piepv": "ion/electron equilibration power per volume (MW/m3)", "pifecr": "IFE cryogenic power requirements (MW)", - "pinjalw": "maximum allowable value for injected power (MW) (`constraint equation 30`)", + "p_hcd_injected_max": "maximum allowable value for injected power (MW) (`constraint equation 30`)", "pinjemw": "auxiliary injected power to electrons (MW)", "pinjfixmw": "secondary total fixed auxiliary injected power (MW)", "pinjht": "power dissipated in heating and current drive system (MW)", @@ -13759,7 +13759,7 @@ "lb": 0.0, "ub": 100.0 }, - "pinjalw": { + "p_hcd_injected_max": { "lb": 0.0, "ub": 1000.0 }, @@ -17653,7 +17653,7 @@ "dx_beam_shield", "pheat", "pheatfix", - "pinjalw", + "p_hcd_injected_max", "pinjemw", "pinjimw", "pinjmw", @@ -20395,7 +20395,7 @@ "pheatfix": "real_variable", "pibv": "real_variable", "pifecr": "real_variable", - "pinjalw": "real_variable", + "p_hcd_injected_max": "real_variable", "pinjfixmw": "real_variable", "pinjmax": "real_variable", "dx_fw_module": "real_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 591d8aee27..a63c4c4e8f 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -78,7 +78,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 5879da9589..c786c15ecc 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -45,7 +45,7 @@ icc = 11 *-----------------------------* icc = 30 * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.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 10055b0d99..6b0606867a 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -165,7 +165,7 @@ etaech = 0.5 * ECH wall plug to injector efficiency gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) i_hcd_primary = 10 * Switch for current drive efficiency model; pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) -pinjalw = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) +p_hcd_injected_max = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) *-------------------Dcll Module--------------------* 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 5a40f141be..70b0a21968 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -201,7 +201,7 @@ etaech = 0.45 * ECH wall plug to injector efficiency feffcd = 1.0 * current drive efficiency fudge factor (`iteration variable 47`) i_hcd_primary = 13 * Switch for current drive efficiency model; irfcd = 1 * Switch for current drive calculation; -pinjalw = 150.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) +p_hcd_injected_max = 150.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) *-------------------Dcll Module--------------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 51baeb6275..0bc681174b 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2701,7 +2701,7 @@ boundu(46) = 1.5 * DESCRIPTION: f-value for injected power variation range * JUSTIFICATION: Setup to allow the injected power to vary -pinjalw = 150.0 +p_hcd_injected_max = 150.0 * DESCRIPTION: Maximum Allowable Value for Injected Power (MW) (icc=30) * JUSTIFICATION: diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 8cd3ddf02a..73d31d1123 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -78,7 +78,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index a988ec0936..713d95f75f 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -545,7 +545,7 @@ Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3624E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.9710E+01 OP - Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 + Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5942E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7129E+02 @@ -1269,7 +1269,7 @@ boundu(103) = 10.0 icc = 30 ixc = 46 * fpinj * Maximum allowable value for injected power [MW] -pinjalw = 200.0 +p_hcd_injected_max = 200.0 * Net electric power lower limit * *--------------------------------* diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index db7b047121..914b3afa07 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -99,7 +99,7 @@ class CudrivParam(NamedTuple): taubeam: Any = None - pinjalw: Any = None + p_hcd_injected_max: Any = None dx_beam_shield: Any = None @@ -242,7 +242,7 @@ class CudrivParam(NamedTuple): bootstrap_current_fraction=0.27635918746616817, bootstrap_current_fraction_max=0.95000000000000007, taubeam=0, - pinjalw=200, + p_hcd_injected_max=200, dx_beam_shield=0.5, frbeam=1.05, rtanbeam=0, @@ -332,7 +332,7 @@ class CudrivParam(NamedTuple): bootstrap_current_fraction=0.27635918746616817, bootstrap_current_fraction_max=0.95000000000000007, taubeam=0, - pinjalw=200, + p_hcd_injected_max=200, dx_beam_shield=0.5, frbeam=1.05, rtanbeam=8.4000000000000004, @@ -502,7 +502,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "taubeam", cudrivparam.taubeam) - monkeypatch.setattr(current_drive_variables, "pinjalw", cudrivparam.pinjalw) + monkeypatch.setattr( + current_drive_variables, "p_hcd_injected_max", cudrivparam.p_hcd_injected_max + ) monkeypatch.setattr( current_drive_variables, "dx_beam_shield", cudrivparam.dx_beam_shield From 4dedf6ef38592bc14baa8619efd3c43f2259529f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 14:59:52 +0100 Subject: [PATCH 11/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20etanbi=20to=20eta?= =?UTF-8?q?=5Fbeam=5Finjector=5Fwall=5Fplug=20for=20clarity=20and=20consis?= =?UTF-8?q?tency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating-and-current-drive.md | 2 +- process/current_drive.py | 16 ++++++++++------ process/input.py | 4 +++- process/stellarator.py | 4 +++- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 10 +++++----- .../regression/input_files/st_regression.IN.DAT | 2 +- tests/unit/test_current_drive.py | 12 ++++++++---- 8 files changed, 32 insertions(+), 20 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md index 8670a1a6a7..f1a4406469 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md @@ -23,7 +23,7 @@ The fraction of the required plasma current to be produced by non-inductive mean !!! Warning "Warning" At present, the neutral beam models do not include the effect of an edge transport barrier (pedestal) in the plasma profile. -It is sometimes useful to adjust artificially the current drive efficiency values produced by these routines. This can be achieved by setting the scaling coefficients `feffcd`. The wall plug to plasma efficiencies can also be adjusted, by changing the relevant variable (`etaech`, `etalh`, `etanbi` or `etaof`). +It is sometimes useful to adjust artificially the current drive efficiency values produced by these routines. This can be achieved by setting the scaling coefficients `feffcd`. The wall plug to plasma efficiencies can also be adjusted, by changing the relevant variable (`etaech`, `etalh`, `eta_beam_injector_wall_plug` or `etaof`). ### Power limits The maximum amount of desired heating and current drive power can be set with `p_hcd_injected_max`. This limit can be enforced by activating constraint equation 30 (`icc=30`). diff --git a/process/current_drive.py b/process/current_drive.py index d0fcf673d5..4409ec3a75 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -343,10 +343,12 @@ def cudriv(self, output: bool): pinjemwfix = pinjmwfix * (1.0e0 - current_drive_variables.fpion) current_drive_variables.pwpnb = ( - pnbitotfix / current_drive_variables.etanbi + pnbitotfix / current_drive_variables.eta_beam_injector_wall_plug ) # neutral beam wall plug power heat_transport_variables.pinjwpfix = current_drive_variables.pwpnb - current_drive_variables.etacdfix = current_drive_variables.etanbi + current_drive_variables.etacdfix = ( + current_drive_variables.eta_beam_injector_wall_plug + ) gamnb = effnbssfix * (dene20 * physics_variables.rmajor) gamcdfix = gamnb beam_current_fix = ( @@ -666,10 +668,12 @@ def cudriv(self, output: bool): current_drive_variables.pwpnb = ( current_drive_variables.p_beam_injected - / current_drive_variables.etanbi + / current_drive_variables.eta_beam_injector_wall_plug ) # neutral beam wall plug power pinjwp1 = current_drive_variables.pwpnb - current_drive_variables.etacd = current_drive_variables.etanbi + current_drive_variables.etacd = ( + current_drive_variables.eta_beam_injector_wall_plug + ) gamnb = effnbss * (dene20 * physics_variables.rmajor) current_drive_variables.gamcd = gamnb current_drive_variables.beam_current = ( @@ -1083,8 +1087,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Neutral beam wall plug efficiency", - "(etanbi)", - current_drive_variables.etanbi, + "(eta_beam_injector_wall_plug)", + current_drive_variables.eta_beam_injector_wall_plug, ) po.ovarre( self.outfile, diff --git a/process/input.py b/process/input.py index 113feb59f4..7a018c1a3f 100644 --- a/process/input.py +++ b/process/input.py @@ -465,7 +465,9 @@ def __post_init__(self): "etaiso": InputVariable(fortran.fwbs_variables, float, range=(0.1, 1.0)), "etalh": InputVariable(fortran.current_drive_variables, float, range=(0.0, 1.0)), "etali": InputVariable(fortran.ife_variables, float, range=(0.0, 1.0)), - "etanbi": InputVariable(fortran.current_drive_variables, float, range=(0.0, 1.0)), + "eta_beam_injector_wall_plug": InputVariable( + fortran.current_drive_variables, float, range=(0.0, 1.0) + ), "etapsu": InputVariable(fortran.pfcoil_variables, float, range=(0.0, 1.0)), "etapump": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)), "etatf": InputVariable(fortran.heat_transport_variables, float, range=(0.0, 1.0)), diff --git a/process/stellarator.py b/process/stellarator.py index ac434a597c..cb0d103fac 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4973,7 +4973,9 @@ def stheat(self, output: bool): current_drive_variables.pinjemw = current_drive_variables.pnbeam * ( 1 - fpion ) - current_drive_variables.etacd = current_drive_variables.etanbi + current_drive_variables.etacd = ( + current_drive_variables.eta_beam_injector_wall_plug + ) current_drive_variables.pinjwp = ( current_drive_variables.pinjimw + current_drive_variables.pinjemw ) / current_drive_variables.etacd diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index ea69e8c694..b004fcfdad 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -111,7 +111,7 @@ module current_drive_variables real(dp) :: etalh !! lower hybrid wall plug to injector efficiency - real(dp) :: etanbi + real(dp) :: eta_beam_injector_wall_plug !! neutral beam wall plug to injector efficiency real(dp) :: fpion diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e975a80326..8d1370b6dc 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1772,7 +1772,7 @@ "etaiso": 0.85, "etalh": 0.3, "etali": 0.4, - "etanbi": 0.3, + "eta_beam_injector_wall_plug": 0.3, "etapsu": 0.9, "etapump": 0.8, "etatf": 0.9, @@ -9376,7 +9376,7 @@ "etaiso": "isentropic efficiency of FW and blanket coolant pumps", "etalh": "lower hybrid wall plug to injector efficiency", "etali": "IFE lithium pump wall plug efficiency (`ifetyp=4`)", - "etanbi": "neutral beam wall plug to injector efficiency", + "eta_beam_injector_wall_plug": "neutral beam wall plug to injector efficiency", "etapsu": "Efficiency of transfer of PF stored energy into or out of storage.", "etapump": "centrepost coolant pump efficiency", "etatf": "AC to resistive power conversion for TF coils", @@ -12251,7 +12251,7 @@ "lb": 0.0, "ub": 1.0 }, - "etanbi": { + "eta_beam_injector_wall_plug": { "lb": 0.0, "ub": 1.0 }, @@ -17634,7 +17634,7 @@ "etacdfix", "etaech", "etalh", - "etanbi", + "eta_beam_injector_wall_plug", "fpion", "p_beam_injected", "pscf_scene", @@ -19998,7 +19998,7 @@ "etaiso": "real_variable", "etalh": "real_variable", "etali": "real_variable", - "etanbi": "real_variable", + "eta_beam_injector_wall_plug": "real_variable", "etapsu": "real_variable", "etapump": "real_variable", "etatf": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 0bc681174b..44b82cfebb 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2744,7 +2744,7 @@ feffcd = 1.0 * DESCRIPTION: Number of NB decay lengths to plasma centre * JUSTIFICATION: Not used as no NBI used -*etanbi = +*eta_beam_injector_wall_plug = * DESCRIPTION: NBI wall plug to injector efficiency * JUSTIFICATION: Not used as no NBI used diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 914b3afa07..3a245c463b 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -73,7 +73,7 @@ class CudrivParam(NamedTuple): pwpnb: Any = None - etanbi: Any = None + eta_beam_injector_wall_plug: Any = None beam_energy: Any = None @@ -229,7 +229,7 @@ class CudrivParam(NamedTuple): f_p_beam_orbit_loss=0, pinjmw=0, pwpnb=0, - etanbi=0.29999999999999999, + eta_beam_injector_wall_plug=0.29999999999999999, beam_energy=1000, effcd=0, pwplh=0, @@ -319,7 +319,7 @@ class CudrivParam(NamedTuple): f_p_beam_orbit_loss=0, pinjmw=120.49600019005746, pwpnb=0, - etanbi=0.29999999999999999, + eta_beam_injector_wall_plug=0.29999999999999999, beam_energy=1000, effcd=0.05000000000000001, pwplh=0, @@ -462,7 +462,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "pwpnb", cudrivparam.pwpnb) - monkeypatch.setattr(current_drive_variables, "etanbi", cudrivparam.etanbi) + monkeypatch.setattr( + current_drive_variables, + "eta_beam_injector_wall_plug", + cudrivparam.eta_beam_injector_wall_plug, + ) monkeypatch.setattr(current_drive_variables, "beam_energy", cudrivparam.beam_energy) From 914f21247c4eb3b2d3f4914965b749d9776344d3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 15:00:58 +0100 Subject: [PATCH 12/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20etalh=20to=20eta?= =?UTF-8?q?=5Flowhyb=5Finjector=5Fwall=5Fplug=20for=20clarity=20and=20cons?= =?UTF-8?q?istency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating-and-current-drive.md | 2 +- process/current_drive.py | 18 ++++++++++++------ process/input.py | 4 +++- process/stellarator.py | 4 +++- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 10 +++++----- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_current_drive.py | 12 ++++++++---- 8 files changed, 34 insertions(+), 20 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md index f1a4406469..a017a4d2d8 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md @@ -23,7 +23,7 @@ The fraction of the required plasma current to be produced by non-inductive mean !!! Warning "Warning" At present, the neutral beam models do not include the effect of an edge transport barrier (pedestal) in the plasma profile. -It is sometimes useful to adjust artificially the current drive efficiency values produced by these routines. This can be achieved by setting the scaling coefficients `feffcd`. The wall plug to plasma efficiencies can also be adjusted, by changing the relevant variable (`etaech`, `etalh`, `eta_beam_injector_wall_plug` or `etaof`). +It is sometimes useful to adjust artificially the current drive efficiency values produced by these routines. This can be achieved by setting the scaling coefficients `feffcd`. The wall plug to plasma efficiencies can also be adjusted, by changing the relevant variable (`etaech`, `eta_lowhyb_injector_wall_plug`, `eta_beam_injector_wall_plug` or `etaof`). ### Power limits The maximum amount of desired heating and current drive power can be set with `p_hcd_injected_max`. This limit can be enforced by activating constraint equation 30 (`icc=30`). diff --git a/process/current_drive.py b/process/current_drive.py index 4409ec3a75..9bcea20522 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -267,11 +267,14 @@ def cudriv(self, output: bool): # Wall plug power heat_transport_variables.pinjwpfix = ( - current_drive_variables.pinjfixmw / current_drive_variables.etalh + current_drive_variables.pinjfixmw + / current_drive_variables.eta_lowhyb_injector_wall_plug ) # Wall plug to injector efficiency - current_drive_variables.etacdfix = current_drive_variables.etalh + current_drive_variables.etacdfix = ( + current_drive_variables.eta_lowhyb_injector_wall_plug + ) # Normalised current drive efficiency gamma gamcdfix = effrfssfix * (dene20 * physics_variables.rmajor) @@ -582,12 +585,15 @@ def cudriv(self, output: bool): # Wall plug power current_drive_variables.pwplh = ( - current_drive_variables.plhybd / current_drive_variables.etalh + current_drive_variables.plhybd + / current_drive_variables.eta_lowhyb_injector_wall_plug ) pinjwp1 = current_drive_variables.pwplh # Wall plug to injector efficiency - current_drive_variables.etacd = current_drive_variables.etalh + current_drive_variables.etacd = ( + current_drive_variables.eta_lowhyb_injector_wall_plug + ) # Normalised current drive efficiency gamma gamrf = effrfss * (dene20 * physics_variables.rmajor) @@ -1016,8 +1022,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Lower hybrid wall plug efficiency", - "(etalh)", - current_drive_variables.etalh, + "(eta_lowhyb_injector_wall_plug)", + current_drive_variables.eta_lowhyb_injector_wall_plug, ) po.ovarre( self.outfile, diff --git a/process/input.py b/process/input.py index 7a018c1a3f..1841e4a47d 100644 --- a/process/input.py +++ b/process/input.py @@ -463,7 +463,9 @@ def __post_init__(self): "etaech": InputVariable(fortran.current_drive_variables, float, range=(0.0, 1.0)), "etahtp": InputVariable(fortran.fwbs_variables, float, range=(0.1, 1.0)), "etaiso": InputVariable(fortran.fwbs_variables, float, range=(0.1, 1.0)), - "etalh": InputVariable(fortran.current_drive_variables, float, range=(0.0, 1.0)), + "eta_lowhyb_injector_wall_plug": InputVariable( + fortran.current_drive_variables, float, range=(0.0, 1.0) + ), "etali": InputVariable(fortran.ife_variables, float, range=(0.0, 1.0)), "eta_beam_injector_wall_plug": InputVariable( fortran.current_drive_variables, float, range=(0.0, 1.0) diff --git a/process/stellarator.py b/process/stellarator.py index cb0d103fac..b174b722f0 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4952,7 +4952,9 @@ def stheat(self, output: bool): current_drive_variables.plhybd = current_drive_variables.pheat current_drive_variables.pinjimw = 0 current_drive_variables.pinjemw = current_drive_variables.plhybd - current_drive_variables.etacd = current_drive_variables.etalh + current_drive_variables.etacd = ( + current_drive_variables.eta_lowhyb_injector_wall_plug + ) current_drive_variables.pinjwp = ( current_drive_variables.pinjimw + current_drive_variables.pinjemw ) / current_drive_variables.etacd diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index b004fcfdad..517ca8c228 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -108,7 +108,7 @@ module current_drive_variables real(dp) :: etaech !! ECH wall plug to injector efficiency - real(dp) :: etalh + real(dp) :: eta_lowhyb_injector_wall_plug !! lower hybrid wall plug to injector efficiency real(dp) :: eta_beam_injector_wall_plug diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 8d1370b6dc..426e3787ad 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1770,7 +1770,7 @@ "etaech": 0.3, "etahtp": 0.95, "etaiso": 0.85, - "etalh": 0.3, + "eta_lowhyb_injector_wall_plug": 0.3, "etali": 0.4, "eta_beam_injector_wall_plug": 0.3, "etapsu": 0.9, @@ -9374,7 +9374,7 @@ "etaech": "ECH wall plug to injector efficiency", "etahtp": "electrical efficiency of primary coolant pumps", "etaiso": "isentropic efficiency of FW and blanket coolant pumps", - "etalh": "lower hybrid wall plug to injector efficiency", + "eta_lowhyb_injector_wall_plug": "lower hybrid wall plug to injector efficiency", "etali": "IFE lithium pump wall plug efficiency (`ifetyp=4`)", "eta_beam_injector_wall_plug": "neutral beam wall plug to injector efficiency", "etapsu": "Efficiency of transfer of PF stored energy into or out of storage.", @@ -12243,7 +12243,7 @@ "lb": 0.1, "ub": 1.0 }, - "etalh": { + "eta_lowhyb_injector_wall_plug": { "lb": 0.0, "ub": 1.0 }, @@ -17633,7 +17633,7 @@ "etacd", "etacdfix", "etaech", - "etalh", + "eta_lowhyb_injector_wall_plug", "eta_beam_injector_wall_plug", "fpion", "p_beam_injected", @@ -19996,7 +19996,7 @@ "etaech": "real_variable", "etahtp": "real_variable", "etaiso": "real_variable", - "etalh": "real_variable", + "eta_lowhyb_injector_wall_plug": "real_variable", "etali": "real_variable", "eta_beam_injector_wall_plug": "real_variable", "etapsu": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 44b82cfebb..94a44bd261 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2829,7 +2829,7 @@ wave_mode = 0 * Lower hybrid * *--------------* -*etalh = +*eta_lowhyb_injector_wall_plug = * DESCRIPTION: LH wall plug to plasma efficiency (default = 0.3) * JUSTIFICATION: Not used as no LH used diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 3a245c463b..0a52f604fa 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -59,7 +59,7 @@ class CudrivParam(NamedTuple): gamma_ecrh: Any = None - etalh: Any = None + eta_lowhyb_injector_wall_plug: Any = None etacd: Any = None @@ -222,7 +222,7 @@ class CudrivParam(NamedTuple): f_p_beam_shine_through=0, gamcd=0, gamma_ecrh=0.30000000000000004, - etalh=0.29999999999999999, + eta_lowhyb_injector_wall_plug=0.29999999999999999, etacd=0, etacdfix=0, etaech=0.5, @@ -312,7 +312,7 @@ class CudrivParam(NamedTuple): f_p_beam_shine_through=0, gamcd=0.30000000000000004, gamma_ecrh=0.30000000000000004, - etalh=0.29999999999999999, + eta_lowhyb_injector_wall_plug=0.29999999999999999, etacd=0.5, etacdfix=0, etaech=0.5, @@ -446,7 +446,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "gamma_ecrh", cudrivparam.gamma_ecrh) - monkeypatch.setattr(current_drive_variables, "etalh", cudrivparam.etalh) + monkeypatch.setattr( + current_drive_variables, + "eta_lowhyb_injector_wall_plug", + cudrivparam.eta_lowhyb_injector_wall_plug, + ) monkeypatch.setattr(current_drive_variables, "etacd", cudrivparam.etacd) From 2f70f0d7553a26a11ce10e5b177488f1e853db5d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 15:02:07 +0100 Subject: [PATCH 13/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20etaech=20to=20eta?= =?UTF-8?q?=5Fecrh=5Finjector=5Fwall=5Fplug=20for=20clarity=20and=20consis?= =?UTF-8?q?tency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating-and-current-drive.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/current_drive.py | 22 ++++++++----- process/input.py | 4 ++- process/io/plot_scans.py | 2 +- process/io/variable_metadata.py | 2 +- process/scan.py | 6 ++-- process/stellarator.py | 4 ++- .../config_evaluate_uncertainties.json | 2 +- source/fortran/current_drive_variables.f90 | 2 +- source/fortran/scan.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- .../integration/data/morris_method_output.txt | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 20 ++++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 10 +++--- tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- .../stellarator_helias_once_through.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_current_drive.py | 12 ++++--- 42 files changed, 117 insertions(+), 101 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md index a017a4d2d8..9c490a1ce3 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md @@ -23,7 +23,7 @@ The fraction of the required plasma current to be produced by non-inductive mean !!! Warning "Warning" At present, the neutral beam models do not include the effect of an edge transport barrier (pedestal) in the plasma profile. -It is sometimes useful to adjust artificially the current drive efficiency values produced by these routines. This can be achieved by setting the scaling coefficients `feffcd`. The wall plug to plasma efficiencies can also be adjusted, by changing the relevant variable (`etaech`, `eta_lowhyb_injector_wall_plug`, `eta_beam_injector_wall_plug` or `etaof`). +It is sometimes useful to adjust artificially the current drive efficiency values produced by these routines. This can be achieved by setting the scaling coefficients `feffcd`. The wall plug to plasma efficiencies can also be adjusted, by changing the relevant variable (`eta_ecrh_injector_wall_plug`, `eta_lowhyb_injector_wall_plug`, `eta_beam_injector_wall_plug` or `etaof`). ### Power limits The maximum amount of desired heating and current drive power can be set with `p_hcd_injected_max`. This limit can be enforced by activating constraint equation 30 (`icc=30`). diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index a891a54e62..7ff42f36c5 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -551,7 +551,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.1495E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5213E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5043E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.8939E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8401E+02 @@ -1655,7 +1655,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index e8c825f865..859282b5a1 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -549,7 +549,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 @@ -1649,7 +1649,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index cb1ad10825..1e9f2ea2a8 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -549,7 +549,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 @@ -1649,7 +1649,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 90f0480b14..7ffbe3e3e1 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -549,7 +549,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 @@ -1650,7 +1650,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index e51feb2cb6..d7c47a5136 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -549,7 +549,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 @@ -1650,7 +1650,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 25a39630b1..38ef212506 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -460,7 +460,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 821ff13b1b..e71e74340b 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -404,7 +404,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -1399,7 +1399,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -2394,7 +2394,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -3389,7 +3389,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -4384,7 +4384,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -5379,7 +5379,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -6374,7 +6374,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -7369,7 +7369,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -8364,7 +8364,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -9147,7 +9147,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) -etaech = 0.4 * ECRH wall-plug efficiency +eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 1bd6634721..650d34b243 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -460,7 +460,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/process/current_drive.py b/process/current_drive.py index 9bcea20522..3761796ef5 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -297,11 +297,14 @@ def cudriv(self, output: bool): # Wall plug power heat_transport_variables.pinjwpfix = ( - current_drive_variables.pinjfixmw / current_drive_variables.etaech + current_drive_variables.pinjfixmw + / current_drive_variables.eta_ecrh_injector_wall_plug ) # Wall plug to injector efficiency - current_drive_variables.etacdfix = current_drive_variables.etaech + current_drive_variables.etacdfix = ( + current_drive_variables.eta_ecrh_injector_wall_plug + ) # the fixed auxiliary current auxiliary_cdfix = ( @@ -615,12 +618,15 @@ def cudriv(self, output: bool): # Wall plug power current_drive_variables.echwpow = ( - current_drive_variables.echpwr / current_drive_variables.etaech + current_drive_variables.echpwr + / current_drive_variables.eta_ecrh_injector_wall_plug ) # Wall plug to injector efficiency pinjwp1 = current_drive_variables.echwpow - current_drive_variables.etacd = current_drive_variables.etaech + current_drive_variables.etacd = ( + current_drive_variables.eta_ecrh_injector_wall_plug + ) elif current_drive_variables.i_hcd_primary in [5, 8]: # MDK. See Gitlab issue #248, and scanned note. power1 = ( @@ -1269,8 +1275,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "ECH wall plug efficiency", - "(etaech)", - current_drive_variables.etaech, + "(eta_ecrh_injector_wall_plug)", + current_drive_variables.eta_ecrh_injector_wall_plug, ) po.ovarre( self.outfile, @@ -1290,8 +1296,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "ECH wall plug efficiency", - "(etaech)", - current_drive_variables.etaech, + "(eta_ecrh_injector_wall_plug)", + current_drive_variables.eta_ecrh_injector_wall_plug, ) po.ovarre( self.outfile, diff --git a/process/input.py b/process/input.py index 1841e4a47d..ec00bf3fbe 100644 --- a/process/input.py +++ b/process/input.py @@ -460,7 +460,9 @@ def __post_init__(self): "esbldgm3": InputVariable( fortran.buildings_variables, float, range=(1000.0, 1000000.0) ), - "etaech": InputVariable(fortran.current_drive_variables, float, range=(0.0, 1.0)), + "eta_ecrh_injector_wall_plug": InputVariable( + fortran.current_drive_variables, float, range=(0.0, 1.0) + ), "etahtp": InputVariable(fortran.fwbs_variables, float, range=(0.1, 1.0)), "etaiso": InputVariable(fortran.fwbs_variables, float, range=(0.1, 1.0)), "eta_lowhyb_injector_wall_plug": InputVariable( diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py index c3174acb57..ad4fc2a0d9 100644 --- a/process/io/plot_scans.py +++ b/process/io/plot_scans.py @@ -367,7 +367,7 @@ def main(args=None): 76: "etath", 77: "startupratio", 78: "fkind", - 79: "etaech", + 79: "eta_ecrh_injector_wall_plug", 80: "fcoolcp", 81: "n_tf_turn", } diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 0f5c71ab54..88ccf37b3b 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -385,7 +385,7 @@ class VariableMetadata: description="Redundancy factor for gyrotrons", units="", ), - "etaech": VariableMetadata( + "eta_ecrh_injector_wall_plug": VariableMetadata( latex=r"ECH wall plug to injector efficiency", description="Efficiency of electron cyclotron heating", units="", diff --git a/process/scan.py b/process/scan.py index 317a7de041..5c21e394a8 100644 --- a/process/scan.py +++ b/process/scan.py @@ -133,7 +133,9 @@ def __iter__(self): 76: ScanVariable("etath", "Thermal conversion eff."), 77: ScanVariable("startupratio", "Gyrotron redundancy"), 78: ScanVariable("fkind", "Multiplier for Nth of a kind costs"), - 79: ScanVariable("etaech", "ECH wall plug to injector efficiency"), + 79: ScanVariable( + "eta_ecrh_injector_wall_plug", "ECH wall plug to injector efficiency" + ), 80: ScanVariable("fcoolcp", "Coolant fraction of TF"), 81: ScanVariable("n_tf_turn", "Number of turns in TF"), } @@ -1024,7 +1026,7 @@ def scan_select(self, nwp, swp, iscn): case 78: cost_variables.fkind = swp[iscn - 1] case 79: - current_drive_variables.etaech = swp[iscn - 1] + current_drive_variables.eta_ecrh_injector_wall_plug = swp[iscn - 1] case 80: tfcoil_variables.fcoolcp = swp[iscn - 1] case 81: diff --git a/process/stellarator.py b/process/stellarator.py index b174b722f0..d6769ca487 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4944,7 +4944,9 @@ def stheat(self, output: bool): current_drive_variables.echpwr = current_drive_variables.pheat current_drive_variables.pinjimw = 0 current_drive_variables.pinjemw = current_drive_variables.echpwr - current_drive_variables.etacd = current_drive_variables.etaech + current_drive_variables.etacd = ( + current_drive_variables.eta_ecrh_injector_wall_plug + ) current_drive_variables.pinjwp = ( current_drive_variables.pinjimw + current_drive_variables.pinjemw ) / current_drive_variables.etacd diff --git a/process/uncertainties/config_evaluate_uncertainties.json b/process/uncertainties/config_evaluate_uncertainties.json index ccab91b50d..0c95425c4d 100644 --- a/process/uncertainties/config_evaluate_uncertainties.json +++ b/process/uncertainties/config_evaluate_uncertainties.json @@ -88,7 +88,7 @@ "hfact", "radius_plasma_core_norm", "kappa", - "etaech", + "eta_ecrh_injector_wall_plug", "etath", "boundl(18)", "alstrtf", diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 517ca8c228..7a2d901880 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -105,7 +105,7 @@ module current_drive_variables real(dp) :: etacdfix !! secondary auxiliary power wall plug to injector efficiency - real(dp) :: etaech + real(dp) :: eta_ecrh_injector_wall_plug !! ECH wall plug to injector efficiency real(dp) :: eta_lowhyb_injector_wall_plug diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index 774040b415..b1947642bb 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -114,7 +114,7 @@ module scan_module !!
  • 76 etath : Thermal conversion eff. !!
  • 77 startupratio : Gyrotron redundancy !!
  • 78 fkind : Multiplier for Nth of a kind costs - !!
  • 79 etaech : ECH wall plug to injector efficiency + !!
  • 79 eta_ecrh_injector_wall_plug : ECH wall plug to injector efficiency integer :: nsweep_2 !! nsweep_2 /3/ : switch denoting quantity to scan for 2D scan: diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 5d4b64ad62..c691ac8dfe 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -548,7 +548,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 @@ -1648,7 +1648,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index fcf43dc6d2..be2ee92d12 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -549,7 +549,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 @@ -1649,7 +1649,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 464a41dbd3..c5df13df7d 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -549,7 +549,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 @@ -1649,7 +1649,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 5d406a7ee7..656cc05f06 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -549,7 +549,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 @@ -1649,7 +1649,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index c19ebb524d..8341ade2a7 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -459,7 +459,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index c5c104dd21..18231a6a2b 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -546,7 +546,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3624E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.9710E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5942E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7129E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8516E+02 @@ -1650,7 +1650,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 599ada326a..bcb7d55cfe 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -161,7 +161,7 @@ output_costs = 1 * Switch for costs output; *-------------Current Drive Variables--------------* bootstrap_current_fraction_max = 0.95 * maximum fraction of plasma current from bootstrap; if `bscfmax < 0`; -etaech = 0.5 * ECH wall plug to injector efficiency +eta_ecrh_injector_wall_plug = 0.5 * ECH wall plug to injector efficiency gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) i_hcd_primary = 10 * Switch for current drive efficiency model; pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) diff --git a/tests/integration/data/morris_method_output.txt b/tests/integration/data/morris_method_output.txt index 2ed866d392..cd27f2ce79 100644 --- a/tests/integration/data/morris_method_output.txt +++ b/tests/integration/data/morris_method_output.txt @@ -9,7 +9,7 @@ boundl(103) -1030.845000 1030.845000 598.924417 215.477105 cboot 37.700000 137.400000 495.800565 171.013632 f_fw_rad_max 0.000000 0.000000 0.000000 0.000000 kappa -74.615000 196.015000 439.721926 144.051555 -etaech 33.550000 39.150000 186.146973 66.313416 +eta_ecrh_injector_wall_plug 33.550000 39.150000 186.146973 66.313416 feffcd 0.000000 0.000000 0.000000 0.000000 etath 19.600000 19.600000 18.064253 6.309154 etaiso -9.200000 9.300000 17.142204 5.925170 diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 1c22f48770..a9c50585b7 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -168,7 +168,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) -etaech = 0.4 * ECRH wall-plug efficiency +eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 00617cc79d..bf9e5da0e0 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -550,7 +550,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.9070E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9996E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8403E+02 @@ -1713,7 +1713,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0452E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0647E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8362E+02 @@ -2876,7 +2876,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.1394E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5559E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5112E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1163E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8300E+02 @@ -4039,7 +4039,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.1153E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1107E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8204E+02 @@ -5202,7 +5202,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0782E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0691E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8323E+02 @@ -6365,7 +6365,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0864E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9993E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8374E+02 @@ -7528,7 +7528,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0680E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9926E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8284E+02 @@ -8691,7 +8691,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0605E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0503E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8182E+02 @@ -9854,7 +9854,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0220E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1023E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8018E+02 @@ -11017,7 +11017,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0090E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1014E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.7989E+02 @@ -12180,7 +12180,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0601E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0509E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8184E+02 @@ -13343,7 +13343,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0647E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9941E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8291E+02 @@ -14506,7 +14506,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0495E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9920E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8251E+02 @@ -15669,7 +15669,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0246E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0529E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8208E+02 @@ -16832,7 +16832,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0010E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1139E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8166E+02 @@ -17936,7 +17936,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index c4828c26ba..12f822fb49 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -404,7 +404,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -1399,7 +1399,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -2394,7 +2394,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -3389,7 +3389,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -4384,7 +4384,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -5379,7 +5379,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -6374,7 +6374,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -7369,7 +7369,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -8364,7 +8364,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 @@ -9147,7 +9147,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) -etaech = 0.4 * ECRH wall-plug efficiency +eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 007c18d1d9..59516ecec2 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -168,7 +168,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) -etaech = 0.4 * ECRH wall-plug efficiency +eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 95d10f97c6..d6d5d994a0 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -168,7 +168,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) -etaech = 0.4 * ECRH wall-plug efficiency +eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 426e3787ad..02dc09cf02 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1767,7 +1767,7 @@ "etacd": 0.0, "etacdfix": 0.0, "etadrv": 0.0, - "etaech": 0.3, + "eta_ecrh_injector_wall_plug": 0.3, "etahtp": 0.95, "etaiso": 0.85, "eta_lowhyb_injector_wall_plug": 0.3, @@ -9371,7 +9371,7 @@ "etacd": "auxiliary power wall plug to injector efficiency", "etacdfix": "secondary auxiliary power wall plug to injector efficiency", "etadrv": "IFE driver wall plug to target efficiency", - "etaech": "ECH wall plug to injector efficiency", + "eta_ecrh_injector_wall_plug": "ECH wall plug to injector efficiency", "etahtp": "electrical efficiency of primary coolant pumps", "etaiso": "isentropic efficiency of FW and blanket coolant pumps", "eta_lowhyb_injector_wall_plug": "lower hybrid wall plug to injector efficiency", @@ -12231,7 +12231,7 @@ "lb": 1000.0, "ub": 1000000.0 }, - "etaech": { + "eta_ecrh_injector_wall_plug": { "lb": 0.0, "ub": 1.0 }, @@ -17632,7 +17632,7 @@ "beam_energy", "etacd", "etacdfix", - "etaech", + "eta_ecrh_injector_wall_plug", "eta_lowhyb_injector_wall_plug", "eta_beam_injector_wall_plug", "fpion", @@ -19993,7 +19993,7 @@ "epsfcn": "real_variable", "epsvmc": "real_variable", "esbldgm3": "real_variable", - "etaech": "real_variable", + "eta_ecrh_injector_wall_plug": "real_variable", "etahtp": "real_variable", "etaiso": "real_variable", "eta_lowhyb_injector_wall_plug": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index a7b73bca6b..359063c615 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -104,7 +104,7 @@ beta_min = 0.01 *lower beta limit *-------------Current Drive Variables--------------* -etaech = 0.7 *ECH wall plug to injector efficiency +eta_ecrh_injector_wall_plug = 0.7 *ECH wall plug to injector efficiency pheat = 0.0 *Heating power not used for current drive (MW) *----------------Divertor Variables----------------* diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index a63c4c4e8f..7dd33e7f58 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -462,7 +462,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index c786c15ecc..8cdaed3ae1 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -444,7 +444,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.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 6b0606867a..061495861f 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -161,7 +161,7 @@ output_costs = 1 * Switch for costs output; *-------------Current Drive Variables--------------* bootstrap_current_fraction_max = 0.95 * maximum fraction of plasma current from bootstrap; if `bootstrap_current_fraction_max < 0`; -etaech = 0.5 * ECH wall plug to injector efficiency +eta_ecrh_injector_wall_plug = 0.5 * ECH wall plug to injector efficiency gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) i_hcd_primary = 10 * Switch for current drive efficiency model; pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) 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 70b0a21968..fe1a7c0c38 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -197,7 +197,7 @@ output_costs = 1 * Switch for costs output; bootstrap_current_fraction_max = 0.9 * maximum fraction of plasma current from bootstrap; if `bootstrap_current_fraction_max < 0`; harnum = 2 * cyclotron harmonic frequency number; used in cut-off function wave_mode = 0 * Switch for ECRH wave mode ; -etaech = 0.45 * ECH wall plug to injector efficiency +eta_ecrh_injector_wall_plug = 0.45 * ECH wall plug to injector efficiency feffcd = 1.0 * current drive efficiency fudge factor (`iteration variable 47`) i_hcd_primary = 13 * Switch for current drive efficiency model; irfcd = 1 * Switch for current drive calculation; diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 94a44bd261..8daa6a90f6 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2837,7 +2837,7 @@ wave_mode = 0 * Electron cyclotron * *--------------------* -etaech = 0.45 +eta_ecrh_injector_wall_plug = 0.45 * DESCRIPTION: ECRH Wall Plug to Injector Efficiency * JUSTIFICATION: diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index bde589bc0d..4eb818c36f 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -153,7 +153,7 @@ ucme = 3.e8 * cost of maintenance equipment ($) *-------------Current Drive Variables--------------* -etaech = 0.7 * ECH wall plug to injector efficiency +eta_ecrh_injector_wall_plug = 0.7 * ECH wall plug to injector efficiency pheat = 0. * heating power not used for current drive (MW) (`iteration variable 11`) *-------------------Dcll Module--------------------* diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 73d31d1123..10631ee26c 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -460,7 +460,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 713d95f75f..ad41a9f445 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -546,7 +546,7 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3624E-01 ITV Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.9710E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 - ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 + ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5942E+02 OP Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7129E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8516E+02 @@ -1651,7 +1651,7 @@ i_hcd_primary = 10 gamma_ecrh = 0.30 * ECRH wall-plug efficiency -etaech = 0.5 +eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] pheat = 75.0 diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 0a52f604fa..0a2f841ea5 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -65,7 +65,7 @@ class CudrivParam(NamedTuple): etacdfix: Any = None - etaech: Any = None + eta_ecrh_injector_wall_plug: Any = None f_p_beam_orbit_loss: Any = None @@ -225,7 +225,7 @@ class CudrivParam(NamedTuple): eta_lowhyb_injector_wall_plug=0.29999999999999999, etacd=0, etacdfix=0, - etaech=0.5, + eta_ecrh_injector_wall_plug=0.5, f_p_beam_orbit_loss=0, pinjmw=0, pwpnb=0, @@ -315,7 +315,7 @@ class CudrivParam(NamedTuple): eta_lowhyb_injector_wall_plug=0.29999999999999999, etacd=0.5, etacdfix=0, - etaech=0.5, + eta_ecrh_injector_wall_plug=0.5, f_p_beam_orbit_loss=0, pinjmw=120.49600019005746, pwpnb=0, @@ -456,7 +456,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "etacdfix", cudrivparam.etacdfix) - monkeypatch.setattr(current_drive_variables, "etaech", cudrivparam.etaech) + monkeypatch.setattr( + current_drive_variables, + "eta_ecrh_injector_wall_plug", + cudrivparam.eta_ecrh_injector_wall_plug, + ) monkeypatch.setattr( current_drive_variables, "f_p_beam_orbit_loss", cudrivparam.f_p_beam_orbit_loss From 475fa308287e542bded2926b6a887823c577dcc9 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 15:06:06 +0100 Subject: [PATCH 14/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20fpion=20to=20f=5F?= =?UTF-8?q?p=5Fbeam=5Finjected=5Fions=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NBI/culham_nb.md | 4 +- .../heating_and_current_drive/NBI/iter_nb.md | 2 +- process/current_drive.py | 38 ++++++++++--------- process/stellarator.py | 13 +++++-- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +-- tests/unit/test_current_drive.py | 12 ++++-- 7 files changed, 45 insertions(+), 32 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md index 5777796069..6013cd900c 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md @@ -12,7 +12,7 @@ from that of ITER (approx. 2.8). | Output | Description | |----------|-------------| | $\mathtt{effnbss}$ | Neutral beam current drive efficiency in Amperes per Watt | -| $\mathtt{fpion}$ | Fraction of NB power given to ions | +| $\mathtt{f_p_beam_injected_ions}$ | Fraction of NB power given to ions | | $\mathtt{fshine}$ | Shine-through fraction of the beam | $$ @@ -56,7 +56,7 @@ $$ \mathtt{dent} = n_{\text{ion}} \times \mathtt{f_tritium_beam} $$ -Power split to the ions and electrons is clauclated with the $\mathtt{cfnbi()}$ method found [here](../NBI/nbi_overview.md/#ion-coupled-power-cfnbi) and outputs $\mathtt{fpion}$ +Power split to the ions and electrons is clauclated with the $\mathtt{cfnbi()}$ method found [here](../NBI/nbi_overview.md/#ion-coupled-power-cfnbi) and outputs $\mathtt{f_p_beam_injected_ions}$ ## Current drive efficiency | `etanb2()` diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md index 231972761f..45091e1a8e 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md @@ -5,7 +5,7 @@ | Output | Description | |----------|-------------| | $\mathtt{effnbss}$ | Neutral beam current drive efficiency in $\text{A/W}$ | -| $\mathtt{fpion}$ | Fraction of NB power given to ions | +| $\mathtt{f_p_beam_injected_ions}$ | Fraction of NB power given to ions | | $\mathtt{fshine}$ | Shine-through fraction of the beam | This model calculates the current drive parameters for a neutral beam system, based on the 1990 ITER model.[^1] diff --git a/process/current_drive.py b/process/current_drive.py index 3761796ef5..e153b1839c 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -121,7 +121,7 @@ def cudriv(self, output: bool): elif current_drive_variables.i_hcd_secondary == 5: ( effnbss, - current_drive_variables.fpion, + current_drive_variables.f_p_beam_injected_ions, current_drive_variables.f_p_beam_shine_through, ) = self.iternb() effnbssfix = effnbss * current_drive_variables.feffcd @@ -140,7 +140,7 @@ def cudriv(self, output: bool): elif current_drive_variables.i_hcd_secondary == 8: ( effnbss, - current_drive_variables.fpion, + current_drive_variables.f_p_beam_injected_ions, current_drive_variables.f_p_beam_shine_through, ) = self.culnbi() effnbssfix = effnbss * current_drive_variables.feffcd @@ -345,8 +345,10 @@ def cudriv(self, output: bool): # Power deposited pinjmwfix = pnbitotfix - nbshinemwfix - porbitlossmwfix - pinjimwfix = pinjmwfix * current_drive_variables.fpion - pinjemwfix = pinjmwfix * (1.0e0 - current_drive_variables.fpion) + pinjimwfix = pinjmwfix * current_drive_variables.f_p_beam_injected_ions + pinjemwfix = pinjmwfix * ( + 1.0e0 - current_drive_variables.f_p_beam_injected_ions + ) current_drive_variables.pwpnb = ( pnbitotfix / current_drive_variables.eta_beam_injector_wall_plug @@ -422,7 +424,7 @@ def cudriv(self, output: bool): elif current_drive_variables.i_hcd_primary == 5: ( effnbss, - current_drive_variables.fpion, + current_drive_variables.f_p_beam_injected_ions, current_drive_variables.f_p_beam_shine_through, ) = self.iternb() effnbss = effnbss * current_drive_variables.feffcd @@ -441,7 +443,7 @@ def cudriv(self, output: bool): elif current_drive_variables.i_hcd_primary == 8: ( effnbss, - current_drive_variables.fpion, + current_drive_variables.f_p_beam_injected_ions, current_drive_variables.f_p_beam_shine_through, ) = self.culnbi() effnbss = effnbss * current_drive_variables.feffcd @@ -675,8 +677,10 @@ def cudriv(self, output: bool): - current_drive_variables.p_beam_shine_through_mw - current_drive_variables.p_beam_orbit_loss ) - pinjimw1 = pinjmw1 * current_drive_variables.fpion - pinjemw1 = pinjmw1 * (1.0e0 - current_drive_variables.fpion) + pinjimw1 = pinjmw1 * current_drive_variables.f_p_beam_injected_ions + pinjemw1 = pinjmw1 * ( + 1.0e0 - current_drive_variables.f_p_beam_injected_ions + ) current_drive_variables.pwpnb = ( current_drive_variables.p_beam_injected @@ -1227,8 +1231,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Fraction of beam energy to ions", - "(fpion)", - current_drive_variables.fpion, + "(f_p_beam_injected_ions)", + current_drive_variables.f_p_beam_injected_ions, "OP ", ) po.ovarre( @@ -1311,7 +1315,7 @@ def iternb(self): """Routine to calculate ITER Neutral Beam current drive parameters author: P J Knight, CCFE, Culham Science Centre effnbss : output real : neutral beam current drive efficiency (A/W) - fpion : output real : fraction of NB power given to ions + f_p_beam_injected_ions : output real : fraction of NB power given to ions fshine : output real : shine-through fraction of beam This routine calculates the current drive parameters for a neutral beam system, based on the 1990 ITER model. @@ -1356,7 +1360,7 @@ def iternb(self): dent = physics_variables.nd_fuel_ions * current_drive_variables.f_tritium_beam # Power split to ions / electrons - fpion = self.cfnbi( + f_p_beam_injected_ions = self.cfnbi( physics_variables.m_beam_amu, current_drive_variables.beam_energy, physics_variables.ten, @@ -1380,7 +1384,7 @@ def iternb(self): physics_variables.zeff, ) - return effnbss, fpion, fshine + return effnbss, f_p_beam_injected_ions, fshine def cullhy(self): """Routine to calculate Lower Hybrid current drive efficiency @@ -1585,7 +1589,7 @@ def culnbi(self): """Routine to calculate Neutral Beam current drive parameters author: P J Knight, CCFE, Culham Science Centre effnbss : output real : neutral beam current drive efficiency (A/W) - fpion : output real : fraction of NB power given to ions + f_p_beam_injected_ions : output real : fraction of NB power given to ions fshine : output real : shine-through fraction of beam This routine calculates Neutral Beam current drive parameters using the corrections outlined in AEA FUS 172 to the ITER method. @@ -1636,7 +1640,7 @@ def culnbi(self): # Power split to ions / electrons - fpion = self.cfnbi( + f_p_beam_injected_ions = self.cfnbi( physics_variables.m_beam_amu, current_drive_variables.beam_energy, physics_variables.ten, @@ -1665,7 +1669,7 @@ def culnbi(self): physics_variables.zeff, ) - return effnbss, fpion, fshine + return effnbss, f_p_beam_injected_ions, fshine def lhrad(self): """Routine to calculate Lower Hybrid wave absorption radius @@ -1966,7 +1970,7 @@ def cfnbi(self, afast, efast, te, ne, _nd, _nt, zeffai, xlmbda): nt : input real : tritium beam density (m**-3) zeffai : input real : mass weighted plasma effective charge xlmbda : input real : ion-electron coulomb logarithm - fpion : output real : fraction of fast particle energy coupled to ions + f_p_beam_injected_ions : output real : fraction of fast particle energy coupled to ions This routine calculates the fast particle energy coupled to the ions in the neutral beam system. """ diff --git a/process/stellarator.py b/process/stellarator.py index d6769ca487..f57b828616 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4963,7 +4963,7 @@ def stheat(self, output: bool): elif stellarator_variables.isthtr == 3: ( effnbss, - fpion, + f_p_beam_injected_ions, current_drive_variables.f_p_beam_shine_through, ) = self.current_drive.culnbi() current_drive_variables.pnbeam = current_drive_variables.pheat * ( @@ -4973,9 +4973,11 @@ def stheat(self, output: bool): current_drive_variables.pheat * current_drive_variables.f_p_beam_orbit_loss ) - current_drive_variables.pinjimw = current_drive_variables.pnbeam * fpion + current_drive_variables.pinjimw = ( + current_drive_variables.pnbeam * f_p_beam_injected_ions + ) current_drive_variables.pinjemw = current_drive_variables.pnbeam * ( - 1 - fpion + 1 - f_p_beam_injected_ions ) current_drive_variables.etacd = ( current_drive_variables.eta_beam_injector_wall_plug @@ -5068,7 +5070,10 @@ def stheat(self, output: bool): current_drive_variables.beam_current, ) po.ovarre( - self.outfile, "Fraction of beam energy to ions", "(fpion)", fpion + self.outfile, + "Fraction of beam energy to ions", + "(f_p_beam_injected_ions)", + f_p_beam_injected_ions, ) po.ovarre( self.outfile, diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 7a2d901880..977e2357f6 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -114,7 +114,7 @@ module current_drive_variables real(dp) :: eta_beam_injector_wall_plug !! neutral beam wall plug to injector efficiency - real(dp) :: fpion + real(dp) :: f_p_beam_injected_ions !! fraction of beam energy to ions real(dp) :: p_beam_injected diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 02dc09cf02..b67704f6ec 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1979,7 +1979,7 @@ "fpe1_": "wpe1_/(2*pi)", "fpeakb": 1.0, "fpinj": 1.0, - "fpion": 0.5, + "f_p_beam_injected_ions": 0.5, "fplhsep": 1.0, "fpnetel": 1.0, "fpoloidalpower": 1.0, @@ -9536,7 +9536,7 @@ "fpe1_": "", "fpeakb": "f-value for maximum toroidal field (`constraint equation 25`, `iteration variable 35`)", "fpinj": "f-value for injection power (`constraint equation 30`, `iteration variable 46`)", - "fpion": "fraction of beam energy to ions", + "f_p_beam_injected_ions": "fraction of beam energy to ions", "fplhsep": "F-value for Psep >= Plh + Paux (`constraint equation 73`)", "fpnetel": "f-value for net electric power (`constraint equation 16`, `iteration variable 25`)", "fpoloidalpower": "f-value for constraint on rate of change of energy in poloidal field\n (`constraint equation 66`, `iteration variable 115`)", @@ -17635,7 +17635,7 @@ "eta_ecrh_injector_wall_plug", "eta_lowhyb_injector_wall_plug", "eta_beam_injector_wall_plug", - "fpion", + "f_p_beam_injected_ions", "p_beam_injected", "pscf_scene", "p_beam_shine_through_mw", diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 0a2f841ea5..2fcba9e6b7 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -51,7 +51,7 @@ class CudrivParam(NamedTuple): feffcd: Any = None - fpion: Any = None + f_p_beam_injected_ions: Any = None f_p_beam_shine_through: Any = None @@ -218,7 +218,7 @@ class CudrivParam(NamedTuple): pinjfixmw=0, irfcd=1, feffcd=1, - fpion=0.5, + f_p_beam_injected_ions=0.5, f_p_beam_shine_through=0, gamcd=0, gamma_ecrh=0.30000000000000004, @@ -308,7 +308,7 @@ class CudrivParam(NamedTuple): pinjfixmw=0, irfcd=1, feffcd=1, - fpion=0.5, + f_p_beam_injected_ions=0.5, f_p_beam_shine_through=0, gamcd=0.30000000000000004, gamma_ecrh=0.30000000000000004, @@ -434,7 +434,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "feffcd", cudrivparam.feffcd) - monkeypatch.setattr(current_drive_variables, "fpion", cudrivparam.fpion) + monkeypatch.setattr( + current_drive_variables, + "f_p_beam_injected_ions", + cudrivparam.f_p_beam_injected_ions, + ) monkeypatch.setattr( current_drive_variables, From e2487a8f9d75d6814abe6094b0dcb9257c5ecfc3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 15:44:43 +0100 Subject: [PATCH 15/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20pinjmw=20to=20p?= =?UTF-8?q?=5Fhcd=5Finjected=5Ftotal=5Fmw=20for=20clarity=20and=20consiste?= =?UTF-8?q?ncy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/physics-models/error.txt | 6 +- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +- examples/data/large_tokamak_1_MFILE.DAT | 4 +- examples/data/large_tokamak_2_MFILE.DAT | 4 +- examples/data/large_tokamak_3_MFILE.DAT | 4 +- examples/data/large_tokamak_4_MFILE.DAT | 4 +- examples/data/scan_MFILE.DAT | 36 +++++------ process/costs_2015.py | 4 +- process/current_drive.py | 12 ++-- process/io/mfile_comparison.py | 4 +- process/io/plot_proc.py | 2 +- process/io/sankey_funcs.py | 42 +++++++++---- process/io/variable_metadata.py | 2 +- process/objectives.py | 4 +- process/physics.py | 35 ++++++----- process/power.py | 23 +++++-- process/stellarator.py | 12 ++-- source/fortran/constraint_equations.f90 | 36 +++++------ source/fortran/current_drive_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 60 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 36 +++++------ tests/integration/ref_dicts.json | 6 +- .../input_files/st_regression.IN.DAT | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- tests/unit/test_costs_2015.py | 10 ++-- tests/unit/test_current_drive.py | 22 ++++--- tests/unit/test_physics.py | 42 ++++++------- tests/unit/test_power.py | 12 ++-- tracking/tracking_data.py | 2 +- 34 files changed, 252 insertions(+), 208 deletions(-) diff --git a/documentation/proc-pages/physics-models/error.txt b/documentation/proc-pages/physics-models/error.txt index 964f262ea6..96718cd7e7 100644 --- a/documentation/proc-pages/physics-models/error.txt +++ b/documentation/proc-pages/physics-models/error.txt @@ -994,18 +994,18 @@ is derived directly from the energy confinement scaling law. \texttt{i_rad_loss\ =\ 0} -- Total power lost is scaling power plus radiation -\texttt{pscaling\ +\ pden_plasma_rad_mw\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ pinjmw/vol_plasma} +\texttt{pscaling\ +\ pden_plasma_rad_mw\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ p_hcd_injected_total_mw/vol_plasma} \texttt{i_rad_loss\ =\ 1} -- Total power lost is scaling power plus core radiation only -\texttt{pscaling\ +\ pden_plasma_core_rad_mw\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ pinjmw/vol_plasma} +\texttt{pscaling\ +\ pden_plasma_core_rad_mw\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ p_hcd_injected_total_mw/vol_plasma} \texttt{i_rad_loss\ =\ 2} -- Total power lost is scaling power only, with no additional allowance for radiation. This is not recommended for power plant models. -\texttt{pscaling\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ pinjmw/vol_plasma} +\texttt{pscaling\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ p_hcd_injected_total_mw/vol_plasma} \subsection{Plasma Core Power Balance}\label{plasma-core-power-balance} diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 7ff42f36c5..317de6b7c6 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1142,11 +1142,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0224E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2322E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.6172E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5213E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5213E+01 Total_(MW)______________________________________________________________ ______________________________ 3.7935E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.5926E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0312E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5213E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5213E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.6172E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6306E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1347E+03 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 859282b5a1..427e625568 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1137,11 +1137,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 8.0143E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 8.0143E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6202E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0836E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 8.0143E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 8.0143E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6576E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1751E+03 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 1e9f2ea2a8..dcf53f6460 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1137,11 +1137,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 8.0143E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 8.0143E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6202E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0836E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 8.0143E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 8.0143E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6576E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1751E+03 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 7ffbe3e3e1..0c105a6a32 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1137,11 +1137,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 8.0143E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 8.0143E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6202E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0836E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 8.0143E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 8.0143E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6576E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1751E+03 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index d7c47a5136..5dd33f4cc0 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1137,11 +1137,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 8.0143E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 8.0143E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6202E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0836E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 8.0143E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 8.0143E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6576E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1751E+03 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index e71e74340b..2db34b82bb 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -964,11 +964,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -1959,11 +1959,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -2954,11 +2954,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -3949,11 +3949,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -4944,11 +4944,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -5939,11 +5939,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -6934,11 +6934,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -7929,11 +7929,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -8924,11 +8924,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 diff --git a/process/costs_2015.py b/process/costs_2015.py index 4b1e6ee376..a6939b911a 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -955,7 +955,7 @@ def calc_remaining_subsystems(self): # Increased to 90 Mdollar because of press release self.s_cref[40] = 90.0e6 # Scale with total aux injected power (MW) - self.s_k[40] = current_drive_variables.pinjmw + self.s_k[40] = current_drive_variables.p_hcd_injected_total_mw self.s_kref[40] = 50.0e0 self.s_cost[40] = ( self.s_cost_factor[40] @@ -1110,7 +1110,7 @@ def calc_remaining_subsystems(self): # Cost of ITER NB H and CD self.s_cref[52] = 814.0e6 # Scale with total auxiliary injected power (MW) - self.s_k[52] = current_drive_variables.pinjmw + self.s_k[52] = current_drive_variables.p_hcd_injected_total_mw self.s_kref[52] = 50.0e0 self.s_cost[52] = ( self.s_cost_factor[52] diff --git a/process/current_drive.py b/process/current_drive.py index e153b1839c..bfbc4f88cc 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -700,7 +700,7 @@ def cudriv(self, output: bool): # Total injected power # sum contributions from primary and secondary systems - current_drive_variables.pinjmw = ( + current_drive_variables.p_hcd_injected_total_mw = ( pinjemw1 + pinjimw1 + pinjemwfix + pinjimwfix ) pinjmw1 = pinjemw1 + pinjimw1 @@ -718,7 +718,7 @@ def cudriv(self, output: bool): # Ratio of fusion to input (injection+ohmic) power if ( abs( - current_drive_variables.pinjmw + current_drive_variables.p_hcd_injected_total_mw + current_drive_variables.p_beam_orbit_loss + physics_variables.p_plasma_ohmic_mw ) @@ -727,7 +727,7 @@ def cudriv(self, output: bool): current_drive_variables.bigq = 1.0e18 else: current_drive_variables.bigq = physics_variables.fusion_power / ( - current_drive_variables.pinjmw + current_drive_variables.p_hcd_injected_total_mw + current_drive_variables.p_beam_orbit_loss + physics_variables.p_plasma_ohmic_mw ) @@ -824,7 +824,7 @@ def cudriv(self, output: bool): self.outfile, "Power injected for current drive (MW)", "(pcurrentdrivemw)", - current_drive_variables.pinjmw + current_drive_variables.p_hcd_injected_total_mw - current_drive_variables.pheat - current_drive_variables.pheatfix, ) @@ -1151,7 +1151,7 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Beam power deposited in plasma (MW)", - "(pinjmw)", + "(p_hcd_injected_total_mw)", pinjmw1, "OP ", ) @@ -1164,7 +1164,7 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Total (MW)", - "(current_drive_variables.p_beam_orbit_loss+current_drive_variables.p_beam_shine_through_mw+current_drive_variables.pinjmw)", + "(current_drive_variables.p_beam_orbit_loss+current_drive_variables.p_beam_shine_through_mw+current_drive_variables.p_hcd_injected_total_mw)", current_drive_variables.p_beam_orbit_loss + current_drive_variables.p_beam_shine_through_mw + pinjmw1, diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 0fb27f9025..e530840a3e 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -172,7 +172,7 @@ "etath", "pgrossmw", "pnetelmw", - "pinjmw", + "p_hcd_injected_total_mw", "pheat", "bootstrap_current_fraction", "aux_current_fraction", @@ -223,7 +223,7 @@ "beta", "te", "dene", - "pinjmw", + "p_hcd_injected_total_mw", "pnetelmw", "pflux_fw_neutron_mw", "pflux_fw_rad_mw", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 9a29e1ac46..c6609886ce 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3094,7 +3094,7 @@ def plot_current_drive_info(axis, mfile_data, scan): axis.set_autoscaley_on(False) axis.set_autoscalex_on(False) - pinjie = mfile_data.data["pinjmw"].get_scan(scan) + pinjie = mfile_data.data["p_hcd_injected_total_mw"].get_scan(scan) pdivt = mfile_data.data["pdivt"].get_scan(scan) pdivr = pdivt / mfile_data.data["rmajor"].get_scan(scan) diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index 016738debb..9f07075055 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -24,12 +24,14 @@ def plot_full_sankey( # Used in [PLASMA] fusion_power = m_file.data["fusion_power"].get_scan(-1) # Fusion power (MW) - pinjmw = m_file.data["pinjmw"].get_scan(-1) # Total auxiliary injected power (MW) + p_hcd_injected_total_mw = m_file.data["p_hcd_injected_total_mw"].get_scan( + -1 + ) # Total auxiliary injected power (MW) p_plasma_ohmic_mw = m_file.data["p_plasma_ohmic_mw"].get_scan( -1 ) # Ohmic heating power (MW) totalplasma = ( - fusion_power + pinjmw + p_plasma_ohmic_mw + fusion_power + p_hcd_injected_total_mw + p_plasma_ohmic_mw ) # Total Power in plasma (MW) neutron_power_total = m_file.data["neutron_power_total"].get_scan( -1 @@ -43,7 +45,9 @@ def plot_full_sankey( alpha_power_total = m_file.data["alpha_power_total"].get_scan( -1 ) # Alpha power (MW) - palpinjmw = alpha_power_total + pinjmw # Alpha particle and HC&D power (MW) + palpinjmw = ( + alpha_power_total + p_hcd_injected_total_mw + ) # Alpha particle and HC&D power (MW) # Used in [NEUTRONICS] emultmw = m_file.data["emultmw"].get_scan( @@ -131,7 +135,7 @@ def plot_full_sankey( # Fusion, Injected, Ohmic, -Charged P.-Ohmic, -Alphas-Injected, -Neutrons plasma = [ fusion_power, - pinjmw, + p_hcd_injected_total_mw, p_plasma_ohmic_mw, -pcharohmmw, -palpinjmw, @@ -413,7 +417,7 @@ def plot_full_sankey( """# ---------------------------------------- HCD - 11 ---------------------------------------- # HCD loss + injected, -injected, -HCD loss - HCD = [pinjht+pinjmw, -pinjmw, -pinjht] + HCD = [pinjht+p_hcd_injected_total_mw, -p_hcd_injected_total_mw, -pinjht] assert(sum(HCD)**2 < 0.5) sankey.add(flows=HCD, # [down(in), up(out), down(out)] @@ -451,7 +455,7 @@ def plot_full_sankey( t.set_position((pos[0]-0.2,pos[1])) if t == diagrams[0].texts[1]: # H&CD t.set_horizontalalignment('right') - t.set_position((pos[0]-0.5*(pinjmw/totalplasma)-0.05,pos[1])) + t.set_position((pos[0]-0.5*(p_hcd_injected_total_mw/totalplasma)-0.05,pos[1])) if t == diagrams[0].texts[2]: # Ohmic t.set_horizontalalignment('left') t.set_position((pos[0]+0.5*(p_plasma_ohmic_mw/totalplasma)+0.05,pos[1])) @@ -466,7 +470,7 @@ def plot_full_sankey( t.set_position((pos[0]+0.5*(alpha_power_total/totalplasma)+0.05,pos[1]-0.1)) if t == diagrams[1].texts[0]: # H&CD power t.set_horizontalalignment('right') - t.set_position((pos[0]-0.5*((pinjht+pinjmw)/totalplasma)-0.05,pos[1])) + t.set_position((pos[0]-0.5*((pinjht+p_hcd_injected_total_mw)/totalplasma)-0.05,pos[1])) if t == diagrams[1].texts[2]: # H&CD losses t.set_horizontalalignment('left') t.set_position((pos[0]+(pinjht/totalplasma)+0.05,pos[1])) @@ -501,12 +505,14 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia # Used in [PLASMA] fusion_power = m_file.data["fusion_power"].get_scan(-1) # Fusion Power (MW) - pinjmw = m_file.data["pinjmw"].get_scan(-1) # Total auxiliary injected Power (MW) + p_hcd_injected_total_mw = m_file.data["p_hcd_injected_total_mw"].get_scan( + -1 + ) # Total auxiliary injected Power (MW) p_plasma_ohmic_mw = m_file.data["p_plasma_ohmic_mw"].get_scan( -1 ) # Ohmic heating Power (MW) totalplasma = ( - fusion_power + pinjmw + p_plasma_ohmic_mw + fusion_power + p_hcd_injected_total_mw + p_plasma_ohmic_mw ) # Total Power in plasma (MW) # Used in [DEPOSITION] @@ -643,7 +649,11 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia # --------------------------------------- PLASMA - 0 -------------------------------------- # Fusion power, Injected power + ohmic power, - total plasma power - plasma = [fusion_power, pinjmw + p_plasma_ohmic_mw, -totalplasma] + plasma = [ + fusion_power, + p_hcd_injected_total_mw + p_plasma_ohmic_mw, + -totalplasma, + ] sankey.add( flows=plasma, orientations=[0, -1, 0], # [right(in), down(in), right(out)] @@ -764,7 +774,11 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia # --------------------------------------- LOSSES - 6 -------------------------------------- # HCD: Heating system, -Plasma heating, -losses - hcd = [pinjwp - ppumpmw, -pinjmw, -pinjwp + pinjmw + ppumpmw] + hcd = [ + pinjwp - ppumpmw, + -p_hcd_injected_total_mw, + -pinjwp + p_hcd_injected_total_mw + ppumpmw, + ] sankey.add( flows=hcd, orientations=[0, -1, 0], # [left(in), up(out), left(out)] @@ -848,12 +862,14 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia if t == diagrams[6].texts[1]: # Plasma Heating t.set_horizontalalignment("left") t.set_position(( - pos[0] + 0.5 * (pinjmw / totalplasma) + 0.1, + pos[0] + 0.5 * (p_hcd_injected_total_mw / totalplasma) + 0.1, pos[1] - 0.05, )) if t == diagrams[6].texts[2]: # Losses t.set_horizontalalignment("left") t.set_position(( pos[0] + 0.15, - pos[1] - 0.5 * ((pinjwp - pinjmw) / totalplasma) - 0.2, + pos[1] + - 0.5 * ((pinjwp - p_hcd_injected_total_mw) / totalplasma) + - 0.2, )) diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 88ccf37b3b..50a0ba24bc 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -141,7 +141,7 @@ class VariableMetadata: description="Toroidal field lower bound", units="A", ), - "pinjmw": VariableMetadata( + "p_hcd_injected_total_mw": VariableMetadata( latex=r"$P_\mathrm{inj}$ [$MW$]", description="Injected power", units="MW" ), "hldivlim": VariableMetadata( diff --git a/process/objectives.py b/process/objectives.py index fe033b2fe3..5b7a3b865d 100644 --- a/process/objectives.py +++ b/process/objectives.py @@ -73,7 +73,7 @@ def objective_function(minmax: int) -> float: ) / 10.0 case 5: objective_metric = physics_variables.fusion_power / ( - current_drive_variables.pinjmw + current_drive_variables.p_hcd_injected_total_mw + current_drive_variables.p_beam_orbit_loss + physics_variables.p_plasma_ohmic_mw ) @@ -92,7 +92,7 @@ def objective_function(minmax: int) -> float: case 10: objective_metric = physics_variables.bt case 11: - objective_metric = current_drive_variables.pinjmw + objective_metric = current_drive_variables.p_hcd_injected_total_mw case 14: objective_metric = times_variables.t_burn / 2.0e4 case 15: diff --git a/process/physics.py b/process/physics.py index d44fb625a7..8a83124b56 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2274,7 +2274,11 @@ def physics(self): # Power transported to the divertor by charged particles, # i.e. excludes neutrons and radiation, and also NBI orbit loss power, # which is assumed to be absorbed by the first wall - pinj = current_drive_variables.pinjmw if physics_variables.ignite == 0 else 0.0 + pinj = ( + current_drive_variables.p_hcd_injected_total_mw + if physics_variables.ignite == 0 + else 0.0 + ) physics_variables.pdivt = ( physics_variables.f_alpha_plasma * physics_variables.alpha_power_total @@ -2323,7 +2327,7 @@ def physics(self): physics_variables.bt, physics_variables.i_density_limit, physics_variables.pdivt, - current_drive_variables.pinjmw, + current_drive_variables.p_hcd_injected_total_mw, physics_variables.plasma_current, divertor_variables.prn1, physics_variables.qstar, @@ -2358,7 +2362,7 @@ def physics(self): physics_variables.kappa, physics_variables.kappa95, physics_variables.non_alpha_charged_power, - current_drive_variables.pinjmw, + current_drive_variables.p_hcd_injected_total_mw, physics_variables.plasma_current, physics_variables.pden_plasma_core_rad_mw, physics_variables.rmajor, @@ -2590,7 +2594,7 @@ def physics(self): physics_variables.f_alpha_plasma * physics_variables.alpha_power_total + physics_variables.non_alpha_charged_power + physics_variables.p_plasma_ohmic_mw - + current_drive_variables.pinjmw + + current_drive_variables.p_hcd_injected_total_mw ) physics_module.rad_fraction_lcfs = ( 1.0e6 * physics_variables.p_plasma_rad_mw / physics_module.total_loss_power @@ -2642,7 +2646,7 @@ def calculate_density_limit( bt: float, i_density_limit: int, pdivt: float, - pinjmw: float, + p_hcd_injected_total_mw: float, plasma_current: float, prn1: float, qcyl: float, @@ -2659,7 +2663,7 @@ def calculate_density_limit( bt (float): Toroidal field on axis (T). i_density_limit (int): Switch denoting which formula to enforce. pdivt (float): Power flowing to the edge plasma via charged particles (MW). - pinjmw (float): Power injected into the plasma (MW). + p_hcd_injected_total_mw (float): Power injected into the plasma (MW). plasma_current (float): Plasma current (A). prn1 (float): Edge density / average plasma density. qcyl (float): Equivalent cylindrical safety factor (qstar). @@ -2738,7 +2742,7 @@ def calculate_density_limit( dlimit[3] = 0.0 else: - dlimit[3] = (1.0e20 * np.sqrt(pinjmw / denom)) / prn1 + dlimit[3] = (1.0e20 * np.sqrt(p_hcd_injected_total_mw / denom)) / prn1 # JET simplified density limit model # This applies to the density at the plasma edge, so must be scaled @@ -2758,7 +2762,7 @@ def calculate_density_limit( dlimit[7] = ( 1.0e20 * 0.506 - * (pinjmw**0.396 * (plasma_current / 1.0e6) ** 0.265) + * (p_hcd_injected_total_mw**0.396 * (plasma_current / 1.0e6) ** 0.265) / (q95**0.323) ) / prn1 @@ -4723,7 +4727,7 @@ def outplas(self): physics_variables.f_alpha_plasma * physics_variables.alpha_power_total + physics_variables.non_alpha_charged_power + physics_variables.p_plasma_ohmic_mw - + current_drive_variables.pinjmw + + current_drive_variables.p_hcd_injected_total_mw ) po.ovarre( self.outfile, @@ -5989,7 +5993,7 @@ def output_confinement_comparison(self, istell: int) -> None: physics_variables.kappa, physics_variables.kappa95, physics_variables.non_alpha_charged_power, - current_drive_variables.pinjmw, + current_drive_variables.p_hcd_injected_total_mw, physics_variables.plasma_current, physics_variables.pden_plasma_core_rad_mw, physics_variables.rmajor, @@ -6786,7 +6790,7 @@ def fhz(hfact: float) -> float: physics_variables.kappa, physics_variables.kappa95, physics_variables.non_alpha_charged_power, - current_drive_variables.pinjmw, + current_drive_variables.p_hcd_injected_total_mw, physics_variables.plasma_current, physics_variables.pden_plasma_core_rad_mw, physics_variables.rmajor, @@ -6812,7 +6816,8 @@ def fhz(hfact: float) -> float: # Take into account whether injected power is included in tau_e calculation (i.e. whether device is ignited) if physics_variables.ignite == 0: fhz_value -= ( - current_drive_variables.pinjmw / physics_variables.vol_plasma + current_drive_variables.p_hcd_injected_total_mw + / physics_variables.vol_plasma ) # Include the radiation power if requested @@ -6841,7 +6846,7 @@ def calculate_confinement_time( kappa: float, kappa95: float, non_alpha_charged_power: float, - pinjmw: float, + p_hcd_injected_total_mw: float, plasma_current: float, pden_plasma_core_rad_mw: float, rmajor: float, @@ -6870,7 +6875,7 @@ def calculate_confinement_time( :param kappa: Plasma elongation :param kappa95: Plasma elongation at 95% surface :param non_alpha_charged_power: Non-alpha charged particle fusion power (MW) - :param pinjmw: Auxiliary power to ions and electrons (MW) + :param p_hcd_injected_total_mw: Auxiliary power to ions and electrons (MW) :param plasma_current: Plasma current (A) :param pden_plasma_core_rad_mw: Total core radiation power (MW/m3) :param q95: Edge safety factor (tokamaks), or rotational transform iotabar (stellarators) @@ -6903,7 +6908,7 @@ def calculate_confinement_time( # If the device is not ignited, add the injected auxiliary power if ignite == 0: - p_plasma_loss_mw = p_plasma_loss_mw + pinjmw + p_plasma_loss_mw = p_plasma_loss_mw + p_hcd_injected_total_mw # Include the radiation as a loss term if requested if physics_variables.i_rad_loss == 0: diff --git a/process/power.py b/process/power.py index 900bab5888..b40b24dd56 100644 --- a/process/power.py +++ b/process/power.py @@ -790,15 +790,16 @@ def power1(self): # Secondary heat (some of it... rest calculated in POWER2) # Wall plug injection power # MDK - # heat_transport_variables.pinjwp = (current_drive_variables.pinjmw + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw)/etacd + # heat_transport_variables.pinjwp = (current_drive_variables.p_hcd_injected_total_mw + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw)/etacd # heat_transport_variables.pinjwp calculated in current_drive.f90 # Waste injection power if physics_variables.ignite == 0: # MDK - # pinjht = heat_transport_variables.pinjwp - current_drive_variables.pinjmw - current_drive_variables.p_beam_orbit_loss - physics_variables.p_fw_alpha_mw + # pinjht = heat_transport_variables.pinjwp - current_drive_variables.p_hcd_injected_total_mw - current_drive_variables.p_beam_orbit_loss - physics_variables.p_fw_alpha_mw heat_transport_variables.pinjht = ( - heat_transport_variables.pinjwp - current_drive_variables.pinjmw + heat_transport_variables.pinjwp + - current_drive_variables.p_hcd_injected_total_mw ) else: heat_transport_variables.pinjht = 0.0e0 @@ -1342,7 +1343,11 @@ def power2(self, output: bool): "------------------------------------------------------------------", ) - pinj = current_drive_variables.pinjmw if physics_variables.ignite == 0 else 0.0 + pinj = ( + current_drive_variables.p_hcd_injected_total_mw + if physics_variables.ignite == 0 + else 0.0 + ) primsum = 0.0e0 secsum = 0.0e0 @@ -1727,7 +1732,7 @@ def power2(self, output: bool): po.ovarrf( self.outfile, "Injected power deposited in plasma (MW)", - "(pinjmw)", + "(p_hcd_injected_total_mw)", pinj, "OP ", ) @@ -1781,7 +1786,13 @@ def power2(self, output: bool): fwbs_variables.emultmw, "OP ", ) - po.ovarrf(self.outfile, "Injected power (MW)", "(pinjmw.)", pinj, "OP ") + po.ovarrf( + self.outfile, + "Injected power (MW)", + "(p_hcd_injected_total_mw.)", + pinj, + "OP ", + ) po.ovarrf( self.outfile, "Ohmic power (MW)", diff --git a/process/stellarator.py b/process/stellarator.py index f57b828616..a878fbe138 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4401,7 +4401,7 @@ def stphys(self, output): if physics_variables.ignite == 0: powht = ( - powht + current_drive_variables.pinjmw + powht + current_drive_variables.p_hcd_injected_total_mw ) # if not ignited add the auxiliary power # Here the implementation sometimes leaves the accessible regime when p_plasma_rad_mw> powht which is unphysical and @@ -4467,7 +4467,7 @@ def stphys(self, output): physics_variables.f_alpha_plasma * physics_variables.alpha_power_total + physics_variables.non_alpha_charged_power + physics_variables.p_plasma_ohmic_mw - + current_drive_variables.pinjmw + + current_drive_variables.p_hcd_injected_total_mw ) # Calculate transport losses and energy confinement time using the @@ -4496,7 +4496,7 @@ def stphys(self, output): physics_variables.kappa, physics_variables.kappa95, physics_variables.non_alpha_charged_power, - current_drive_variables.pinjmw, + current_drive_variables.p_hcd_injected_total_mw, physics_variables.plasma_current, physics_variables.pden_plasma_core_rad_mw, physics_variables.rmajor, @@ -4992,7 +4992,7 @@ def stheat(self, output: bool): # Total injected power - current_drive_variables.pinjmw = ( + current_drive_variables.p_hcd_injected_total_mw = ( current_drive_variables.pinjemw + current_drive_variables.pinjimw ) @@ -5011,7 +5011,7 @@ def stheat(self, output: bool): if ( abs( - current_drive_variables.pinjmw + current_drive_variables.p_hcd_injected_total_mw + current_drive_variables.p_beam_orbit_loss + physics_variables.p_plasma_ohmic_mw ) @@ -5020,7 +5020,7 @@ def stheat(self, output: bool): current_drive_variables.bigq = 1e18 else: current_drive_variables.bigq = physics_variables.fusion_power / ( - current_drive_variables.pinjmw + current_drive_variables.p_hcd_injected_total_mw + current_drive_variables.p_beam_orbit_loss + physics_variables.p_plasma_ohmic_mw ) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 49c7e3a3d7..0856ef8238 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -366,12 +366,12 @@ subroutine constraint_err_016() subroutine constraint_err_030() !! Error in: Equation for injection power upper limit !! author: P B Lloyd, CCFE, Culham Science Centre - use current_drive_variables, only: pinjmw, p_hcd_injected_max + use current_drive_variables, only: p_hcd_injected_total_mw, p_hcd_injected_max use constraint_variables, only: fpinj implicit none write(*,*) 'fpinj = ', fpinj write(*,*) 'p_hcd_injected_max = ', p_hcd_injected_max - write(*,*) 'pinjmw = ', pinjmw + write(*,*) 'p_hcd_injected_total_mw = ', p_hcd_injected_total_mw end subroutine subroutine constraint_err_066() @@ -455,13 +455,13 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! alpha_power_density_total : input real : alpha power per volume (MW/m3) !! charged_power_density : input real : non-alpha charged particle fusion power per volume (MW/m3) !! pden_plasma_ohmic_mw : input real : ohmic heating power per volume (MW/m3) - !! pinjmw : input real : total auxiliary injected power (MW) + !! p_hcd_injected_total_mw : input real : total auxiliary injected power (MW) !! vol_plasma : input real : plasma volume (m3) use physics_variables, only: i_rad_loss, ignite, pden_electron_transport_loss_mw, pden_ion_transport_loss_mw, pden_plasma_rad_mw, & pden_plasma_core_rad_mw, f_alpha_plasma, alpha_power_density_total, charged_power_density, & pden_plasma_ohmic_mw, vol_plasma - use current_drive_variables, only: pinjmw + use current_drive_variables, only: p_hcd_injected_total_mw implicit none @@ -487,7 +487,7 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) ! if plasma not ignited include injected power if (ignite == 0) then - pdenom = f_alpha_plasma*alpha_power_density_total + charged_power_density + pden_plasma_ohmic_mw + pinjmw/vol_plasma + pdenom = f_alpha_plasma*alpha_power_density_total + charged_power_density + pden_plasma_ohmic_mw + p_hcd_injected_total_mw/vol_plasma else ! if plasma ignited pdenom = f_alpha_plasma*alpha_power_density_total + charged_power_density + pden_plasma_ohmic_mw @@ -1028,7 +1028,7 @@ subroutine constraint_eqn_017(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. !! f_alpha_plasma : input real : fraction of alpha power deposited in plasma - !! pinjmw : input real : total auxiliary injected power (MW) + !! p_hcd_injected_total_mw : input real : total auxiliary injected power (MW) !! vol_plasma : input real : plasma volume (m3) !! alpha_power_density_total : input real : alpha power per volume (MW/m3) !! charged_power_density : input real : non-alpha charged particle fusion power per volume (MW/m3) @@ -1036,7 +1036,7 @@ subroutine constraint_eqn_017(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! fradpwr : input real : f-value for core radiation power limit !! pden_plasma_rad_mw : input real : total radiation power per volume (MW/m3) use physics_variables, only: f_alpha_plasma, vol_plasma, alpha_power_density_total, charged_power_density, pden_plasma_ohmic_mw, pden_plasma_rad_mw - use current_drive_variables, only: pinjmw + use current_drive_variables, only: p_hcd_injected_total_mw use constraint_variables, only: fradpwr implicit none real(dp), intent(out) :: tmp_cc @@ -1048,7 +1048,7 @@ subroutine constraint_eqn_017(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) real(dp) :: pradmaxpv !! Maximum possible power/vol_plasma that can be radiated (local) - pradmaxpv = pinjmw/vol_plasma + alpha_power_density_total*f_alpha_plasma + charged_power_density + pden_plasma_ohmic_mw + pradmaxpv = p_hcd_injected_total_mw/vol_plasma + alpha_power_density_total*f_alpha_plasma + charged_power_density + pden_plasma_ohmic_mw tmp_cc = pden_plasma_rad_mw/pradmaxpv - 1.0D0 * fradpwr tmp_con = pradmaxpv * (1.0D0 - tmp_cc) tmp_err = pden_plasma_rad_mw * tmp_cc @@ -1498,10 +1498,10 @@ subroutine constraint_eqn_030(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! #=#=# fpinj, p_hcd_injected_max !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. - !! pinjmw : input real : total auxiliary injected power (MW) + !! p_hcd_injected_total_mw : input real : total auxiliary injected power (MW) !! fpinj : input real : f-value for injection power !! p_hcd_injected_max : input real : Maximum allowable value for injected power (MW) - use current_drive_variables, only: pinjmw, p_hcd_injected_max + use current_drive_variables, only: p_hcd_injected_total_mw, p_hcd_injected_max use constraint_variables, only: fpinj implicit none real(dp), intent(out) :: tmp_cc @@ -1510,9 +1510,9 @@ subroutine constraint_eqn_030(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 = pinjmw/p_hcd_injected_max - 1.0D0 * fpinj + tmp_cc = p_hcd_injected_total_mw/p_hcd_injected_max - 1.0D0 * fpinj tmp_con = p_hcd_injected_max - tmp_err = p_hcd_injected_max - pinjmw / fpinj + tmp_err = p_hcd_injected_max - p_hcd_injected_total_mw / fpinj tmp_symbol = '<' tmp_units = 'MW' @@ -1795,10 +1795,10 @@ subroutine constraint_eqn_040(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. !! fauxmn : input real : f-value for minimum auxiliary power - !! pinjmw : input real : total auxiliary injected power (MW) + !! p_hcd_injected_total_mw : input real : total auxiliary injected power (MW) !! auxmin : input real : minimum auxiliary power (MW) use constraint_variables, only: fauxmn, auxmin - use current_drive_variables, only: pinjmw + use current_drive_variables, only: p_hcd_injected_total_mw implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1806,7 +1806,7 @@ subroutine constraint_eqn_040(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 - fauxmn * pinjmw/auxmin + tmp_cc = 1.0D0 - fauxmn * p_hcd_injected_total_mw/auxmin tmp_con = auxmin * (1.0D0 - tmp_cc) tmp_err = auxmin * tmp_cc tmp_symbol = '>' @@ -2820,9 +2820,9 @@ subroutine constraint_eqn_073(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! fplhsep : input real : F-value for Psep >= Plh + Paux : for consistency of two values of separatrix power !! p_l_h_threshold_mw : input real : L-H mode power threshold (MW) !! pdivt : input real : power to be conducted to the divertor region (MW) - !! pinjmw : inout real : total auxiliary injected power (MW) + !! p_hcd_injected_total_mw : inout real : total auxiliary injected power (MW) use physics_variables, only: fplhsep, p_l_h_threshold_mw, pdivt - use current_drive_variables, only: pinjmw + use current_drive_variables, only: p_hcd_injected_total_mw implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -2830,7 +2830,7 @@ subroutine constraint_eqn_073(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 - fplhsep * pdivt / (p_l_h_threshold_mw+pinjmw) + tmp_cc = 1.0d0 - fplhsep * pdivt / (p_l_h_threshold_mw+p_hcd_injected_total_mw) tmp_con = pdivt tmp_err = pdivt * tmp_cc tmp_symbol = '>' diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 977e2357f6..3843eb49e7 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -208,7 +208,7 @@ module current_drive_variables real(dp) :: pinjimw !! auxiliary injected power to ions (MW) - real(dp) :: pinjmw + real(dp) :: p_hcd_injected_total_mw !! total auxiliary injected power (MW) real(dp) :: pinjfixmw diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index c691ac8dfe..8f4b31de84 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1136,11 +1136,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 8.0143E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 8.0143E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Fusion_power_(MW)_______________________________________________________ (fusion_power)______________________ 1.6202E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0836E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 8.0143E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 8.0143E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6576E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1751E+03 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index be2ee92d12..5bedf7f8c6 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1137,11 +1137,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 8.0143E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 8.0143E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Fusion_power_(MW)_______________________________________________________ (fusion_power)______________________ 1.6202E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0836E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 8.0143E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 8.0143E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6576E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1751E+03 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index c5df13df7d..67f4e5a373 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1137,11 +1137,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 8.0143E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 8.0143E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Fusion_power_(MW)_______________________________________________________ (fusion_power)______________________ 1.6202E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0836E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 8.0143E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 8.0143E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6576E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1751E+03 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 656cc05f06..96c4480710 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1137,11 +1137,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0746E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2659E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 8.0143E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 8.0143E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8950E+02 Fusion_power_(MW)_______________________________________________________ (fusion_power)______________________ 1.6202E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0836E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 8.0143E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 8.0143E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.2284E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6576E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1751E+03 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 18231a6a2b..5ec0182f81 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1140,11 +1140,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0698E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2675E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.0733E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.9710E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.9710E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8856E+02 Fusion_power_(MW)_______________________________________________________ (fusion_power)______________________ 1.6176E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0787E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.9710E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.9710E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.0733E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6536E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1712E+03 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index bf9e5da0e0..7e81e40fa3 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -1138,11 +1138,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0347E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2307E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.8062E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8038E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.5991E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0435E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.8062E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6323E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1423E+03 @@ -2301,11 +2301,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0626E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2420E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.7249E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8317E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6138E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0715E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.7249E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6474E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1613E+03 @@ -3464,11 +3464,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0773E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2480E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.7110E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5559E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5559E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8521E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6215E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0862E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5559E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5559E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.7110E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6571E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1721E+03 @@ -4627,11 +4627,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0826E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2549E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.6372E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8517E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6243E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0915E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.6372E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6593E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1751E+03 @@ -5790,11 +5790,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0875E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2569E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.6412E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8567E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6269E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0964E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.6412E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6607E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1783E+03 @@ -6953,11 +6953,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0777E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2529E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5587E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8468E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6218E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0866E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5587E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6544E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1715E+03 @@ -8116,11 +8116,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0839E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2604E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.4910E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8530E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6251E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0929E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.4910E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6575E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1757E+03 @@ -9279,11 +9279,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0882E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2621E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5510E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8574E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6273E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0972E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5510E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6609E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1788E+03 @@ -10442,11 +10442,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0767E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2574E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5992E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8458E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6212E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0856E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5992E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6554E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1710E+03 @@ -11605,11 +11605,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0966E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2705E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5632E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8659E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6318E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.1056E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5632E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6660E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1846E+03 @@ -12768,11 +12768,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.1149E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2780E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5331E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8842E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6414E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.1240E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5331E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6758E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1970E+03 @@ -13931,11 +13931,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.1137E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2775E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.4852E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8830E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6408E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.1228E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.4852E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6742E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1961E+03 @@ -15094,11 +15094,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.1305E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2895E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.4429E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8998E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6496E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.1396E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.4429E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6830E+02 Total_(MW)______________________________________________________________ ______________________________ 2.2075E+03 @@ -16257,11 +16257,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.1469E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2963E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5500E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.9165E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6583E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.1561E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.5500E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6928E+02 Total_(MW)______________________________________________________________ ______________________________ 2.2188E+03 @@ -17420,11 +17420,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.1643E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.3034E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.6591E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.5000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.5000E+01 Total_(MW)______________________________________________________________ ______________________________ 3.9340E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6674E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.1735E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.5000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.5000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.6591E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.7032E+02 Total_(MW)______________________________________________________________ ______________________________ 2.2308E+03 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 12f822fb49..f0eb63b070 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -964,11 +964,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -1959,11 +1959,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -2954,11 +2954,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -3949,11 +3949,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -4944,11 +4944,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -5939,11 +5939,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -6934,11 +6934,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -7929,11 +7929,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 @@ -8924,11 +8924,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.8174E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.6226E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 5.1000E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 5.1000E+01 Total_(MW)______________________________________________________________ ______________________________ 4.3494E+02 Fusion_power_(MW)_______________________________________________________ (powfmw.)_____________________ 2.0117E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.8286E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 5.1000E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 5.1000E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 5.7803E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 2.0393E+02 Total_(MW)______________________________________________________________ ______________________________ 2.6500E+03 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b67704f6ec..b783b53f4a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3511,7 +3511,7 @@ "pinjht": 0.0, "pinjimw": 0.0, "pinjmax": 120.0, - "pinjmw": 0.0, + "p_hcd_injected_total_mw": 0.0, "pinjwp": 0.0, "pinjwpfix": 0.0, "p_plasma_inner_rad_mw": 0.0, @@ -10234,7 +10234,7 @@ "pinjht": "power dissipated in heating and current drive system (MW)", "pinjimw": "auxiliary injected power to ions (MW)", "pinjmax": "maximum injector power during pulse (heating and ramp-up/down phase) (MW)", - "pinjmw": "total auxiliary injected power (MW)", + "p_hcd_injected_total_mw": "total auxiliary injected power (MW)", "pinjwp": "injector wall plug power (MW)", "pinjwpfix": "secondary injector wall plug power (MW)", "p_plasma_inner_rad_mw": "radiation power from inner zone (MW)", @@ -17656,7 +17656,7 @@ "p_hcd_injected_max", "pinjemw", "pinjimw", - "pinjmw", + "p_hcd_injected_total_mw", "pinjfixmw", "plasipf", "plhybd", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 8daa6a90f6..63c13270e9 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -74,7 +74,7 @@ icc = 1 icc = 2 * DESCRIPTION: Global Power Balance Consistency * JUSTIFICATION: Consistency equations should always be on -* VARIABLES: pinjmw, Rest calculated in-situ +* VARIABLES: p_hcd_injected_total_mw, Rest calculated in-situ *icc = 4 * DESCRIPTION: Global power balance for electrons @@ -2645,7 +2645,7 @@ irfcd = 1 *icc = 40 * DESCRIPTION: Constraint equation for auxiliary power lower limit * JUSTIFICATION: Turned off, do not care about auxiliary power lower limit -* VARIABLES: pinjmw (MW) calculated in-situ +* VARIABLES: p_hcd_injected_total_mw (MW) calculated in-situ *auxmin = * DESCRIPTION: Minimum required auxiliary power (MW) @@ -2692,7 +2692,7 @@ i_hcd_primary = 13 icc = 30 * DESCRIPTION: Injection Power Upper Limit * JUSTIFICATION: Limit for plasma stability -* VARIABLES: pinjmw (total auxiliary injected power (MW)) summed from all injected power sources +* VARIABLES: p_hcd_injected_total_mw (total auxiliary injected power (MW)) summed from all injected power sources ixc = 46 fpinj = 1.0 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index ad41a9f445..af4dda453b 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1140,11 +1140,11 @@ Alpha_power_deposited_in_plasma_(MW)____________________________________ (falpha*palpmw)_______________ 3.0698E+02 Power_from_charged_products_of_DD_and/or_D-He3_fusion_(MW)______________ (pchargemw.)__________________ 1.2675E+00 Ohmic_heating_(MW)______________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.0733E-01 - Injected_power_deposited_in_plasma_(MW)_________________________________ (pinjmw)______________________ 7.9710E+01 + Injected_power_deposited_in_plasma_(MW)_________________________________ (p_hcd_injected_total_mw)______________________ 7.9710E+01 Total_(MW)______________________________________________________________ ______________________________ 3.8856E+02 Fusion_power_(MW)_______________________________________________________ (powfmw)______________________ 1.6176E+03 Power_from_energy_multiplication_in_blanket_and_shield_(MW)_____________ (emultmw)_____________________ 3.0787E+02 - Injected_power_(MW)_____________________________________________________ (pinjmw.)_____________________ 7.9710E+01 + Injected_power_(MW)_____________________________________________________ (p_hcd_injected_total_mw.)_____________________ 7.9710E+01 Ohmic_power_(MW)________________________________________________________ (p_plasma_ohmic_mw.)_____________________ 6.0733E-01 Power_deposited_in_primary_coolant_by_pump_(MW)_________________________ (htpmw_mech)__________________ 1.6536E+02 Total_(MW)______________________________________________________________ ______________________________ 2.1712E+03 diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index a51cc29b2a..17562a852b 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -13733,7 +13733,7 @@ def test_calc_energy_conversion_system( class CalcRemainingSubsystemsParam(NamedTuple): - pinjmw: Any = None + p_hcd_injected_total_mw: Any = None pdivt: Any = None @@ -13786,7 +13786,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): "calcremainingsubsystemsparam", ( CalcRemainingSubsystemsParam( - pinjmw=43.745615131519273, + p_hcd_injected_total_mw=43.745615131519273, pdivt=94.203763268233445, fusion_power=1726.9363495105574, t_plasma_res_diffusion=2562.1529343276788, @@ -14882,7 +14882,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): ).transpose(), ), CalcRemainingSubsystemsParam( - pinjmw=43.745615131519266, + p_hcd_injected_total_mw=43.745615131519266, pdivt=94.062415557688894, fusion_power=1726.1944723154274, t_plasma_res_diffusion=2562.1529343276788, @@ -15995,7 +15995,9 @@ def test_calc_remaining_subsystems( """ monkeypatch.setattr( - current_drive_variables, "pinjmw", calcremainingsubsystemsparam.pinjmw + current_drive_variables, + "p_hcd_injected_total_mw", + calcremainingsubsystemsparam.p_hcd_injected_total_mw, ) monkeypatch.setattr(physics_variables, "pdivt", calcremainingsubsystemsparam.pdivt) diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 2fcba9e6b7..074a20b614 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -69,7 +69,7 @@ class CudrivParam(NamedTuple): f_p_beam_orbit_loss: Any = None - pinjmw: Any = None + p_hcd_injected_total_mw: Any = None pwpnb: Any = None @@ -189,7 +189,7 @@ class CudrivParam(NamedTuple): expected_etacd: Any = None - expected_pinjmw: Any = None + expected_p_hcd_injected_total_mw: Any = None expected_effcd: Any = None @@ -227,7 +227,7 @@ class CudrivParam(NamedTuple): etacdfix=0, eta_ecrh_injector_wall_plug=0.5, f_p_beam_orbit_loss=0, - pinjmw=0, + p_hcd_injected_total_mw=0, pwpnb=0, eta_beam_injector_wall_plug=0.29999999999999999, beam_energy=1000, @@ -287,7 +287,7 @@ class CudrivParam(NamedTuple): expected_echpwr=120.49600019005746, expected_gamcd=0.30000000000000004, expected_etacd=0.5, - expected_pinjmw=120.49600019005746, + expected_p_hcd_injected_total_mw=120.49600019005746, expected_effcd=0.05000000000000001, expected_echwpow=240.99200038011492, expected_pinjemw=120.49600019005746, @@ -317,7 +317,7 @@ class CudrivParam(NamedTuple): etacdfix=0, eta_ecrh_injector_wall_plug=0.5, f_p_beam_orbit_loss=0, - pinjmw=120.49600019005746, + p_hcd_injected_total_mw=120.49600019005746, pwpnb=0, eta_beam_injector_wall_plug=0.29999999999999999, beam_energy=1000, @@ -377,7 +377,7 @@ class CudrivParam(NamedTuple): expected_echpwr=120.49600019005746, expected_gamcd=0.30000000000000004, expected_etacd=0.5, - expected_pinjmw=120.49600019005746, + expected_p_hcd_injected_total_mw=120.49600019005746, expected_effcd=0.05000000000000001, expected_echwpow=240.99200038011492, expected_pinjemw=120.49600019005746, @@ -470,7 +470,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): current_drive_variables, "f_p_beam_orbit_loss", cudrivparam.f_p_beam_orbit_loss ) - monkeypatch.setattr(current_drive_variables, "pinjmw", cudrivparam.pinjmw) + monkeypatch.setattr( + current_drive_variables, + "p_hcd_injected_total_mw", + cudrivparam.p_hcd_injected_total_mw, + ) monkeypatch.setattr(current_drive_variables, "pwpnb", cudrivparam.pwpnb) @@ -628,7 +632,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): assert current_drive_variables.etacd == pytest.approx(cudrivparam.expected_etacd) - assert current_drive_variables.pinjmw == pytest.approx(cudrivparam.expected_pinjmw) + assert current_drive_variables.p_hcd_injected_total_mw == pytest.approx( + cudrivparam.expected_p_hcd_injected_total_mw + ) assert current_drive_variables.effcd == pytest.approx(cudrivparam.expected_effcd) diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index c18f3f94df..9eab4792a3 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -2113,7 +2113,7 @@ class CalculateDensityLimitParam(NamedTuple): pdivt: Any = None - pinjmw: Any = None + p_hcd_injected_total_mw: Any = None plasma_current: Any = None @@ -2143,7 +2143,7 @@ class CalculateDensityLimitParam(NamedTuple): i_density_limit=7, bt=5.1847188735686647, pdivt=162.32943903093374, - pinjmw=79.928763793309031, + p_hcd_injected_total_mw=79.928763793309031, plasma_current=16702766.338258133, prn1=0.4614366315228275, q95=3.5068029786872268, @@ -2183,7 +2183,7 @@ def test_calculate_density_limit(calculatedensitylimitparam, physics): i_density_limit=calculatedensitylimitparam.i_density_limit, bt=calculatedensitylimitparam.bt, pdivt=calculatedensitylimitparam.pdivt, - pinjmw=calculatedensitylimitparam.pinjmw, + p_hcd_injected_total_mw=calculatedensitylimitparam.p_hcd_injected_total_mw, plasma_current=calculatedensitylimitparam.plasma_current, prn1=calculatedensitylimitparam.prn1, q95=calculatedensitylimitparam.q95, @@ -2240,7 +2240,7 @@ class ConfinementTimeParam(NamedTuple): non_alpha_charged_power: Any = None - pinjmw: Any = None + p_hcd_injected_total_mw: Any = None plasma_current: Any = None @@ -2307,7 +2307,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2349,7 +2349,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2391,7 +2391,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2433,7 +2433,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2475,7 +2475,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2517,7 +2517,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2559,7 +2559,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2601,7 +2601,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2643,7 +2643,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2685,7 +2685,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2727,7 +2727,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2769,7 +2769,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2811,7 +2811,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2853,7 +2853,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2895,7 +2895,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -2937,7 +2937,7 @@ class ConfinementTimeParam(NamedTuple): kappa=1.8500000000000001, kappa95=1.6517857142857142, non_alpha_charged_power=1.2453296074483358, - pinjmw=75.397788712812741, + p_hcd_injected_total_mw=75.397788712812741, plasma_current=16616203.759182997, pden_plasma_core_rad_mw=0.047757569353246924, q95=3.5610139569387185, @@ -3015,7 +3015,7 @@ def test_calculate_confinement_time(confinementtimeparam, monkeypatch, physics): kappa=confinementtimeparam.kappa, kappa95=confinementtimeparam.kappa95, non_alpha_charged_power=confinementtimeparam.non_alpha_charged_power, - pinjmw=confinementtimeparam.pinjmw, + p_hcd_injected_total_mw=confinementtimeparam.p_hcd_injected_total_mw, plasma_current=confinementtimeparam.plasma_current, pden_plasma_core_rad_mw=confinementtimeparam.pden_plasma_core_rad_mw, q95=confinementtimeparam.q95, diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 070d172241..85b8db3d5b 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2039,7 +2039,7 @@ class Power2Param(NamedTuple): ireactor: Any = None - pinjmw: Any = None + p_hcd_injected_total_mw: Any = None emultmw: Any = None @@ -2241,7 +2241,7 @@ class Power2Param(NamedTuple): pnetelin=500, ipnet=0, ireactor=1, - pinjmw=51.978447720428512, + p_hcd_injected_total_mw=51.978447720428512, emultmw=377.93233088402548, inuclear=1, p_blkt_nuclear_heat_total_mw=1504.711566619962, @@ -2343,7 +2343,7 @@ class Power2Param(NamedTuple): pnetelin=500, ipnet=0, ireactor=1, - pinjmw=51.978447720428512, + p_hcd_injected_total_mw=51.978447720428512, emultmw=377.8143718115644, inuclear=1, p_blkt_nuclear_heat_total_mw=1549.9285082739402, @@ -2462,7 +2462,11 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(cost_variables, "ireactor", power2param.ireactor) - monkeypatch.setattr(current_drive_variables, "pinjmw", power2param.pinjmw) + monkeypatch.setattr( + current_drive_variables, + "p_hcd_injected_total_mw", + power2param.p_hcd_injected_total_mw, + ) monkeypatch.setattr(fwbs_variables, "emultmw", power2param.emultmw) diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index 031ddf410a..b77074471e 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -92,7 +92,7 @@ class ProcessTracker: tracking_variables: ClassVar = { "pheat", "bootstrap_current_fraction", - "pinjmw", + "p_hcd_injected_total_mw", "dr_shld_inboard", "dr_fw_inboard", "dr_fw_outboard", From ee645f278de20131a959fc9509f669bac167468e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 15:48:46 +0100 Subject: [PATCH 16/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20taubeam=20to=20n?= =?UTF-8?q?=5Fbeam=5Fdecay=5Flengths=5Fcore=20for=20clarity=20and=20consis?= =?UTF-8?q?tency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating_and_current_drive/NBI/culham_nb.md | 2 +- process/current_drive.py | 12 ++++++++---- process/stellarator.py | 4 ++-- source/fortran/constraint_equations.f90 | 6 +++--- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_current_drive.py | 12 ++++++++---- 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md index 6013cd900c..c81d07c6c7 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md @@ -37,7 +37,7 @@ Beams topping cross section is calculated via $\mathtt{sigbeam}$ found [here](.. Calculate number of decay lengths to centre $$ -\mathtt{taubeam} = \mathtt{dpath} \times n_{\text{e,0}} \times \mathtt{sigstop} +\mathtt{n_beam_decay_lengths_core} = \mathtt{dpath} \times n_{\text{e,0}} \times \mathtt{sigstop} $$ Calculate the shine through fraction of the beam diff --git a/process/current_drive.py b/process/current_drive.py index bfbc4f88cc..fe3135741d 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -1109,8 +1109,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Beam decay lengths to centre", - "(taubeam)", - current_drive_variables.taubeam, + "(n_beam_decay_lengths_core)", + current_drive_variables.n_beam_decay_lengths_core, "OP ", ) po.ovarre( @@ -1347,7 +1347,9 @@ def iternb(self): ) # Calculate number of decay lengths to centre - current_drive_variables.taubeam = dpath * physics_variables.dene * sigstop + current_drive_variables.n_beam_decay_lengths_core = ( + dpath * physics_variables.dene * sigstop + ) # Shine-through fraction of beam fshine = np.exp(-2.0 * dpath * physics_variables.dene * sigstop) @@ -1624,7 +1626,9 @@ def culnbi(self): # Calculate number of decay lengths to centre - current_drive_variables.taubeam = dpath * physics_variables.dnla * sigstop + current_drive_variables.n_beam_decay_lengths_core = ( + dpath * physics_variables.dnla * sigstop + ) # Shine-through fraction of beam diff --git a/process/stellarator.py b/process/stellarator.py index a878fbe138..5255c0c136 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5114,8 +5114,8 @@ def stheat(self, output: bool): po.ovarre( self.outfile, "Beam decay lengths to centre", - "(taubeam)", - current_drive_variables.taubeam, + "(n_beam_decay_lengths_core)", + current_drive_variables.n_beam_decay_lengths_core, ) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 0856ef8238..05626a74b8 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -935,9 +935,9 @@ subroutine constraint_eqn_014(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. - !! taubeam : input real : neutral beam e-decay lengths to plasma centre + !! n_beam_decay_lengths_core : input real : neutral beam e-decay lengths to plasma centre !! tbeamin : input real : permitted neutral beam e-decay lengths to plasma centre - use current_drive_variables, only: taubeam, tbeamin + use current_drive_variables, only: n_beam_decay_lengths_core, tbeamin implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -945,7 +945,7 @@ subroutine constraint_eqn_014(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 - taubeam/tbeamin + tmp_cc = 1.0D0 - n_beam_decay_lengths_core/tbeamin tmp_con = tbeamin * (1.0D0 - tmp_cc) tmp_err = tbeamin * tmp_cc tmp_symbol = '=' diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 3843eb49e7..365183ff83 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -241,7 +241,7 @@ module current_drive_variables real(dp) :: rtanmax !! maximum tangency radius for centreline of beam (m) - real(dp) :: taubeam + real(dp) :: n_beam_decay_lengths_core !! neutral beam e-decay lengths to plasma centre real(dp) :: tbeamin diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b783b53f4a..2890a0a3ef 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7388,7 +7388,7 @@ "target_spread": 0.003, "targetangle": 30.0, "tau2": 0.0, - "taubeam": 0.0, + "n_beam_decay_lengths_core": 0.0, "taucq": 30.0, "t_electron_energy_confinement": 0.0, "tauee_in": 0.0, @@ -10657,7 +10657,7 @@ "target_spread": "increase in SOL power fall-off length due to spreading, mapped to OMP [m]", "targetangle": "Angle between field-line and divertor target (degrees)", "tau2": "", - "taubeam": "neutral beam e-decay lengths to plasma centre", + "n_beam_decay_lengths_core": "neutral beam e-decay lengths to plasma centre", "taucq": "allowable TF quench time (s)", "t_electron_energy_confinement": "electron energy confinement time (sec)", "tauee_in": "Input electron energy confinement time (sec) (`i_confinement_time=48 only`)", @@ -17667,7 +17667,7 @@ "pwpnb", "rtanbeam", "rtanmax", - "taubeam", + "n_beam_decay_lengths_core", "tbeamin" ], "define_iteration_variables": [ diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 074a20b614..7b922352c7 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -97,7 +97,7 @@ class CudrivParam(NamedTuple): bootstrap_current_fraction_max: Any = None - taubeam: Any = None + n_beam_decay_lengths_core: Any = None p_hcd_injected_max: Any = None @@ -241,7 +241,7 @@ class CudrivParam(NamedTuple): bigq=0, bootstrap_current_fraction=0.27635918746616817, bootstrap_current_fraction_max=0.95000000000000007, - taubeam=0, + n_beam_decay_lengths_core=0, p_hcd_injected_max=200, dx_beam_shield=0.5, frbeam=1.05, @@ -331,7 +331,7 @@ class CudrivParam(NamedTuple): bigq=0, bootstrap_current_fraction=0.27635918746616817, bootstrap_current_fraction_max=0.95000000000000007, - taubeam=0, + n_beam_decay_lengths_core=0, p_hcd_injected_max=200, dx_beam_shield=0.5, frbeam=1.05, @@ -520,7 +520,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.bootstrap_current_fraction_max, ) - monkeypatch.setattr(current_drive_variables, "taubeam", cudrivparam.taubeam) + monkeypatch.setattr( + current_drive_variables, + "n_beam_decay_lengths_core", + cudrivparam.n_beam_decay_lengths_core, + ) monkeypatch.setattr( current_drive_variables, "p_hcd_injected_max", cudrivparam.p_hcd_injected_max From 9bd1252ab8b4dc7f39e221423b2e482abebff4fa Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 2 Apr 2025 15:51:06 +0100 Subject: [PATCH 17/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20ps=5Fcurrent=5Ffr?= =?UTF-8?q?action=20to=20f=5Fc=5Fplasma=5Fpfirsch=5Fschluter=20for=20clari?= =?UTF-8?q?ty=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +- examples/data/large_tokamak_1_MFILE.DAT | 4 +- examples/data/large_tokamak_2_MFILE.DAT | 4 +- examples/data/large_tokamak_3_MFILE.DAT | 4 +- examples/data/large_tokamak_4_MFILE.DAT | 4 +- examples/data/scan_MFILE.DAT | 36 +++++------ process/current_drive.py | 4 +- process/physics.py | 8 +-- source/fortran/current_drive_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 60 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 36 +++++------ tests/integration/ref_dicts.json | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- tests/unit/test_current_drive.py | 10 ++-- 19 files changed, 104 insertions(+), 102 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 317de6b7c6..60230d7f0f 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -520,7 +520,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2449E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1436E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0010E+03 OP @@ -544,7 +544,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1436E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 5.9038E-04 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.8505E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 427e625568..1500200fcd 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -516,7 +516,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP @@ -542,7 +542,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.4376E-02 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index dcf53f6460..1d397675e2 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -516,7 +516,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP @@ -542,7 +542,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.4376E-02 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 0c105a6a32..677a0ee66d 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -516,7 +516,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP @@ -542,7 +542,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.4376E-02 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 5dd33f4cc0..d8c809638a 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -516,7 +516,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP @@ -542,7 +542,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.4376E-02 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 2db34b82bb..fa3f747889 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -373,7 +373,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -397,7 +397,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -1368,7 +1368,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -1392,7 +1392,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -2363,7 +2363,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -2387,7 +2387,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -3358,7 +3358,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -3382,7 +3382,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -4353,7 +4353,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -4377,7 +4377,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -5348,7 +5348,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -5372,7 +5372,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -6343,7 +6343,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -6367,7 +6367,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -7338,7 +7338,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -7362,7 +7362,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -8333,7 +8333,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -8357,7 +8357,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/process/current_drive.py b/process/current_drive.py index fe3135741d..ba532cc447 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -961,8 +961,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Pfirsch-Schlueter fraction", - "(ps_current_fraction)", - current_drive_variables.ps_current_fraction, + "(f_c_plasma_pfirsch_schluter)", + current_drive_variables.f_c_plasma_pfirsch_schluter, "OP ", ) po.ovarrf( diff --git a/process/physics.py b/process/physics.py index 8a83124b56..3c038f9f2e 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1792,7 +1792,7 @@ def physics(self): current_drive_variables.pscf_scene = ps_fraction_scene(physics_variables.beta) if physics_variables.i_pfirsch_schluter_current == 1: - current_drive_variables.ps_current_fraction = ( + current_drive_variables.f_c_plasma_pfirsch_schluter = ( current_drive_variables.pscf_scene ) @@ -2008,7 +2008,7 @@ def physics(self): current_drive_variables.plasma_current_internal_fraction = ( current_drive_variables.bootstrap_current_fraction + current_drive_variables.diamagnetic_current_fraction - + current_drive_variables.ps_current_fraction + + current_drive_variables.f_c_plasma_pfirsch_schluter ) # Plasma driven current fraction (Bootstrap + Diamagnetic @@ -5864,8 +5864,8 @@ def outplas(self): po.ovarrf( self.outfile, "Pfirsch-Schlueter fraction (enforced)", - "(ps_current_fraction.)", - current_drive_variables.ps_current_fraction, + "(f_c_plasma_pfirsch_schluter.)", + current_drive_variables.f_c_plasma_pfirsch_schluter, "OP ", ) diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 365183ff83..7abc60c6be 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -226,7 +226,7 @@ module current_drive_variables real(dp) :: p_beam_orbit_loss !! neutral beam power lost after ionisation but before thermalisation (orbit loss power) (MW) - real(dp) :: ps_current_fraction + real(dp) :: f_c_plasma_pfirsch_schluter !! Pfirsch-Schlüter current fraction real(dp) :: pwplh diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 8f4b31de84..ea78a1a4ec 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -515,7 +515,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP @@ -541,7 +541,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.4376E-02 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 5bedf7f8c6..984848834d 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -516,7 +516,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP @@ -542,7 +542,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.4376E-02 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 67f4e5a373..4a7a035d72 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -516,7 +516,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP @@ -542,7 +542,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.4376E-02 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 96c4480710..11955ed9fb 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -516,7 +516,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0619E+03 OP @@ -542,7 +542,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.4376E-02 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 5ec0182f81..497e77d259 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -513,7 +513,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.9744E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2290E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0839E+03 OP @@ -539,7 +539,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2290E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.3342E-02 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6376E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 7e81e40fa3..a66c1ab7d0 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -518,7 +518,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0453E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1061E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9916E+03 OP @@ -543,7 +543,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1061E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.0930E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -1681,7 +1681,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1749E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1146E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9820E+03 OP @@ -1706,7 +1706,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1146E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9548E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -2844,7 +2844,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3075E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1238E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9585E+03 OP @@ -2869,7 +2869,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1238E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.5526E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.8606E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -4007,7 +4007,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3228E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1715E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9773E+03 OP @@ -4032,7 +4032,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1715E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.8847E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -5170,7 +5170,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1983E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1531E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9923E+03 OP @@ -5195,7 +5195,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1531E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9218E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -6333,7 +6333,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0727E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1452E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0053E+03 OP @@ -6358,7 +6358,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1452E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9136E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -7496,7 +7496,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0874E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1915E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0210E+03 OP @@ -7521,7 +7521,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1915E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9320E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -8659,7 +8659,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2087E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2074E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0034E+03 OP @@ -8684,7 +8684,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2074E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9395E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -9822,7 +9822,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3286E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2337E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 2.9903E+03 OP @@ -9847,7 +9847,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2337E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9780E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -10985,7 +10985,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3525E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2713E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0054E+03 OP @@ -11010,7 +11010,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2713E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9910E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -12148,7 +12148,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2353E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2391E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0124E+03 OP @@ -12173,7 +12173,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2391E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9399E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -13311,7 +13311,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1141E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2221E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0274E+03 OP @@ -13336,7 +13336,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2221E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9353E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -14474,7 +14474,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1347E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2611E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0439E+03 OP @@ -14499,7 +14499,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2611E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9505E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -15637,7 +15637,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2650E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2685E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0292E+03 OP @@ -15662,7 +15662,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2685E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9754E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -16800,7 +16800,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.4036E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2763E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0148E+03 OP @@ -16825,7 +16825,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2763E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 0.0000E+00 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9990E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index f0eb63b070..08d96d2583 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -373,7 +373,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -397,7 +397,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -1368,7 +1368,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -1392,7 +1392,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -2363,7 +2363,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -2387,7 +2387,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -3358,7 +3358,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -3382,7 +3382,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -4353,7 +4353,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -4377,7 +4377,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -5348,7 +5348,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -5372,7 +5372,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -6343,7 +6343,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -6367,7 +6367,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -7338,7 +7338,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -7362,7 +7362,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 @@ -8333,7 +8333,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 4.8432E+03 OP @@ -8357,7 +8357,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 2.5418E-03 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 2890a0a3ef..9a848c5ef9 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3608,7 +3608,7 @@ "psep_kallenbach": 0.0, "psepbqarmax": 9.5, "pseprmax": 25.0, - "ps_current_fraction": 0.0, + "f_c_plasma_pfirsch_schluter": 0.0, "psolradmw": 0.0, "psurffwi": 0.0, "psurffwo": 0.0, @@ -10325,7 +10325,7 @@ "psep_kallenbach": "Power conducted through the separatrix, as calculated by the divertor model [W]\n Not equal to pdivt unless `constraint 69` is imposed.", "psepbqarmax": "maximum ratio of Psep*Bt/qAR (MWT/m) (`constraint equation 68`)", "pseprmax": "maximum ratio of power crossing the separatrix to plasma major radius (Psep/R) (MW/m)\n (`constraint equation 56`)", - "ps_current_fraction": "Pfirsch-Schl\u00fcter current fraction", + "f_c_plasma_pfirsch_schluter": "Pfirsch-Schl\u00fcter current fraction", "psolradmw": "SOL radiation power (MW) (`stellarator only`)", "psurffwi": "Surface heat flux on first wall (MW) (sum = p_fw_rad_total_mw)", "psurffwo": "Surface heat flux on first wall (MW) (sum = p_fw_rad_total_mw)", @@ -17662,7 +17662,7 @@ "plhybd", "pnbeam", "p_beam_orbit_loss", - "ps_current_fraction", + "f_c_plasma_pfirsch_schluter", "pwplh", "pwpnb", "rtanbeam", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index af4dda453b..f0b6df9223 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -513,7 +513,7 @@ Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.9744E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2290E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 - Pfirsch-Schlueter_fraction_(enforced)___________________________________ (ps_current_fraction.)______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 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)____________________________________________ (t_plasma_res_diffusion)____________________ 3.0839E+03 OP @@ -539,7 +539,7 @@ ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2290E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 - Pfirsch-Schlueter_fraction______________________________________________ (ps_current_fraction)_______________________ 0.0000E+00 + Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 Auxiliary_current_drive_fraction________________________________________ (aux_current_fraction)_______________________ 1.3342E-02 Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6376E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 7b922352c7..ed5f83db5d 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -111,7 +111,7 @@ class CudrivParam(NamedTuple): diamagnetic_current_fraction: Any = None - ps_current_fraction: Any = None + f_c_plasma_pfirsch_schluter: Any = None plasma_current_internal_fraction: Any = None @@ -248,7 +248,7 @@ class CudrivParam(NamedTuple): rtanbeam=0, rtanmax=0, diamagnetic_current_fraction=0, - ps_current_fraction=0, + f_c_plasma_pfirsch_schluter=0, plasma_current_internal_fraction=0.27635918746616817, harnum=1, xi_ebw=0.80000000000000004, @@ -338,7 +338,7 @@ class CudrivParam(NamedTuple): rtanbeam=8.4000000000000004, rtanmax=13.179564451855533, diamagnetic_current_fraction=0, - ps_current_fraction=0, + f_c_plasma_pfirsch_schluter=0, plasma_current_internal_fraction=0.27635918746616817, harnum=1, xi_ebw=0.80000000000000004, @@ -547,7 +547,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): ) monkeypatch.setattr( - current_drive_variables, "ps_current_fraction", cudrivparam.ps_current_fraction + current_drive_variables, + "f_c_plasma_pfirsch_schluter", + cudrivparam.f_c_plasma_pfirsch_schluter, ) monkeypatch.setattr( From 74add7ec4e5411a035c46e89bb8ce48d951c3f70 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 10:53:22 +0100 Subject: [PATCH 18/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bscf=5Fiter89=20t?= =?UTF-8?q?o=20f=5Fc=5Fplasma=5Fbootstrap=5Fiter89=20for=20clarity=20and?= =?UTF-8?q?=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/plot_proc.py | 2 +- process/physics.py | 8 ++--- source/fortran/current_drive_variables.f90 | 2 +- .../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 +- 18 files changed, 53 insertions(+), 53 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 60230d7f0f..8c82dd639f 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -511,7 +511,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0362E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6783E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1436E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4713E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3036E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 1500200fcd..0574288255 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -507,7 +507,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 1d397675e2..9e9b4d90d0 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -507,7 +507,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 677a0ee66d..09f2c0597b 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -507,7 +507,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index d8c809638a..97c4fa690e 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -507,7 +507,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index fa3f747889..7fe2e6d9e0 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -364,7 +364,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -1359,7 +1359,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -2354,7 +2354,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -3349,7 +3349,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -4344,7 +4344,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -5339,7 +5339,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -6334,7 +6334,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -7329,7 +7329,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -8324,7 +8324,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index c6609886ce..36478e3623 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3285,7 +3285,7 @@ def plot_bootstrap_comparison(axis, mfile_data, scan): scan --> scan number to use """ - boot_ipdg = mfile_data.data["bscf_iter89"].get_scan(scan) + boot_ipdg = mfile_data.data["f_c_plasma_bootstrap_iter89"].get_scan(scan) boot_sauter = mfile_data.data["bscf_sauter"].get_scan(scan) boot_nenins = mfile_data.data["bscf_nevins"].get_scan(scan) boot_wilson = mfile_data.data["bscf_wilson"].get_scan(scan) diff --git a/process/physics.py b/process/physics.py index 3c038f9f2e..73608615fb 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1801,7 +1801,7 @@ def physics(self): # ***************************** # # Calculate bootstrap current fraction using various models - current_drive_variables.bscf_iter89 = ( + current_drive_variables.f_c_plasma_bootstrap_iter89 = ( current_drive_variables.cboot * self.bootstrap_fraction_iter89( physics_variables.aspect, @@ -1944,7 +1944,7 @@ def physics(self): else: if physics_variables.i_bootstrap_current == 1: current_drive_variables.bootstrap_current_fraction = ( - current_drive_variables.bscf_iter89 + current_drive_variables.f_c_plasma_bootstrap_iter89 ) elif physics_variables.i_bootstrap_current == 2: current_drive_variables.bootstrap_current_fraction = ( @@ -5656,8 +5656,8 @@ def outplas(self): po.ovarrf( self.outfile, "Bootstrap fraction (ITER 1989)", - "(bscf_iter89)", - current_drive_variables.bscf_iter89, + "(f_c_plasma_bootstrap_iter89)", + current_drive_variables.f_c_plasma_bootstrap_iter89, "OP ", ) diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 7abc60c6be..a268bca103 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -30,7 +30,7 @@ module current_drive_variables !! maximum fraction of plasma current from bootstrap; if `bootstrap_current_fraction_max < 0`, !! bootstrap fraction = abs(bootstrap_current_fraction_max) - real(dp) :: bscf_iter89 + real(dp) :: f_c_plasma_bootstrap_iter89 !! bootstrap current fraction, ITER 1989 model real(dp) :: bscf_nevins diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index ea78a1a4ec..51a19c3ab0 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -506,7 +506,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 984848834d..70bded5f58 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -507,7 +507,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 4a7a035d72..9ae33398bc 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -507,7 +507,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 11955ed9fb..d1d12d5d0e 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -507,7 +507,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0159E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 497e77d259..9093fd7dd7 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -504,7 +504,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9825E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7455E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2290E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5275E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3666E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index a66c1ab7d0..ee1febac78 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -509,7 +509,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9971E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6314E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1061E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4049E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2523E-01 @@ -1672,7 +1672,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0164E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6578E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1146E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4347E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2711E-01 @@ -2835,7 +2835,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0314E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6841E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1238E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4650E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2922E-01 @@ -3998,7 +3998,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0093E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7394E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1715E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5110E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3397E-01 @@ -5161,7 +5161,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0076E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7060E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1531E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4765E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3114E-01 @@ -6324,7 +6324,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9907E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6836E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1452E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4491E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2936E-01 @@ -7487,7 +7487,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9701E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7375E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1915E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4941E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3402E-01 @@ -8650,7 +8650,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9753E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7705E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2074E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5274E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3660E-01 @@ -9813,7 +9813,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9666E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8133E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2337E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5672E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4013E-01 @@ -10976,7 +10976,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9602E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8590E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2713E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.6076E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4400E-01 @@ -12139,7 +12139,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9757E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8106E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2391E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5644E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4000E-01 @@ -13302,7 +13302,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9717E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7771E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2221E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5307E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3736E-01 @@ -14465,7 +14465,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9626E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8238E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2611E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5714E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4135E-01 @@ -15628,7 +15628,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9812E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8476E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2685E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5999E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4312E-01 @@ -16791,7 +16791,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 5.0007E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8714E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2763E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.6295E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4499E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 08d96d2583..ecddd6f18f 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -364,7 +364,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -1359,7 +1359,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -2354,7 +2354,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -3349,7 +3349,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -4344,7 +4344,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -5339,7 +5339,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -6334,7 +6334,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -7329,7 +7329,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 @@ -8324,7 +8324,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 6.2549E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9a848c5ef9..bf2d03a2e1 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1155,7 +1155,7 @@ "breeder_f": 0.5, "breeder_multiplier": 0.75, "breedmat": 1.0, - "bscf_iter89": 0.0, + "f_c_plasma_bootstrap_iter89": 0.0, "bscf_nevins": 0.0, "bscf_sauter": 0.0, "bscf_wilson": 0.0, @@ -8907,7 +8907,7 @@ "breeder_f": "Volume ratio: Li4SiO4/(Be12Ti+Li4SiO4) (`iteration variable 108`)", "breeder_multiplier": "combined breeder/multipler fraction of blanket by volume", "breedmat": "breeder material switch (i_blanket_type=2 (KIT HCPB)):\n
      \n
    • =1 Lithium orthosilicate
      • \n
    • =2 Lithium methatitanate
      • \n
    • =3 Lithium zirconate
      • \n
    ", - "bscf_iter89": "bootstrap current fraction, ITER 1989 model", + "f_c_plasma_bootstrap_iter89": "bootstrap current fraction, ITER 1989 model", "bscf_nevins": "bootstrap current fraction, Nevins et al model", "bscf_sauter": "bootstrap current fraction, Sauter et al model", "bscf_wilson": "bootstrap current fraction, Wilson et al model", @@ -17609,7 +17609,7 @@ "bigq", "bootipf", "bootstrap_current_fraction_max", - "bscf_iter89", + "f_c_plasma_bootstrap_iter89", "bscf_nevins", "bscf_sauter", "bscf_wilson", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index f0b6df9223..fa69af27e6 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -504,7 +504,7 @@ Start-up_resistive_(Wb)_________________________________________________ (vs_plasma_res_ramp)_______________________ 4.9825E+01 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_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7455E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2290E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5275E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3666E-01 From 69bbea79258052dfbb08243c65076ff328d72184 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 10:58:55 +0100 Subject: [PATCH 19/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bscf=5Fnevins=20t?= =?UTF-8?q?o=20f=5Fc=5Fplasma=5Fbootstrap=5Fnevins=20for=20clarity=20and?= =?UTF-8?q?=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/plot_proc.py | 2 +- process/physics.py | 8 ++--- source/fortran/current_drive_variables.f90 | 2 +- .../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 +- 18 files changed, 53 insertions(+), 53 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 8c82dd639f..7a7656bde4 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -513,7 +513,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6783E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1436E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4713E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4713E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3036E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2877E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1680E-02 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 0574288255..48dc816ddc 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -509,7 +509,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 9e9b4d90d0..c1d269aa7f 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -509,7 +509,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 09f2c0597b..3faaafbde2 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -509,7 +509,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 97c4fa690e..f574d78282 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -509,7 +509,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 7fe2e6d9e0..798cbe1a74 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -366,7 +366,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -1361,7 +1361,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -2356,7 +2356,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -3351,7 +3351,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -4346,7 +4346,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -5341,7 +5341,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -6336,7 +6336,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -7331,7 +7331,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -8326,7 +8326,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 36478e3623..deb2a76804 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3287,7 +3287,7 @@ def plot_bootstrap_comparison(axis, mfile_data, scan): boot_ipdg = mfile_data.data["f_c_plasma_bootstrap_iter89"].get_scan(scan) boot_sauter = mfile_data.data["bscf_sauter"].get_scan(scan) - boot_nenins = mfile_data.data["bscf_nevins"].get_scan(scan) + boot_nenins = mfile_data.data["f_c_plasma_bootstrap_nevins"].get_scan(scan) boot_wilson = mfile_data.data["bscf_wilson"].get_scan(scan) boot_sakai = mfile_data.data["bscf_sakai"].get_scan(scan) boot_aries = mfile_data.data["bscf_aries"].get_scan(scan) diff --git a/process/physics.py b/process/physics.py index 73608615fb..b4e2a9e51a 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1815,7 +1815,7 @@ def physics(self): ) ) - current_drive_variables.bscf_nevins = ( + current_drive_variables.f_c_plasma_bootstrap_nevins = ( current_drive_variables.cboot * self.bootstrap_fraction_nevins( physics_variables.alphan, @@ -1948,7 +1948,7 @@ def physics(self): ) elif physics_variables.i_bootstrap_current == 2: current_drive_variables.bootstrap_current_fraction = ( - current_drive_variables.bscf_nevins + current_drive_variables.f_c_plasma_bootstrap_nevins ) elif physics_variables.i_bootstrap_current == 3: current_drive_variables.bootstrap_current_fraction = ( @@ -5672,8 +5672,8 @@ def outplas(self): po.ovarrf( self.outfile, "Bootstrap fraction (Nevins et al)", - "(bscf_nevins)", - current_drive_variables.bscf_nevins, + "(f_c_plasma_bootstrap_nevins)", + current_drive_variables.f_c_plasma_bootstrap_nevins, "OP ", ) po.ovarrf( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index a268bca103..728d148f79 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -33,7 +33,7 @@ module current_drive_variables real(dp) :: f_c_plasma_bootstrap_iter89 !! bootstrap current fraction, ITER 1989 model - real(dp) :: bscf_nevins + real(dp) :: f_c_plasma_bootstrap_nevins !! bootstrap current fraction, Nevins et al model real(dp) :: bscf_sauter diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 51a19c3ab0..24ca0f91e6 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -508,7 +508,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 70bded5f58..c6ee0ccce5 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -509,7 +509,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 9ae33398bc..b80af158a9 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -509,7 +509,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d1d12d5d0e..3326067519 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -509,7 +509,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5042E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 9093fd7dd7..2a794e8c92 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -506,7 +506,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7455E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2290E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5275E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5275E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3666E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.1803E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1022E-02 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index ee1febac78..1c5303cbe5 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -511,7 +511,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6314E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1061E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4049E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4049E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2523E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2084E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1130E-02 @@ -1674,7 +1674,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6578E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1146E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4347E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4347E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2711E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2599E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1485E-02 @@ -2837,7 +2837,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6841E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1238E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4650E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4650E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2922E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3125E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1846E-02 @@ -4000,7 +4000,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7394E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1715E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5110E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5110E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3397E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3186E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1924E-02 @@ -5163,7 +5163,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7060E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1531E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4765E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4765E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3114E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2692E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1579E-02 @@ -6326,7 +6326,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6836E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1452E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4491E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4491E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2936E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2193E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1237E-02 @@ -7489,7 +7489,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7375E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1915E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.4941E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4941E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3402E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2251E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1312E-02 @@ -8652,7 +8652,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7705E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2074E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5274E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5274E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3660E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2733E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1649E-02 @@ -9815,7 +9815,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8133E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2337E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5672E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5672E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4013E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3209E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1989E-02 @@ -10978,7 +10978,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8590E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2713E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.6076E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.6076E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4400E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3304E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.2082E-02 @@ -12141,7 +12141,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8106E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2391E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5644E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5644E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4000E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2839E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1746E-02 @@ -13304,7 +13304,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7771E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2221E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5307E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5307E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3736E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2358E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1408E-02 @@ -14467,7 +14467,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8238E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2611E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5714E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5714E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4135E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2439E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1493E-02 @@ -15630,7 +15630,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8476E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2685E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5999E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5999E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4312E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2956E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1848E-02 @@ -16793,7 +16793,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8714E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2763E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.6295E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.6295E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4499E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3506E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.2222E-02 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index ecddd6f18f..d2db60dec2 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -366,7 +366,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -1361,7 +1361,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -2356,7 +2356,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -3351,7 +3351,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -4346,7 +4346,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -5341,7 +5341,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -6336,7 +6336,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -7331,7 +7331,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 @@ -8326,7 +8326,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5123E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index bf2d03a2e1..53208bd733 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1156,7 +1156,7 @@ "breeder_multiplier": 0.75, "breedmat": 1.0, "f_c_plasma_bootstrap_iter89": 0.0, - "bscf_nevins": 0.0, + "f_c_plasma_bootstrap_nevins": 0.0, "bscf_sauter": 0.0, "bscf_wilson": 0.0, "bscf_sakai": 0.0, @@ -8908,7 +8908,7 @@ "breeder_multiplier": "combined breeder/multipler fraction of blanket by volume", "breedmat": "breeder material switch (i_blanket_type=2 (KIT HCPB)):\n
      \n
    • =1 Lithium orthosilicate
      • \n
    • =2 Lithium methatitanate
      • \n
    • =3 Lithium zirconate
      • \n
    ", "f_c_plasma_bootstrap_iter89": "bootstrap current fraction, ITER 1989 model", - "bscf_nevins": "bootstrap current fraction, Nevins et al model", + "f_c_plasma_bootstrap_nevins": "bootstrap current fraction, Nevins et al model", "bscf_sauter": "bootstrap current fraction, Sauter et al model", "bscf_wilson": "bootstrap current fraction, Wilson et al model", "bscf_sakai": "bootstrap current fraction, Sakai model", @@ -17610,7 +17610,7 @@ "bootipf", "bootstrap_current_fraction_max", "f_c_plasma_bootstrap_iter89", - "bscf_nevins", + "f_c_plasma_bootstrap_nevins", "bscf_sauter", "bscf_wilson", "bscf_sakai", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index fa69af27e6..ac74321281 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -506,7 +506,7 @@ bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7455E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2290E-01 - Bootstrap_fraction_(Nevins_et_al)_______________________________________ (bscf_nevins)_________________ 3.5275E-01 + Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5275E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3666E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.1803E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1022E-02 From 9f4b7b4ef745dcf893bedffecc81d3f0587fb682 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 10:59:39 +0100 Subject: [PATCH 20/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bscf=5Fsauter=20t?= =?UTF-8?q?o=20f=5Fc=5Fplasma=5Fbootstrap=5Fsauter=20for=20clarity=20and?= =?UTF-8?q?=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/plot_proc.py | 2 +- process/physics.py | 8 ++--- source/fortran/current_drive_variables.f90 | 2 +- .../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 +- 18 files changed, 53 insertions(+), 53 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 7a7656bde4..980900009c 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -512,7 +512,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.8572E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6783E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1436E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1436E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4713E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3036E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2877E-02 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 48dc816ddc..329052ab87 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -508,7 +508,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index c1d269aa7f..353878ef1f 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -508,7 +508,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 3faaafbde2..cafd52c89e 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -508,7 +508,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index f574d78282..b4bac9380c 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -508,7 +508,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 798cbe1a74..6716ef1ed7 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -365,7 +365,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -1360,7 +1360,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -2355,7 +2355,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -3350,7 +3350,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -4345,7 +4345,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -5340,7 +5340,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -6335,7 +6335,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -7330,7 +7330,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -8325,7 +8325,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index deb2a76804..a628b6d539 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3286,7 +3286,7 @@ def plot_bootstrap_comparison(axis, mfile_data, scan): """ boot_ipdg = mfile_data.data["f_c_plasma_bootstrap_iter89"].get_scan(scan) - boot_sauter = mfile_data.data["bscf_sauter"].get_scan(scan) + boot_sauter = mfile_data.data["f_c_plasma_bootstrap_sauter"].get_scan(scan) boot_nenins = mfile_data.data["f_c_plasma_bootstrap_nevins"].get_scan(scan) boot_wilson = mfile_data.data["bscf_wilson"].get_scan(scan) boot_sakai = mfile_data.data["bscf_sakai"].get_scan(scan) diff --git a/process/physics.py b/process/physics.py index b4e2a9e51a..a941a51200 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1853,7 +1853,7 @@ def physics(self): ) ) - current_drive_variables.bscf_sauter = ( + current_drive_variables.f_c_plasma_bootstrap_sauter = ( current_drive_variables.cboot * self.bootstrap_fraction_sauter(self.plasma_profile) ) @@ -1956,7 +1956,7 @@ def physics(self): ) elif physics_variables.i_bootstrap_current == 4: current_drive_variables.bootstrap_current_fraction = ( - current_drive_variables.bscf_sauter + current_drive_variables.f_c_plasma_bootstrap_sauter ) elif physics_variables.i_bootstrap_current == 5: # Sakai states that the ACCOME dataset used has the toridal diamagnetic current included in the bootstrap current @@ -5664,8 +5664,8 @@ def outplas(self): po.ovarrf( self.outfile, "Bootstrap fraction (Sauter et al)", - "(bscf_sauter)", - current_drive_variables.bscf_sauter, + "(f_c_plasma_bootstrap_sauter)", + current_drive_variables.f_c_plasma_bootstrap_sauter, "OP ", ) diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 728d148f79..269628960e 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -36,7 +36,7 @@ module current_drive_variables real(dp) :: f_c_plasma_bootstrap_nevins !! bootstrap current fraction, Nevins et al model - real(dp) :: bscf_sauter + real(dp) :: f_c_plasma_bootstrap_sauter !! bootstrap current fraction, Sauter et al model real(dp) :: bscf_wilson diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 24ca0f91e6..4e8b646f6d 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -507,7 +507,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index c6ee0ccce5..6544bff9ab 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -508,7 +508,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index b80af158a9..d0473ea081 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -508,7 +508,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 3326067519..e1721890de 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -508,7 +508,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.7015E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1920E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 2a794e8c92..f8ae637321 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -505,7 +505,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.6495E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7455E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2290E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2290E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5275E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3666E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.1803E-02 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 1c5303cbe5..77cf44a056 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -510,7 +510,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.9617E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6314E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1061E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1061E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4049E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2523E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2084E-02 @@ -1673,7 +1673,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0339E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6578E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1146E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1146E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4347E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2711E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2599E-02 @@ -2836,7 +2836,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0930E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6841E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1238E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1238E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4650E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2922E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3125E-02 @@ -3999,7 +3999,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0982E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7394E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1715E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1715E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5110E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3397E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3186E-02 @@ -5162,7 +5162,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0431E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7060E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1531E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1531E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4765E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3114E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2692E-02 @@ -6325,7 +6325,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.9691E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6836E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1452E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1452E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4491E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2936E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2193E-02 @@ -7488,7 +7488,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.9733E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7375E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.1915E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1915E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4941E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3402E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2251E-02 @@ -8651,7 +8651,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0426E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7705E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2074E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2074E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5274E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3660E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2733E-02 @@ -9814,7 +9814,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.1132E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8133E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2337E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2337E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5672E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4013E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3209E-02 @@ -10977,7 +10977,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.1158E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8590E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2713E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2713E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.6076E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4400E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3304E-02 @@ -12140,7 +12140,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0432E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8106E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2391E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2391E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5644E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4000E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2839E-02 @@ -13303,7 +13303,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.9742E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7771E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2221E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2221E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5307E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3736E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2358E-02 @@ -14466,7 +14466,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.9769E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8238E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2611E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2611E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5714E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4135E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2439E-02 @@ -15629,7 +15629,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.0431E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8476E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2685E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2685E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5999E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4312E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2956E-02 @@ -16792,7 +16792,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 3.1093E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8714E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2763E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2763E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.6295E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4499E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3506E-02 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index d2db60dec2..b4b5264f52 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -365,7 +365,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -1360,7 +1360,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -2355,7 +2355,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -3350,7 +3350,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -4345,7 +4345,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -5340,7 +5340,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -6335,7 +6335,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -7330,7 +7330,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 @@ -8325,7 +8325,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.3054E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 3.8470E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 53208bd733..b3623e028c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1157,7 +1157,7 @@ "breedmat": 1.0, "f_c_plasma_bootstrap_iter89": 0.0, "f_c_plasma_bootstrap_nevins": 0.0, - "bscf_sauter": 0.0, + "f_c_plasma_bootstrap_sauter": 0.0, "bscf_wilson": 0.0, "bscf_sakai": 0.0, "bscf_aries": 0.0, @@ -8909,7 +8909,7 @@ "breedmat": "breeder material switch (i_blanket_type=2 (KIT HCPB)):\n
      \n
    • =1 Lithium orthosilicate
      • \n
    • =2 Lithium methatitanate
      • \n
    • =3 Lithium zirconate
      • \n
    ", "f_c_plasma_bootstrap_iter89": "bootstrap current fraction, ITER 1989 model", "f_c_plasma_bootstrap_nevins": "bootstrap current fraction, Nevins et al model", - "bscf_sauter": "bootstrap current fraction, Sauter et al model", + "f_c_plasma_bootstrap_sauter": "bootstrap current fraction, Sauter et al model", "bscf_wilson": "bootstrap current fraction, Wilson et al model", "bscf_sakai": "bootstrap current fraction, Sakai model", "bscf_aries": "bootstrap current fraction, ARIES model", @@ -17611,7 +17611,7 @@ "bootstrap_current_fraction_max", "f_c_plasma_bootstrap_iter89", "f_c_plasma_bootstrap_nevins", - "bscf_sauter", + "f_c_plasma_bootstrap_sauter", "bscf_wilson", "bscf_sakai", "bscf_aries", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index ac74321281..9536ee019f 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -505,7 +505,7 @@ Flat-top_resistive_(Wb)_________________________________________________ (vs_plasma_burn_required)_______________________ 2.6495E+02 OP bootstrap_current_fraction_multiplier___________________________________ (cboot)_______________________ 1.0000E+00 Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7455E-01 - Bootstrap_fraction_(Sauter_et_al)_______________________________________ (bscf_sauter)_________________ 4.2290E-01 + Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2290E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5275E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3666E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.1803E-02 From 86a1fe5c339521458e1592fd5c56fde8c7f0957b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 11:00:29 +0100 Subject: [PATCH 21/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bscf=5Fwilson=20t?= =?UTF-8?q?o=20f=5Fc=5Fplasma=5Fbootstrap=5Fwilson=20for=20clarity=20and?= =?UTF-8?q?=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/plot_proc.py | 2 +- process/physics.py | 8 ++--- source/fortran/current_drive_variables.f90 | 2 +- .../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 +- 18 files changed, 53 insertions(+), 53 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 980900009c..15e8e98050 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -514,7 +514,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6783E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1436E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4713E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3036E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3036E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2877E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1680E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2449E-03 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 329052ab87..9d44f045e6 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -510,7 +510,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 353878ef1f..6ff97fe281 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -510,7 +510,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index cafd52c89e..c99ea7fe75 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -510,7 +510,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index b4bac9380c..91bdc387b9 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -510,7 +510,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 6716ef1ed7..51445b46e0 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -367,7 +367,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -1362,7 +1362,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -2357,7 +2357,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -3352,7 +3352,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -4347,7 +4347,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -5342,7 +5342,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -6337,7 +6337,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -7332,7 +7332,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -8327,7 +8327,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index a628b6d539..55ebd49db7 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3288,7 +3288,7 @@ def plot_bootstrap_comparison(axis, mfile_data, scan): boot_ipdg = mfile_data.data["f_c_plasma_bootstrap_iter89"].get_scan(scan) boot_sauter = mfile_data.data["f_c_plasma_bootstrap_sauter"].get_scan(scan) boot_nenins = mfile_data.data["f_c_plasma_bootstrap_nevins"].get_scan(scan) - boot_wilson = mfile_data.data["bscf_wilson"].get_scan(scan) + boot_wilson = mfile_data.data["f_c_plasma_bootstrap_wilson"].get_scan(scan) boot_sakai = mfile_data.data["bscf_sakai"].get_scan(scan) boot_aries = mfile_data.data["bscf_aries"].get_scan(scan) boot_andrade = mfile_data.data["bscf_andrade"].get_scan(scan) diff --git a/process/physics.py b/process/physics.py index a941a51200..fdf2146553 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1839,7 +1839,7 @@ def physics(self): - physics_variables.beta_fast_alpha - physics_variables.beta_beam ) * (physics_variables.btot / physics_variables.bp) ** 2 - current_drive_variables.bscf_wilson = ( + current_drive_variables.f_c_plasma_bootstrap_wilson = ( current_drive_variables.cboot * self.bootstrap_fraction_wilson( physics_variables.alphaj, @@ -1952,7 +1952,7 @@ def physics(self): ) elif physics_variables.i_bootstrap_current == 3: current_drive_variables.bootstrap_current_fraction = ( - current_drive_variables.bscf_wilson + current_drive_variables.f_c_plasma_bootstrap_wilson ) elif physics_variables.i_bootstrap_current == 4: current_drive_variables.bootstrap_current_fraction = ( @@ -5679,8 +5679,8 @@ def outplas(self): po.ovarrf( self.outfile, "Bootstrap fraction (Wilson)", - "(bscf_wilson)", - current_drive_variables.bscf_wilson, + "(f_c_plasma_bootstrap_wilson)", + current_drive_variables.f_c_plasma_bootstrap_wilson, "OP ", ) po.ovarrf( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 269628960e..8a2689aae6 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -39,7 +39,7 @@ module current_drive_variables real(dp) :: f_c_plasma_bootstrap_sauter !! bootstrap current fraction, Sauter et al model - real(dp) :: bscf_wilson + real(dp) :: f_c_plasma_bootstrap_wilson !! bootstrap current fraction, Wilson et al model real(dp) :: bscf_sakai diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 4e8b646f6d..6caca9b323 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -509,7 +509,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 6544bff9ab..fab9e73f49 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -510,7 +510,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index d0473ea081..208b3b8130 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -510,7 +510,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index e1721890de..d3559a5ab1 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -510,7 +510,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7098E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3349E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index f8ae637321..69f7ab62fa 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -507,7 +507,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7455E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2290E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5275E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3666E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3666E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.1803E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1022E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.9744E-03 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 77cf44a056..2bab06ff0b 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -512,7 +512,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6314E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1061E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4049E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2523E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2523E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2084E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1130E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0453E-03 @@ -1675,7 +1675,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6578E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1146E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4347E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2711E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2711E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2599E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1485E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1749E-03 @@ -2838,7 +2838,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6841E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1238E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4650E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2922E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2922E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3125E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1846E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3075E-03 @@ -4001,7 +4001,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7394E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1715E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5110E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3397E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3397E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3186E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1924E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3228E-03 @@ -5164,7 +5164,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7060E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1531E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4765E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3114E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3114E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2692E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1579E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1983E-03 @@ -6327,7 +6327,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.6836E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1452E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4491E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.2936E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2936E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2193E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1237E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0727E-03 @@ -7490,7 +7490,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7375E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1915E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4941E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3402E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3402E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2251E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1312E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0874E-03 @@ -8653,7 +8653,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7705E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2074E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5274E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3660E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3660E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2733E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1649E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2087E-03 @@ -9816,7 +9816,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8133E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2337E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5672E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4013E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4013E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3209E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1989E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3286E-03 @@ -10979,7 +10979,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8590E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2713E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.6076E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4400E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4400E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3304E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.2082E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3525E-03 @@ -12142,7 +12142,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8106E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2391E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5644E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4000E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4000E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2839E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1746E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2353E-03 @@ -13305,7 +13305,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7771E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2221E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5307E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3736E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3736E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2358E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1408E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1141E-03 @@ -14468,7 +14468,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8238E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2611E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5714E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4135E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4135E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2439E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1493E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1347E-03 @@ -15631,7 +15631,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8476E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2685E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5999E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4312E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4312E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2956E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1848E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2650E-03 @@ -16794,7 +16794,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.8714E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2763E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.6295E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.4499E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4499E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3506E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.2222E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.4036E-03 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index b4b5264f52..c28df6a8e8 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -367,7 +367,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -1362,7 +1362,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -2357,7 +2357,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -3352,7 +3352,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -4347,7 +4347,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -5342,7 +5342,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -6337,7 +6337,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -7332,7 +7332,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 @@ -8327,7 +8327,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.4014E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.0136E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b3623e028c..16b3380ffe 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1158,7 +1158,7 @@ "f_c_plasma_bootstrap_iter89": 0.0, "f_c_plasma_bootstrap_nevins": 0.0, "f_c_plasma_bootstrap_sauter": 0.0, - "bscf_wilson": 0.0, + "f_c_plasma_bootstrap_wilson": 0.0, "bscf_sakai": 0.0, "bscf_aries": 0.0, "bscf_andrade": 0.0, @@ -8910,7 +8910,7 @@ "f_c_plasma_bootstrap_iter89": "bootstrap current fraction, ITER 1989 model", "f_c_plasma_bootstrap_nevins": "bootstrap current fraction, Nevins et al model", "f_c_plasma_bootstrap_sauter": "bootstrap current fraction, Sauter et al model", - "bscf_wilson": "bootstrap current fraction, Wilson et al model", + "f_c_plasma_bootstrap_wilson": "bootstrap current fraction, Wilson et al model", "bscf_sakai": "bootstrap current fraction, Sakai model", "bscf_aries": "bootstrap current fraction, ARIES model", "bscf_andrade": "bootstrap current fraction, Andrade model", @@ -17612,7 +17612,7 @@ "f_c_plasma_bootstrap_iter89", "f_c_plasma_bootstrap_nevins", "f_c_plasma_bootstrap_sauter", - "bscf_wilson", + "f_c_plasma_bootstrap_wilson", "bscf_sakai", "bscf_aries", "bscf_andrade", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 9536ee019f..baf4fa1880 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -507,7 +507,7 @@ Bootstrap_fraction_(ITER_1989)__________________________________________ (f_c_plasma_bootstrap_iter89)_________________ 3.7455E-01 Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2290E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5275E-01 - Bootstrap_fraction_(Wilson)_____________________________________________ (bscf_wilson)_________________ 4.3666E-01 + Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3666E-01 Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.1803E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1022E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.9744E-03 From dd0187d222ade149515dbefd0b324bbd9ab2d41d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 11:03:28 +0100 Subject: [PATCH 22/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bscf=5Faries=20to?= =?UTF-8?q?=20f=5Fc=5Fplasma=5Fbootstrap=5Faries=20for=20clarity=20and=20c?= =?UTF-8?q?onsistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/io/plot_proc.py | 2 +- process/physics.py | 8 ++++---- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 55ebd49db7..dfd348bb00 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3290,7 +3290,7 @@ def plot_bootstrap_comparison(axis, mfile_data, scan): boot_nenins = mfile_data.data["f_c_plasma_bootstrap_nevins"].get_scan(scan) boot_wilson = mfile_data.data["f_c_plasma_bootstrap_wilson"].get_scan(scan) boot_sakai = mfile_data.data["bscf_sakai"].get_scan(scan) - boot_aries = mfile_data.data["bscf_aries"].get_scan(scan) + boot_aries = mfile_data.data["f_c_plasma_bootstrap_aries"].get_scan(scan) boot_andrade = mfile_data.data["bscf_andrade"].get_scan(scan) boot_hoang = mfile_data.data["bscf_hoang"].get_scan(scan) boot_wong = mfile_data.data["bscf_wong"].get_scan(scan) diff --git a/process/physics.py b/process/physics.py index fdf2146553..4788741c5e 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1871,7 +1871,7 @@ def physics(self): ) ) - current_drive_variables.bscf_aries = ( + current_drive_variables.f_c_plasma_bootstrap_aries = ( current_drive_variables.cboot * self.bootstrap_fraction_aries( beta_poloidal=physics_variables.beta_poloidal, @@ -1966,7 +1966,7 @@ def physics(self): ) elif physics_variables.i_bootstrap_current == 6: current_drive_variables.bootstrap_current_fraction = ( - current_drive_variables.bscf_aries + current_drive_variables.f_c_plasma_bootstrap_aries ) elif physics_variables.i_bootstrap_current == 7: current_drive_variables.bootstrap_current_fraction = ( @@ -5693,8 +5693,8 @@ def outplas(self): po.ovarrf( self.outfile, "Bootstrap fraction (ARIES)", - "(bscf_aries)", - current_drive_variables.bscf_aries, + "(f_c_plasma_bootstrap_aries)", + current_drive_variables.f_c_plasma_bootstrap_aries, "OP ", ) po.ovarrf( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 8a2689aae6..24f7d8420f 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -45,7 +45,7 @@ module current_drive_variables real(dp) :: bscf_sakai !! Bootstrap current fraction, Sakai et al model - real(dp) :: bscf_aries + real(dp) :: f_c_plasma_bootstrap_aries !! Bootstrap current fraction, ARIES model real(dp) :: bscf_andrade diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 16b3380ffe..d38835bcf0 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1160,7 +1160,7 @@ "f_c_plasma_bootstrap_sauter": 0.0, "f_c_plasma_bootstrap_wilson": 0.0, "bscf_sakai": 0.0, - "bscf_aries": 0.0, + "f_c_plasma_bootstrap_aries": 0.0, "bscf_andrade": 0.0, "bscf_hoang": 0.0, "bscf_wong": 0.0, @@ -8912,7 +8912,7 @@ "f_c_plasma_bootstrap_sauter": "bootstrap current fraction, Sauter et al model", "f_c_plasma_bootstrap_wilson": "bootstrap current fraction, Wilson et al model", "bscf_sakai": "bootstrap current fraction, Sakai model", - "bscf_aries": "bootstrap current fraction, ARIES model", + "f_c_plasma_bootstrap_aries": "bootstrap current fraction, ARIES model", "bscf_andrade": "bootstrap current fraction, Andrade model", "bscf_hoang": "bootstrap current fraction, Hoang model", "bscf_wong": "bootstrap current fraction, Wong model", @@ -17614,7 +17614,7 @@ "f_c_plasma_bootstrap_sauter", "f_c_plasma_bootstrap_wilson", "bscf_sakai", - "bscf_aries", + "f_c_plasma_bootstrap_aries", "bscf_andrade", "bscf_hoang", "bscf_wong", From 97851fbc673f62a3c28234f05b89fa9bf46424df Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 11:04:16 +0100 Subject: [PATCH 23/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bscf=5Fsakai=20to?= =?UTF-8?q?=20f=5Fc=5Fplasma=5Fbootstrap=5Fsakai=20for=20clarity=20and=20c?= =?UTF-8?q?onsistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/io/plot_proc.py | 2 +- process/physics.py | 8 ++++---- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index dfd348bb00..d1bbb8a58e 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3289,7 +3289,7 @@ def plot_bootstrap_comparison(axis, mfile_data, scan): boot_sauter = mfile_data.data["f_c_plasma_bootstrap_sauter"].get_scan(scan) boot_nenins = mfile_data.data["f_c_plasma_bootstrap_nevins"].get_scan(scan) boot_wilson = mfile_data.data["f_c_plasma_bootstrap_wilson"].get_scan(scan) - boot_sakai = mfile_data.data["bscf_sakai"].get_scan(scan) + boot_sakai = mfile_data.data["f_c_plasma_bootstrap_sakai"].get_scan(scan) boot_aries = mfile_data.data["f_c_plasma_bootstrap_aries"].get_scan(scan) boot_andrade = mfile_data.data["bscf_andrade"].get_scan(scan) boot_hoang = mfile_data.data["bscf_hoang"].get_scan(scan) diff --git a/process/physics.py b/process/physics.py index 4788741c5e..0c1ac61963 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1858,7 +1858,7 @@ def physics(self): * self.bootstrap_fraction_sauter(self.plasma_profile) ) - current_drive_variables.bscf_sakai = ( + current_drive_variables.f_c_plasma_bootstrap_sakai = ( current_drive_variables.cboot * self.bootstrap_fraction_sakai( beta_poloidal=physics_variables.beta_poloidal, @@ -1962,7 +1962,7 @@ def physics(self): # Sakai states that the ACCOME dataset used has the toridal diamagnetic current included in the bootstrap current # So the diamagnetic current calculation should be turned off when using, (i_diamagnetic_current = 0). current_drive_variables.bootstrap_current_fraction = ( - current_drive_variables.bscf_sakai + current_drive_variables.f_c_plasma_bootstrap_sakai ) elif physics_variables.i_bootstrap_current == 6: current_drive_variables.bootstrap_current_fraction = ( @@ -5686,8 +5686,8 @@ def outplas(self): po.ovarrf( self.outfile, "Bootstrap fraction (Sakai)", - "(bscf_sakai)", - current_drive_variables.bscf_sakai, + "(f_c_plasma_bootstrap_sakai)", + current_drive_variables.f_c_plasma_bootstrap_sakai, "OP ", ) po.ovarrf( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 24f7d8420f..0dcc43c9d2 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -42,7 +42,7 @@ module current_drive_variables real(dp) :: f_c_plasma_bootstrap_wilson !! bootstrap current fraction, Wilson et al model - real(dp) :: bscf_sakai + real(dp) :: f_c_plasma_bootstrap_sakai !! Bootstrap current fraction, Sakai et al model real(dp) :: f_c_plasma_bootstrap_aries diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d38835bcf0..db5232e8f9 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1159,7 +1159,7 @@ "f_c_plasma_bootstrap_nevins": 0.0, "f_c_plasma_bootstrap_sauter": 0.0, "f_c_plasma_bootstrap_wilson": 0.0, - "bscf_sakai": 0.0, + "f_c_plasma_bootstrap_sakai": 0.0, "f_c_plasma_bootstrap_aries": 0.0, "bscf_andrade": 0.0, "bscf_hoang": 0.0, @@ -8911,7 +8911,7 @@ "f_c_plasma_bootstrap_nevins": "bootstrap current fraction, Nevins et al model", "f_c_plasma_bootstrap_sauter": "bootstrap current fraction, Sauter et al model", "f_c_plasma_bootstrap_wilson": "bootstrap current fraction, Wilson et al model", - "bscf_sakai": "bootstrap current fraction, Sakai model", + "f_c_plasma_bootstrap_sakai": "bootstrap current fraction, Sakai model", "f_c_plasma_bootstrap_aries": "bootstrap current fraction, ARIES model", "bscf_andrade": "bootstrap current fraction, Andrade model", "bscf_hoang": "bootstrap current fraction, Hoang model", @@ -17613,7 +17613,7 @@ "f_c_plasma_bootstrap_nevins", "f_c_plasma_bootstrap_sauter", "f_c_plasma_bootstrap_wilson", - "bscf_sakai", + "f_c_plasma_bootstrap_sakai", "f_c_plasma_bootstrap_aries", "bscf_andrade", "bscf_hoang", From 9d1c9cc7ba14110c55dfe41353ddd8fc6c174b29 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 11:04:49 +0100 Subject: [PATCH 24/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bscf=5Fandrade=20?= =?UTF-8?q?to=20f=5Fc=5Fplasma=5Fbootstrap=5Fandrade=20for=20clarity=20and?= =?UTF-8?q?=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/io/plot_proc.py | 2 +- process/physics.py | 8 ++++---- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index d1bbb8a58e..10038668f9 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3291,7 +3291,7 @@ def plot_bootstrap_comparison(axis, mfile_data, scan): boot_wilson = mfile_data.data["f_c_plasma_bootstrap_wilson"].get_scan(scan) boot_sakai = mfile_data.data["f_c_plasma_bootstrap_sakai"].get_scan(scan) boot_aries = mfile_data.data["f_c_plasma_bootstrap_aries"].get_scan(scan) - boot_andrade = mfile_data.data["bscf_andrade"].get_scan(scan) + boot_andrade = mfile_data.data["f_c_plasma_bootstrap_andrade"].get_scan(scan) boot_hoang = mfile_data.data["bscf_hoang"].get_scan(scan) boot_wong = mfile_data.data["bscf_wong"].get_scan(scan) boot_gi_I = mfile_data.data["bscf_gi_i"].get_scan(scan) # noqa: N806 diff --git a/process/physics.py b/process/physics.py index 0c1ac61963..b3401d3b7b 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1882,7 +1882,7 @@ def physics(self): ) ) - current_drive_variables.bscf_andrade = ( + current_drive_variables.f_c_plasma_bootstrap_andrade = ( current_drive_variables.cboot * self.bootstrap_fraction_andrade( beta_poloidal=physics_variables.beta_poloidal, @@ -1970,7 +1970,7 @@ def physics(self): ) elif physics_variables.i_bootstrap_current == 7: current_drive_variables.bootstrap_current_fraction = ( - current_drive_variables.bscf_andrade + current_drive_variables.f_c_plasma_bootstrap_andrade ) elif physics_variables.i_bootstrap_current == 8: current_drive_variables.bootstrap_current_fraction = ( @@ -5700,8 +5700,8 @@ def outplas(self): po.ovarrf( self.outfile, "Bootstrap fraction (Andrade)", - "(bscf_andrade)", - current_drive_variables.bscf_andrade, + "(f_c_plasma_bootstrap_andrade)", + current_drive_variables.f_c_plasma_bootstrap_andrade, "OP ", ) po.ovarrf( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 0dcc43c9d2..431b5b14a2 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -48,7 +48,7 @@ module current_drive_variables real(dp) :: f_c_plasma_bootstrap_aries !! Bootstrap current fraction, ARIES model - real(dp) :: bscf_andrade + real(dp) :: f_c_plasma_bootstrap_andrade !! Bootstrap current fraction, Andrade et al model real(dp) :: bscf_hoang diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index db5232e8f9..0c6b8207f1 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1161,7 +1161,7 @@ "f_c_plasma_bootstrap_wilson": 0.0, "f_c_plasma_bootstrap_sakai": 0.0, "f_c_plasma_bootstrap_aries": 0.0, - "bscf_andrade": 0.0, + "f_c_plasma_bootstrap_andrade": 0.0, "bscf_hoang": 0.0, "bscf_wong": 0.0, "bscf_gi_I": 0.0, @@ -8913,7 +8913,7 @@ "f_c_plasma_bootstrap_wilson": "bootstrap current fraction, Wilson et al model", "f_c_plasma_bootstrap_sakai": "bootstrap current fraction, Sakai model", "f_c_plasma_bootstrap_aries": "bootstrap current fraction, ARIES model", - "bscf_andrade": "bootstrap current fraction, Andrade model", + "f_c_plasma_bootstrap_andrade": "bootstrap current fraction, Andrade model", "bscf_hoang": "bootstrap current fraction, Hoang model", "bscf_wong": "bootstrap current fraction, Wong model", "bscf_gi_I": "bootstrap current fraction, GI model I", @@ -17615,7 +17615,7 @@ "f_c_plasma_bootstrap_wilson", "f_c_plasma_bootstrap_sakai", "f_c_plasma_bootstrap_aries", - "bscf_andrade", + "f_c_plasma_bootstrap_andrade", "bscf_hoang", "bscf_wong", "bscf_gi_I", From 615670c97594d8328bbf441ffc92a49922edd7d8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 11:05:15 +0100 Subject: [PATCH 25/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bscf=5Fhoang=20to?= =?UTF-8?q?=20f=5Fc=5Fplasma=5Fbootstrap=5Fhoang=20for=20clarity=20and=20c?= =?UTF-8?q?onsistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/io/plot_proc.py | 2 +- process/physics.py | 8 ++++---- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 10038668f9..6a85254469 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3292,7 +3292,7 @@ def plot_bootstrap_comparison(axis, mfile_data, scan): boot_sakai = mfile_data.data["f_c_plasma_bootstrap_sakai"].get_scan(scan) boot_aries = mfile_data.data["f_c_plasma_bootstrap_aries"].get_scan(scan) boot_andrade = mfile_data.data["f_c_plasma_bootstrap_andrade"].get_scan(scan) - boot_hoang = mfile_data.data["bscf_hoang"].get_scan(scan) + boot_hoang = mfile_data.data["f_c_plasma_bootstrap_hoang"].get_scan(scan) boot_wong = mfile_data.data["bscf_wong"].get_scan(scan) boot_gi_I = mfile_data.data["bscf_gi_i"].get_scan(scan) # noqa: N806 boot_gi_II = mfile_data.data["bscf_gi_ii"].get_scan(scan) # noqa: N806 diff --git a/process/physics.py b/process/physics.py index b3401d3b7b..bb3a7d3de8 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1891,7 +1891,7 @@ def physics(self): inverse_aspect=physics_variables.eps, ) ) - current_drive_variables.bscf_hoang = ( + current_drive_variables.f_c_plasma_bootstrap_hoang = ( current_drive_variables.cboot * self.bootstrap_fraction_hoang( beta_poloidal=physics_variables.beta_poloidal, @@ -1974,7 +1974,7 @@ def physics(self): ) elif physics_variables.i_bootstrap_current == 8: current_drive_variables.bootstrap_current_fraction = ( - current_drive_variables.bscf_hoang + current_drive_variables.f_c_plasma_bootstrap_hoang ) elif physics_variables.i_bootstrap_current == 9: current_drive_variables.bootstrap_current_fraction = ( @@ -5707,8 +5707,8 @@ def outplas(self): po.ovarrf( self.outfile, "Bootstrap fraction (Hoang)", - "(bscf_hoang)", - current_drive_variables.bscf_hoang, + "(f_c_plasma_bootstrap_hoang)", + current_drive_variables.f_c_plasma_bootstrap_hoang, "OP ", ) po.ovarrf( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 431b5b14a2..c5960cf33e 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -51,7 +51,7 @@ module current_drive_variables real(dp) :: f_c_plasma_bootstrap_andrade !! Bootstrap current fraction, Andrade et al model - real(dp) :: bscf_hoang + real(dp) :: f_c_plasma_bootstrap_hoang !! Bootstrap current fraction, Hoang et al model real(dp) :: bscf_wong diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 0c6b8207f1..16a7cabc78 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1162,7 +1162,7 @@ "f_c_plasma_bootstrap_sakai": 0.0, "f_c_plasma_bootstrap_aries": 0.0, "f_c_plasma_bootstrap_andrade": 0.0, - "bscf_hoang": 0.0, + "f_c_plasma_bootstrap_hoang": 0.0, "bscf_wong": 0.0, "bscf_gi_I": 0.0, "bscf_gi_II": 0.0, @@ -8914,7 +8914,7 @@ "f_c_plasma_bootstrap_sakai": "bootstrap current fraction, Sakai model", "f_c_plasma_bootstrap_aries": "bootstrap current fraction, ARIES model", "f_c_plasma_bootstrap_andrade": "bootstrap current fraction, Andrade model", - "bscf_hoang": "bootstrap current fraction, Hoang model", + "f_c_plasma_bootstrap_hoang": "bootstrap current fraction, Hoang model", "bscf_wong": "bootstrap current fraction, Wong model", "bscf_gi_I": "bootstrap current fraction, GI model I", "bscf_gi_II": "bootstrap current fraction, GI model II", @@ -17616,7 +17616,7 @@ "f_c_plasma_bootstrap_sakai", "f_c_plasma_bootstrap_aries", "f_c_plasma_bootstrap_andrade", - "bscf_hoang", + "f_c_plasma_bootstrap_hoang", "bscf_wong", "bscf_gi_I", "bscf_gi_II", From c47b9305c1d7a2142fed8eafc48bcc398e476def Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 11:05:47 +0100 Subject: [PATCH 26/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bscf=5Fwong=20to?= =?UTF-8?q?=20f=5Fc=5Fplasma=5Fbootstrap=5Fwong=20for=20clarity=20and=20co?= =?UTF-8?q?nsistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/io/plot_proc.py | 2 +- process/physics.py | 8 ++++---- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 6a85254469..9ce168d197 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3293,7 +3293,7 @@ def plot_bootstrap_comparison(axis, mfile_data, scan): boot_aries = mfile_data.data["f_c_plasma_bootstrap_aries"].get_scan(scan) boot_andrade = mfile_data.data["f_c_plasma_bootstrap_andrade"].get_scan(scan) boot_hoang = mfile_data.data["f_c_plasma_bootstrap_hoang"].get_scan(scan) - boot_wong = mfile_data.data["bscf_wong"].get_scan(scan) + boot_wong = mfile_data.data["f_c_plasma_bootstrap_wong"].get_scan(scan) boot_gi_I = mfile_data.data["bscf_gi_i"].get_scan(scan) # noqa: N806 boot_gi_II = mfile_data.data["bscf_gi_ii"].get_scan(scan) # noqa: N806 diff --git a/process/physics.py b/process/physics.py index bb3a7d3de8..1a62afaf89 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1900,7 +1900,7 @@ def physics(self): inverse_aspect=physics_variables.eps, ) ) - current_drive_variables.bscf_wong = ( + current_drive_variables.f_c_plasma_bootstrap_wong = ( current_drive_variables.cboot * self.bootstrap_fraction_wong( beta_poloidal=physics_variables.beta_poloidal, @@ -1978,7 +1978,7 @@ def physics(self): ) elif physics_variables.i_bootstrap_current == 9: current_drive_variables.bootstrap_current_fraction = ( - current_drive_variables.bscf_wong + current_drive_variables.f_c_plasma_bootstrap_wong ) elif physics_variables.i_bootstrap_current == 10: current_drive_variables.bootstrap_current_fraction = ( @@ -5714,8 +5714,8 @@ def outplas(self): po.ovarrf( self.outfile, "Bootstrap fraction (Wong)", - "(bscf_wong)", - current_drive_variables.bscf_wong, + "(f_c_plasma_bootstrap_wong)", + current_drive_variables.f_c_plasma_bootstrap_wong, "OP ", ) po.ovarrf( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index c5960cf33e..837bb559b4 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -54,7 +54,7 @@ module current_drive_variables real(dp) :: f_c_plasma_bootstrap_hoang !! Bootstrap current fraction, Hoang et al model - real(dp) :: bscf_wong + real(dp) :: f_c_plasma_bootstrap_wong !! Bootstrap current fraction, Wong et al model real(dp) :: bscf_gi_I diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 16a7cabc78..e733d74dfb 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1163,7 +1163,7 @@ "f_c_plasma_bootstrap_aries": 0.0, "f_c_plasma_bootstrap_andrade": 0.0, "f_c_plasma_bootstrap_hoang": 0.0, - "bscf_wong": 0.0, + "f_c_plasma_bootstrap_wong": 0.0, "bscf_gi_I": 0.0, "bscf_gi_II": 0.0, "bootstrap_current_fraction_max": 0.9, @@ -8915,7 +8915,7 @@ "f_c_plasma_bootstrap_aries": "bootstrap current fraction, ARIES model", "f_c_plasma_bootstrap_andrade": "bootstrap current fraction, Andrade model", "f_c_plasma_bootstrap_hoang": "bootstrap current fraction, Hoang model", - "bscf_wong": "bootstrap current fraction, Wong model", + "f_c_plasma_bootstrap_wong": "bootstrap current fraction, Wong model", "bscf_gi_I": "bootstrap current fraction, GI model I", "bscf_gi_II": "bootstrap current fraction, GI model II", "bootstrap_current_fraction_max": "maximum fraction of plasma current from bootstrap; if `bootstrap_current_fraction_max < 0`,\n bootstrap fraction = abs(bootstrap_current_fraction_max)", @@ -17617,7 +17617,7 @@ "f_c_plasma_bootstrap_aries", "f_c_plasma_bootstrap_andrade", "f_c_plasma_bootstrap_hoang", - "bscf_wong", + "f_c_plasma_bootstrap_wong", "bscf_gi_I", "bscf_gi_II", "cboot", From b884dc777b70c183ce6c993aca57e71a7ba8d872 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 11:09:30 +0100 Subject: [PATCH 27/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bootstrap=5Fcurre?= =?UTF-8?q?nt=5Ffraction=5Fmax=20to=20f=5Fc=5Fplasma=5Fbootstrap=5Fmax=20f?= =?UTF-8?q?or=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plasma_current/bootstrap_current.md | 6 ++-- .../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/current_drive.py | 6 ++-- process/input.py | 2 +- process/io/obsolete_vars.py | 2 +- process/io/plot_radial_build.py | 2 +- process/io/plot_scans.py | 2 +- process/physics.py | 10 +++--- process/scan.py | 4 +-- source/fortran/current_drive_variables.f90 | 6 ++-- source/fortran/scan.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 20 ++++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 14 ++++---- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_current_drive.py | 10 +++--- 39 files changed, 104 insertions(+), 104 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_current/bootstrap_current.md b/documentation/proc-pages/physics-models/plasma_current/bootstrap_current.md index 13ac886a03..d76c4bcbe4 100644 --- a/documentation/proc-pages/physics-models/plasma_current/bootstrap_current.md +++ b/documentation/proc-pages/physics-models/plasma_current/bootstrap_current.md @@ -695,13 +695,13 @@ $$ ## Setting of maximum desirable bootstrap current fraction -The variable `bootstrap_current_fraction_max` can be set to the value of maximum desirable bootstrap current fraction for a specific design. When optimising if the value of the calculated `bootstrap_current_fraction` for the model selected with `i_bootstrap_current` exceeds this value, then `bootstrap_current_fraction` is set to the value of `bootstrap_current_fraction_max`. +The variable `f_c_plasma_bootstrap_max` can be set to the value of maximum desirable bootstrap current fraction for a specific design. When optimising if the value of the calculated `bootstrap_current_fraction` for the model selected with `i_bootstrap_current` exceeds this value, then `bootstrap_current_fraction` is set to the value of `f_c_plasma_bootstrap_max`. An error is also raised to the user in the terminal output at the end of the run saying "Bootstrap fraction upper limit enforced". ## Fixing the bootstrap current fraction -If the user wants to set the value of the bootstrap current fraction directly then the value can be set by assigning the negative of the desired value to `bootstrap_current_fraction_max`. +If the user wants to set the value of the bootstrap current fraction directly then the value can be set by assigning the negative of the desired value to `f_c_plasma_bootstrap_max`. ```txt @@ -709,7 +709,7 @@ If the user wants to set the value of the bootstrap current fraction directly th # Setting a fixed bootstrap current fraction of 80% -bootstrap_current_fraction_max = -0.8 +f_c_plasma_bootstrap_max = -0.8 ``` diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 15e8e98050..0516d82e0e 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -535,7 +535,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 2.1293E-01 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0990E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 9.8586E+03 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6299E-02 OP @@ -1646,7 +1646,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 9d44f045e6..3f155f47c4 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -533,7 +533,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP @@ -1640,7 +1640,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 6ff97fe281..3170fd4f24 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -533,7 +533,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP @@ -1640,7 +1640,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index c99ea7fe75..bfd6eac552 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -533,7 +533,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP @@ -1641,7 +1641,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 91bdc387b9..87697a1faf 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -533,7 +533,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP @@ -1641,7 +1641,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 38ef212506..eaa711fad0 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -451,7 +451,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 51445b46e0..d19d65fbc7 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -388,7 +388,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -1383,7 +1383,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -2378,7 +2378,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -3373,7 +3373,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -4368,7 +4368,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -5363,7 +5363,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -6358,7 +6358,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -7353,7 +7353,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -8348,7 +8348,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -9144,7 +9144,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) *-------------Current Drive Variables--------------* -bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; +f_c_plasma_bootstrap_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 650d34b243..5d602cb732 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -451,7 +451,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/process/current_drive.py b/process/current_drive.py index ba532cc447..1adcaa3a3b 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -831,8 +831,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Maximum Allowed Bootstrap current fraction", - "(bootstrap_current_fraction_max)", - current_drive_variables.bootstrap_current_fraction_max, + "(f_c_plasma_bootstrap_max)", + current_drive_variables.f_c_plasma_bootstrap_max, ) if current_drive_variables.i_hcd_secondary != 0: po.ovarre( @@ -1010,7 +1010,7 @@ def cudriv(self, output: bool): if ( abs( current_drive_variables.bootstrap_current_fraction - - current_drive_variables.bootstrap_current_fraction_max + - current_drive_variables.f_c_plasma_bootstrap_max ) < 1.0e-8 ): diff --git a/process/input.py b/process/input.py index ec00bf3fbe..fe5b7412e1 100644 --- a/process/input.py +++ b/process/input.py @@ -225,7 +225,7 @@ def __post_init__(self): ), "bmn": InputVariable(fortran.stellarator_variables, float, range=(0.0001, 0.01)), "bmxlim": InputVariable(fortran.constraint_variables, float, range=(0.1, 50.0)), - "bootstrap_current_fraction_max": InputVariable( + "f_c_plasma_bootstrap_max": InputVariable( fortran.current_drive_variables, float, range=(-0.999, 0.999) ), "breeder_f": InputVariable(fortran.fwbs_variables, float, range=(0.0, 1.0)), diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 16770c25ea..fcb0125e33 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -124,7 +124,7 @@ "ibss": "i_bootstrap_current", "ips": "i_pfirsch_schluter_current", "bootipf": "bootstrap_current_fraction", - "bscfmax": "bootstrap_current_fraction_max", + "bscfmax": "f_c_plasma_bootstrap_max", "vgap2": "dz_shld_vv_gap", "vgap": "dz_xpoint_divertor", "ftritbm": "f_tritium_bream", diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index 145f3a7adf..b3ac6bd49f 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -159,7 +159,7 @@ def main(args=None): "te", "boundu(15)", "beta_norm_max", - "bootstrap_current_fraction_max", + "f_c_plasma_bootstrap_max", "boundu(10)", "fiooic", "fjprot", diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py index ad4fc2a0d9..a4242df3b0 100644 --- a/process/io/plot_scans.py +++ b/process/io/plot_scans.py @@ -301,7 +301,7 @@ def main(args=None): 9: "te", 10: "boundu(15)", 11: "beta_norm_max", - 12: "bootstrap_current_fraction_max", + 12: "f_c_plasma_bootstrap_max", 13: "boundu(10)", 14: "fiooic", 15: "fjprot", diff --git a/process/physics.py b/process/physics.py index 1a62afaf89..6c99af46ce 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1934,9 +1934,9 @@ def physics(self): ) ) - if current_drive_variables.bootstrap_current_fraction_max < 0.0e0: + if current_drive_variables.f_c_plasma_bootstrap_max < 0.0e0: current_drive_variables.bootstrap_current_fraction = abs( - current_drive_variables.bootstrap_current_fraction_max + current_drive_variables.f_c_plasma_bootstrap_max ) current_drive_variables.plasma_current_internal_fraction = ( current_drive_variables.bootstrap_current_fraction @@ -1997,11 +1997,11 @@ def physics(self): physics_module.err242 = 0 if ( current_drive_variables.bootstrap_current_fraction - > current_drive_variables.bootstrap_current_fraction_max + > current_drive_variables.f_c_plasma_bootstrap_max ): current_drive_variables.bootstrap_current_fraction = min( current_drive_variables.bootstrap_current_fraction, - current_drive_variables.bootstrap_current_fraction_max, + current_drive_variables.f_c_plasma_bootstrap_max, ) physics_module.err242 = 1 @@ -5762,7 +5762,7 @@ def outplas(self): if physics_module.err243 == 1: error_handling.report_error(243) - if current_drive_variables.bootstrap_current_fraction_max < 0.0e0: + if current_drive_variables.f_c_plasma_bootstrap_max < 0.0e0: po.ocmmnt( self.outfile, " (User-specified bootstrap current fraction used)" ) diff --git a/process/scan.py b/process/scan.py index 5c21e394a8..29de9626e2 100644 --- a/process/scan.py +++ b/process/scan.py @@ -55,7 +55,7 @@ def __iter__(self): 9: ScanVariable("te", "Electron_temperature_keV"), 10: ScanVariable("boundu(15)", "Volt-second_upper_bound"), 11: ScanVariable("beta_norm_max", "Beta_coefficient"), - 12: ScanVariable("bootstrap_current_fraction_max", "Bootstrap_fraction"), + 12: ScanVariable("f_c_plasma_bootstrap_max", "Bootstrap_fraction"), 13: ScanVariable("boundu(10)", "H_factor_upper_bound"), 14: ScanVariable("fiooic", "TFC_Iop_/_Icrit_f-value"), 15: ScanVariable("fjprot", "TFC_Jprot_limit_f-value"), @@ -902,7 +902,7 @@ def scan_select(self, nwp, swp, iscn): case 11: physics_variables.beta_norm_max = swp[iscn - 1] case 12: - current_drive_variables.bootstrap_current_fraction_max = swp[iscn - 1] + current_drive_variables.f_c_plasma_bootstrap_max = swp[iscn - 1] case 13: numerics.boundu[9] = swp[iscn - 1] case 14: diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 837bb559b4..8fc7eaa2d9 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -26,9 +26,9 @@ module current_drive_variables real(dp) :: bootstrap_current_fraction !! bootstrap current fraction (enforced; see i_bootstrap_current) - real(dp) :: bootstrap_current_fraction_max - !! maximum fraction of plasma current from bootstrap; if `bootstrap_current_fraction_max < 0`, - !! bootstrap fraction = abs(bootstrap_current_fraction_max) + real(dp) :: f_c_plasma_bootstrap_max + !! maximum fraction of plasma current from bootstrap; if `f_c_plasma_bootstrap_max < 0`, + !! bootstrap fraction = abs(f_c_plasma_bootstrap_max) real(dp) :: f_c_plasma_bootstrap_iter89 !! bootstrap current fraction, ITER 1989 model diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index b1947642bb..95c53dc40e 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -48,7 +48,7 @@ module scan_module !!
  • 9 te !!
  • 10 boundu(15: fvs) !!
  • 11 beta_norm_max - !!
  • 12 bootstrap_current_fraction_max + !!
  • 12 f_c_plasma_bootstrap_max !!
  • 13 boundu(10: hfact) !!
  • 14 fiooic !!
  • 15 fjprot diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 6caca9b323..22429fbf77 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -532,7 +532,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP @@ -1639,7 +1639,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index fab9e73f49..8b1b00c1cd 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -533,7 +533,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP @@ -1640,7 +1640,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 208b3b8130..5220a556a6 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -533,7 +533,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP @@ -1640,7 +1640,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d3559a5ab1..156f6a207b 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -533,7 +533,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP @@ -1640,7 +1640,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 8341ade2a7..24c463c201 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -450,7 +450,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 69f7ab62fa..b618f5858d 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -530,7 +530,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 4.7098E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0141E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.2041E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6799E-02 OP @@ -1641,7 +1641,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index bcb7d55cfe..da5d95e6f4 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -160,7 +160,7 @@ output_costs = 1 * Switch for costs output; *-------------Current Drive Variables--------------* -bootstrap_current_fraction_max = 0.95 * maximum fraction of plasma current from bootstrap; if `bscfmax < 0`; +f_c_plasma_bootstrap_max = 0.95 * maximum fraction of plasma current from bootstrap; if `bscfmax < 0`; eta_ecrh_injector_wall_plug = 0.5 * ECH wall plug to injector efficiency gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) i_hcd_primary = 10 * Switch for current drive efficiency model; diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index a9c50585b7..924c57a193 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -165,7 +165,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) *-------------Current Drive Variables--------------* -bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; +f_c_plasma_bootstrap_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 2bab06ff0b..e83688543a 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -534,7 +534,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1129E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6662E-02 OP @@ -1697,7 +1697,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1326E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6483E-02 OP @@ -2860,7 +2860,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.5891E-01 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1272E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.5902E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6344E-02 OP @@ -4023,7 +4023,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1468E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6548E-02 OP @@ -5186,7 +5186,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1502E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6564E-02 OP @@ -6349,7 +6349,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1436E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6722E-02 OP @@ -7512,7 +7512,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1481E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6916E-02 OP @@ -8675,7 +8675,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1510E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6867E-02 OP @@ -9838,7 +9838,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1428E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6949E-02 OP @@ -11001,7 +11001,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1568E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.7010E-02 OP @@ -12164,7 +12164,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1696E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6863E-02 OP @@ -13327,7 +13327,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1690E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6900E-02 OP @@ -14490,7 +14490,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1807E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6986E-02 OP @@ -15653,7 +15653,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1919E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6811E-02 OP @@ -16816,7 +16816,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.2037E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6629E-02 OP @@ -17927,7 +17927,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index c28df6a8e8..92f1107d19 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -388,7 +388,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -1383,7 +1383,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -2378,7 +2378,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -3373,7 +3373,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -4368,7 +4368,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -5363,7 +5363,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -6358,7 +6358,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -7353,7 +7353,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -8348,7 +8348,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.9000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP @@ -9144,7 +9144,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) *-------------Current Drive Variables--------------* -bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; +f_c_plasma_bootstrap_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 59516ecec2..5c5e5fef45 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -165,7 +165,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) *-------------Current Drive Variables--------------* -bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; +f_c_plasma_bootstrap_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index d6d5d994a0..89d4dd61b5 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -165,7 +165,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) *-------------Current Drive Variables--------------* -bootstrap_current_fraction_max = 0.99 * Maximum fraction of plasma current from bootstrap; +f_c_plasma_bootstrap_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; gamma_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e733d74dfb..03082cd69f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1166,7 +1166,7 @@ "f_c_plasma_bootstrap_wong": 0.0, "bscf_gi_I": 0.0, "bscf_gi_II": 0.0, - "bootstrap_current_fraction_max": 0.9, + "f_c_plasma_bootstrap_max": 0.9, "bt": 5.68, "btot": 0.0, "burnup": 0.0, @@ -8918,7 +8918,7 @@ "f_c_plasma_bootstrap_wong": "bootstrap current fraction, Wong model", "bscf_gi_I": "bootstrap current fraction, GI model I", "bscf_gi_II": "bootstrap current fraction, GI model II", - "bootstrap_current_fraction_max": "maximum fraction of plasma current from bootstrap; if `bootstrap_current_fraction_max < 0`,\n bootstrap fraction = abs(bootstrap_current_fraction_max)", + "f_c_plasma_bootstrap_max": "maximum fraction of plasma current from bootstrap; if `f_c_plasma_bootstrap_max < 0`,\n bootstrap fraction = abs(f_c_plasma_bootstrap_max)", "bt": "toroidal field on axis (T) (`iteration variable 2`)", "btot": "total toroidal + poloidal field (T)", "burnup": "fractional plasma burnup", @@ -10134,7 +10134,7 @@ "nre": "", "nsix": "", "nsixi": "", - "nsweep": "Switch denoting quantity to scan:
      \n
    • 1 aspect\n
    • 2 hldivlim\n
    • 3 pnetelin\n
    • 4 hfact\n
    • 5 oacdcp\n
    • 6 walalw\n
    • 7 beamfus0\n
    • 8 fqval\n
    • 9 te\n
    • 10 boundu(15: fvs)\n
    • 11 beta_norm_max\n
    • 12 bootstrap_current_fraction_max (use negative values only)\n
    • 13 boundu(10: hfact)\n
    • 14 fiooic\n
    • 15 fjprot\n
    • 16 rmajor\n
    • 17 bmxlim\n
    • 18 gammax\n
    • 19 boundl(16: dr_cs)\n
    • 20 t_burn_min\n
    • 21 not used\n
    • 22 cfactr (N.B. requires iavail=0)\n
    • 23 boundu(72: fipir)\n
    • 24 powfmax\n
    • 25 kappa\n
    • 26 triang\n
    • 27 tbrmin (for blktmodel > 0 only)\n
    • 28 bt\n
    • 29 radius_plasma_core_norm\n
    • 31 f_alpha_energy_confinement_min\n
    • 32 epsvmc\n
    • 33 ttarget\n
    • 34 qtargettotal\n
    • 35 lambda_q_omp\n
    • 36 lambda_target\n
    • 37 lcon_factor\n
    • 38 Neon upper limit\n
    • 39 Argon upper limit\n
    • 40 Xenon upper limit\n
    • 41 dr_blkt_outboard\n
    • 42 Argon fraction fimp(9)\n
    • 43 normalised minor radius at which electron cyclotron current drive is maximum\n
    • 44 Allowable maximum shear stress (Tresca) in tf coil structural material\n
    • 45 Minimum allowable temperature margin ; tf coils\n
    • 46 boundu(150) fgwsep\n
    • 47 impurity_enrichment(9) Argon impurity enrichment\n
    • 48 TF coil - n_pancake (integer turn winding pack)\n
    • 49 TF coil - n_layer (integer turn winding pack)\n
    • 50 Xenon fraction fimp(13)\n
    • 51 Power fraction to lower DN Divertor ftar\n
    • 52 SoL radiation fraction\n
    • 54 GL_nbti upper critical field at 0 Kelvin\n
    • 55 `dr_shld_inboard` : Inboard neutron shield thickness\n
    • 56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n
    • 57 `bt` lower boundary\n
    • 58 `dr_fw_plasma_gap_inboard` : Inboard plasma-first wall gap\n
    • 59 `dr_fw_plasma_gap_outboard` : Outboard plasma-first wall gap\n
    • 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n
    • 61 copperaoh_m2_max : CS coil current / copper area\n
    • 62 j_cs_flat_top_end : CS coil current density at EOF\n
    • 63 dr_cs : CS thickness (m)\n
    • 64 f_z_cs_tf_internal : CS height (m)
    ", + "nsweep": "Switch denoting quantity to scan:
      \n
    • 1 aspect\n
    • 2 hldivlim\n
    • 3 pnetelin\n
    • 4 hfact\n
    • 5 oacdcp\n
    • 6 walalw\n
    • 7 beamfus0\n
    • 8 fqval\n
    • 9 te\n
    • 10 boundu(15: fvs)\n
    • 11 beta_norm_max\n
    • 12 f_c_plasma_bootstrap_max (use negative values only)\n
    • 13 boundu(10: hfact)\n
    • 14 fiooic\n
    • 15 fjprot\n
    • 16 rmajor\n
    • 17 bmxlim\n
    • 18 gammax\n
    • 19 boundl(16: dr_cs)\n
    • 20 t_burn_min\n
    • 21 not used\n
    • 22 cfactr (N.B. requires iavail=0)\n
    • 23 boundu(72: fipir)\n
    • 24 powfmax\n
    • 25 kappa\n
    • 26 triang\n
    • 27 tbrmin (for blktmodel > 0 only)\n
    • 28 bt\n
    • 29 radius_plasma_core_norm\n
    • 31 f_alpha_energy_confinement_min\n
    • 32 epsvmc\n
    • 33 ttarget\n
    • 34 qtargettotal\n
    • 35 lambda_q_omp\n
    • 36 lambda_target\n
    • 37 lcon_factor\n
    • 38 Neon upper limit\n
    • 39 Argon upper limit\n
    • 40 Xenon upper limit\n
    • 41 dr_blkt_outboard\n
    • 42 Argon fraction fimp(9)\n
    • 43 normalised minor radius at which electron cyclotron current drive is maximum\n
    • 44 Allowable maximum shear stress (Tresca) in tf coil structural material\n
    • 45 Minimum allowable temperature margin ; tf coils\n
    • 46 boundu(150) fgwsep\n
    • 47 impurity_enrichment(9) Argon impurity enrichment\n
    • 48 TF coil - n_pancake (integer turn winding pack)\n
    • 49 TF coil - n_layer (integer turn winding pack)\n
    • 50 Xenon fraction fimp(13)\n
    • 51 Power fraction to lower DN Divertor ftar\n
    • 52 SoL radiation fraction\n
    • 54 GL_nbti upper critical field at 0 Kelvin\n
    • 55 `dr_shld_inboard` : Inboard neutron shield thickness\n
    • 56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n
    • 57 `bt` lower boundary\n
    • 58 `dr_fw_plasma_gap_inboard` : Inboard plasma-first wall gap\n
    • 59 `dr_fw_plasma_gap_outboard` : Outboard plasma-first wall gap\n
    • 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n
    • 61 copperaoh_m2_max : CS coil current / copper area\n
    • 62 j_cs_flat_top_end : CS coil current density at EOF\n
    • 63 dr_cs : CS thickness (m)\n
    • 64 f_z_cs_tf_internal : CS height (m)
    ", "nsweep_2": "nsweep_2 /3/ : switch denoting quantity to scan for 2D scan:", "nt": "", "ntype": "switch for vacuum pump type:\n
      \n
    • =0 - for turbomolecular pump (magnetic bearing) with speed of 2.0 m3/s\n (1.95 for N2, 1.8 for He, 1.8 for DT)
      • \n
    • =1 - for compound cryopump with nominal speed of 10.0 m3/s\n (9.0 for N2, 5.0 for He and 25.0 for DT)
      • \n
    ", @@ -11711,7 +11711,7 @@ "lb": 1, "ub": 3 }, - "bootstrap_current_fraction_max": { + "f_c_plasma_bootstrap_max": { "lb": -0.999, "ub": 0.999 }, @@ -17608,7 +17608,7 @@ "beamwd", "bigq", "bootipf", - "bootstrap_current_fraction_max", + "f_c_plasma_bootstrap_max", "f_c_plasma_bootstrap_iter89", "f_c_plasma_bootstrap_nevins", "f_c_plasma_bootstrap_sauter", @@ -19702,7 +19702,7 @@ "1": "aspect", "10": "boundu(15)", "11": "beta_norm_max", - "12": "bootstrap_current_fraction_max", + "12": "f_c_plasma_bootstrap_max", "13": "boundu(10)", "14": "fiooic", "15": "fjprot", @@ -19857,7 +19857,7 @@ "breeder_f": "real_variable", "breeder_multiplier": "real_variable", "breedmat": "int_variable", - "bootstrap_current_fraction_max": "real_variable", + "f_c_plasma_bootstrap_max": "real_variable", "bt": "real_variable", "cable_helium_fraction": "real_variable", "casthi": "real_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 7dd33e7f58..b3702b8ff7 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -453,7 +453,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 8cdaed3ae1..fa1eac2969 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -435,7 +435,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 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 061495861f..0cd2dae22b 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -160,7 +160,7 @@ output_costs = 1 * Switch for costs output; *-------------Current Drive Variables--------------* -bootstrap_current_fraction_max = 0.95 * maximum fraction of plasma current from bootstrap; if `bootstrap_current_fraction_max < 0`; +f_c_plasma_bootstrap_max = 0.95 * maximum fraction of plasma current from bootstrap; if `f_c_plasma_bootstrap_max < 0`; eta_ecrh_injector_wall_plug = 0.5 * ECH wall plug to injector efficiency gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) i_hcd_primary = 10 * Switch for current drive efficiency model; 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 fe1a7c0c38..70bcdbaf2f 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -194,7 +194,7 @@ output_costs = 1 * Switch for costs output; *-------------Current Drive Variables--------------* -bootstrap_current_fraction_max = 0.9 * maximum fraction of plasma current from bootstrap; if `bootstrap_current_fraction_max < 0`; +f_c_plasma_bootstrap_max = 0.9 * maximum fraction of plasma current from bootstrap; if `f_c_plasma_bootstrap_max < 0`; harnum = 2 * cyclotron harmonic frequency number; used in cut-off function wave_mode = 0 * Switch for ECRH wave mode ; eta_ecrh_injector_wall_plug = 0.45 * ECH wall plug to injector efficiency diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 63c13270e9..d29d2a2cab 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2865,7 +2865,7 @@ eta_ecrh_injector_wall_plug = 0.45 * Bootstrap Current * *-------------------* -bootstrap_current_fraction_max = 0.9 +f_c_plasma_bootstrap_max = 0.9 * DESCRIPTION: Maximum Fraction of Plasma Current from Bootstrap * JUSTIFICATION: upper limit set for plasma stability * diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 10631ee26c..2217529b0a 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -451,7 +451,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index baf4fa1880..49e56434cf 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -530,7 +530,7 @@ Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 4.7098E+00 - Maximum_Allowed_Bootstrap_current_fraction______________________________ (bootstrap_current_fraction_max)_____________________ 9.5000E-01 + Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0141E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.2041E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6799E-02 OP @@ -1642,7 +1642,7 @@ t_precharge = 500.0 *---------------* * Maximum fraction of plasma current from bootstrap -bootstrap_current_fraction_max = 0.95 +f_c_plasma_bootstrap_max = 0.95 * Switch for current drive efficiency model i_hcd_primary = 10 diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index ed5f83db5d..e9a77e2357 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -95,7 +95,7 @@ class CudrivParam(NamedTuple): bootstrap_current_fraction: Any = None - bootstrap_current_fraction_max: Any = None + f_c_plasma_bootstrap_max: Any = None n_beam_decay_lengths_core: Any = None @@ -240,7 +240,7 @@ class CudrivParam(NamedTuple): pinjimw=0, bigq=0, bootstrap_current_fraction=0.27635918746616817, - bootstrap_current_fraction_max=0.95000000000000007, + f_c_plasma_bootstrap_max=0.95000000000000007, n_beam_decay_lengths_core=0, p_hcd_injected_max=200, dx_beam_shield=0.5, @@ -330,7 +330,7 @@ class CudrivParam(NamedTuple): pinjimw=0, bigq=0, bootstrap_current_fraction=0.27635918746616817, - bootstrap_current_fraction_max=0.95000000000000007, + f_c_plasma_bootstrap_max=0.95000000000000007, n_beam_decay_lengths_core=0, p_hcd_injected_max=200, dx_beam_shield=0.5, @@ -516,8 +516,8 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr( current_drive_variables, - "bootstrap_current_fraction_max", - cudrivparam.bootstrap_current_fraction_max, + "f_c_plasma_bootstrap_max", + cudrivparam.f_c_plasma_bootstrap_max, ) monkeypatch.setattr( From d678f9cff3c30633fba0b6c32cf56a95a5bfac71 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 11:10:22 +0100 Subject: [PATCH 28/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20bootstrap=5Fcurre?= =?UTF-8?q?nt=5Ffraction=20to=20f=5Fc=5Fplasma=5Fbootstrap=20for=20clarity?= =?UTF-8?q?=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plasma_current/bootstrap_current.md | 2 +- process/current_drive.py | 6 +-- process/io/mfile_comparison.py | 6 +-- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 10 ++--- process/io/variable_metadata.py | 2 +- process/physics.py | 38 +++++++++---------- source/fortran/current_drive_variables.f90 | 2 +- tests/unit/test_current_drive.py | 10 ++--- tests/unit/test_physics.py | 4 +- tracking/tracking_data.py | 2 +- 11 files changed, 42 insertions(+), 42 deletions(-) diff --git a/documentation/proc-pages/physics-models/plasma_current/bootstrap_current.md b/documentation/proc-pages/physics-models/plasma_current/bootstrap_current.md index d76c4bcbe4..0d6baa5b99 100644 --- a/documentation/proc-pages/physics-models/plasma_current/bootstrap_current.md +++ b/documentation/proc-pages/physics-models/plasma_current/bootstrap_current.md @@ -695,7 +695,7 @@ $$ ## Setting of maximum desirable bootstrap current fraction -The variable `f_c_plasma_bootstrap_max` can be set to the value of maximum desirable bootstrap current fraction for a specific design. When optimising if the value of the calculated `bootstrap_current_fraction` for the model selected with `i_bootstrap_current` exceeds this value, then `bootstrap_current_fraction` is set to the value of `f_c_plasma_bootstrap_max`. +The variable `f_c_plasma_bootstrap_max` can be set to the value of maximum desirable bootstrap current fraction for a specific design. When optimising if the value of the calculated `f_c_plasma_bootstrap` for the model selected with `i_bootstrap_current` exceeds this value, then `f_c_plasma_bootstrap` is set to the value of `f_c_plasma_bootstrap_max`. An error is also raised to the user in the terminal output at the end of the run saying "Bootstrap fraction upper limit enforced". diff --git a/process/current_drive.py b/process/current_drive.py index 1adcaa3a3b..7757648df8 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -947,8 +947,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Bootstrap fraction", - "(bootstrap_current_fraction)", - current_drive_variables.bootstrap_current_fraction, + "(f_c_plasma_bootstrap)", + current_drive_variables.f_c_plasma_bootstrap, "OP ", ) po.ovarrf( @@ -1009,7 +1009,7 @@ def cudriv(self, output: bool): if ( abs( - current_drive_variables.bootstrap_current_fraction + current_drive_variables.f_c_plasma_bootstrap - current_drive_variables.f_c_plasma_bootstrap_max ) < 1.0e-8 diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index e530840a3e..77eb04093a 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -85,7 +85,7 @@ "pnucshld", "pdivt", "pheat", - "bootstrap_current_fraction", + "f_c_plasma_bootstrap", "aux_current_fraction", "inductive_current_fraction", "gamnb", @@ -174,7 +174,7 @@ "pnetelmw", "p_hcd_injected_total_mw", "pheat", - "bootstrap_current_fraction", + "f_c_plasma_bootstrap", "aux_current_fraction", "inductive_current_fraction", "gamnb", @@ -230,7 +230,7 @@ "f_nd_alpha_electron", "p_plasma_inner_rad_mw", "p_plasma_rad_mw", - "bootstrap_current_fraction", + "f_c_plasma_bootstrap", "pdivmax_over_rmajor", "fimp(14", "etath", diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index fcb0125e33..4bf7a093b2 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -123,7 +123,7 @@ "idia": "i_diamagnetic_current", "ibss": "i_bootstrap_current", "ips": "i_pfirsch_schluter_current", - "bootipf": "bootstrap_current_fraction", + "bootipf": "f_c_plasma_bootstrap", "bscfmax": "f_c_plasma_bootstrap_max", "vgap2": "dz_shld_vv_gap", "vgap": "dz_xpoint_divertor", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 9ce168d197..7c7c96ac16 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3124,7 +3124,7 @@ def plot_current_drive_info(axis, mfile_data, scan): data = [ (pinjie, "Steady state auxiliary power", "MW"), ("pheat", "Power for heating only", "MW"), - ("bootstrap_current_fraction", "Bootstrap fraction", ""), + ("f_c_plasma_bootstrap", "Bootstrap fraction", ""), ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"), @@ -3154,7 +3154,7 @@ def plot_current_drive_info(axis, mfile_data, scan): data = [ (pinjie, "Steady state auxiliary power", "MW"), ("pheat", "Power for heating only", "MW"), - ("bootstrap_current_fraction", "Bootstrap fraction", ""), + ("f_c_plasma_bootstrap", "Bootstrap fraction", ""), ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), ("gamnb", "NB gamma", "$10^{20}$ A W$^{-1}$ m$^{-2}$"), @@ -3180,7 +3180,7 @@ def plot_current_drive_info(axis, mfile_data, scan): data = [ (pinjie, "Steady state auxiliary power", "MW"), ("pheat", "Power for heating only", "MW"), - ("bootstrap_current_fraction", "Bootstrap fraction", ""), + ("f_c_plasma_bootstrap", "Bootstrap fraction", ""), ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"), @@ -3209,7 +3209,7 @@ def plot_current_drive_info(axis, mfile_data, scan): data = [ (pinjie, "Steady state auxiliary power", "MW"), ("pheat", "Power for heating only", "MW"), - ("bootstrap_current_fraction", "Bootstrap fraction", ""), + ("f_c_plasma_bootstrap", "Bootstrap fraction", ""), ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"), @@ -3238,7 +3238,7 @@ def plot_current_drive_info(axis, mfile_data, scan): data = [ (pinjie, "Steady state auxiliary power", "MW"), ("pheat", "Power for heating only", "MW"), - ("bootstrap_current_fraction", "Bootstrap fraction", ""), + ("f_c_plasma_bootstrap", "Bootstrap fraction", ""), ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"), diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 50a0ba24bc..dc6fc3b665 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -238,7 +238,7 @@ class VariableMetadata: "inductive_current_fraction": VariableMetadata( latex=r"$f_{\mathrm{CD,ind}}$", description="Inductive CD factor", units="" ), - "bootstrap_current_fraction": VariableMetadata( + "f_c_plasma_bootstrap": VariableMetadata( latex=r"$f_{\mathrm{BS}}$", description="Bootstrap current fraction", units="" ), "pdivt": VariableMetadata( diff --git a/process/physics.py b/process/physics.py index 6c99af46ce..4252c43cf8 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1935,57 +1935,57 @@ def physics(self): ) if current_drive_variables.f_c_plasma_bootstrap_max < 0.0e0: - current_drive_variables.bootstrap_current_fraction = abs( + current_drive_variables.f_c_plasma_bootstrap = abs( current_drive_variables.f_c_plasma_bootstrap_max ) current_drive_variables.plasma_current_internal_fraction = ( - current_drive_variables.bootstrap_current_fraction + current_drive_variables.f_c_plasma_bootstrap ) else: if physics_variables.i_bootstrap_current == 1: - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.f_c_plasma_bootstrap_iter89 ) elif physics_variables.i_bootstrap_current == 2: - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.f_c_plasma_bootstrap_nevins ) elif physics_variables.i_bootstrap_current == 3: - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.f_c_plasma_bootstrap_wilson ) elif physics_variables.i_bootstrap_current == 4: - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.f_c_plasma_bootstrap_sauter ) elif physics_variables.i_bootstrap_current == 5: # Sakai states that the ACCOME dataset used has the toridal diamagnetic current included in the bootstrap current # So the diamagnetic current calculation should be turned off when using, (i_diamagnetic_current = 0). - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.f_c_plasma_bootstrap_sakai ) elif physics_variables.i_bootstrap_current == 6: - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.f_c_plasma_bootstrap_aries ) elif physics_variables.i_bootstrap_current == 7: - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.f_c_plasma_bootstrap_andrade ) elif physics_variables.i_bootstrap_current == 8: - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.f_c_plasma_bootstrap_hoang ) elif physics_variables.i_bootstrap_current == 9: - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.f_c_plasma_bootstrap_wong ) elif physics_variables.i_bootstrap_current == 10: - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.bscf_gi_I ) elif physics_variables.i_bootstrap_current == 11: - current_drive_variables.bootstrap_current_fraction = ( + current_drive_variables.f_c_plasma_bootstrap = ( current_drive_variables.bscf_gi_II ) else: @@ -1996,17 +1996,17 @@ def physics(self): physics_module.err242 = 0 if ( - current_drive_variables.bootstrap_current_fraction + current_drive_variables.f_c_plasma_bootstrap > current_drive_variables.f_c_plasma_bootstrap_max ): - current_drive_variables.bootstrap_current_fraction = min( - current_drive_variables.bootstrap_current_fraction, + current_drive_variables.f_c_plasma_bootstrap = min( + current_drive_variables.f_c_plasma_bootstrap, current_drive_variables.f_c_plasma_bootstrap_max, ) physics_module.err242 = 1 current_drive_variables.plasma_current_internal_fraction = ( - current_drive_variables.bootstrap_current_fraction + current_drive_variables.f_c_plasma_bootstrap + current_drive_variables.diamagnetic_current_fraction + current_drive_variables.f_c_plasma_pfirsch_schluter ) @@ -5850,8 +5850,8 @@ def outplas(self): po.ovarrf( self.outfile, "Bootstrap fraction (enforced)", - "(bootstrap_current_fraction.)", - current_drive_variables.bootstrap_current_fraction, + "(f_c_plasma_bootstrap.)", + current_drive_variables.f_c_plasma_bootstrap, "OP ", ) po.ovarrf( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 8fc7eaa2d9..734f8837de 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -23,7 +23,7 @@ module current_drive_variables real(dp) :: bigq !! Fusion gain; P_fusion / (P_injection + P_ohmic) - real(dp) :: bootstrap_current_fraction + real(dp) :: f_c_plasma_bootstrap !! bootstrap current fraction (enforced; see i_bootstrap_current) real(dp) :: f_c_plasma_bootstrap_max diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index e9a77e2357..ba462ae89b 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -93,7 +93,7 @@ class CudrivParam(NamedTuple): bigq: Any = None - bootstrap_current_fraction: Any = None + f_c_plasma_bootstrap: Any = None f_c_plasma_bootstrap_max: Any = None @@ -239,7 +239,7 @@ class CudrivParam(NamedTuple): pinjemw=0, pinjimw=0, bigq=0, - bootstrap_current_fraction=0.27635918746616817, + f_c_plasma_bootstrap=0.27635918746616817, f_c_plasma_bootstrap_max=0.95000000000000007, n_beam_decay_lengths_core=0, p_hcd_injected_max=200, @@ -329,7 +329,7 @@ class CudrivParam(NamedTuple): pinjemw=120.49600019005746, pinjimw=0, bigq=0, - bootstrap_current_fraction=0.27635918746616817, + f_c_plasma_bootstrap=0.27635918746616817, f_c_plasma_bootstrap_max=0.95000000000000007, n_beam_decay_lengths_core=0, p_hcd_injected_max=200, @@ -510,8 +510,8 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr( current_drive_variables, - "bootstrap_current_fraction", - cudrivparam.bootstrap_current_fraction, + "f_c_plasma_bootstrap", + cudrivparam.f_c_plasma_bootstrap, ) monkeypatch.setattr( diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 9eab4792a3..0091d5d8be 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -125,7 +125,7 @@ def test_bootstrap_fraction_iter89(bootstrapfractioniter89param, physics): :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - bootstrap_current_fraction = physics.bootstrap_fraction_iter89( + f_c_plasma_bootstrap = physics.bootstrap_fraction_iter89( aspect=bootstrapfractioniter89param.aspect, beta=bootstrapfractioniter89param.beta, bt=bootstrapfractioniter89param.bt, @@ -136,7 +136,7 @@ def test_bootstrap_fraction_iter89(bootstrapfractioniter89param, physics): vol_plasma=bootstrapfractioniter89param.vol_plasma, ) - assert bootstrap_current_fraction == pytest.approx( + assert f_c_plasma_bootstrap == pytest.approx( bootstrapfractioniter89param.expected_bootipf ) diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index b77074471e..3a99f1a36c 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -91,7 +91,7 @@ class ProcessTracker: tracking_variables: ClassVar = { "pheat", - "bootstrap_current_fraction", + "f_c_plasma_bootstrap", "p_hcd_injected_total_mw", "dr_shld_inboard", "dr_fw_inboard", From 6364ea06221abac70ffafcb2dae3342bbbc85da8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 14:41:34 +0100 Subject: [PATCH 29/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20beam=5Fcurrent=20?= =?UTF-8?q?to=20c=5Fbeam=5Ftotal=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fusion_reactions/beam_reactions.md | 2 +- process/current_drive.py | 8 ++++---- process/fusion_reactions.py | 14 +++++++------- process/physics.py | 4 ++-- process/stellarator.py | 10 +++++----- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_current_drive.py | 8 ++++---- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md b/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md index f1ef3da249..b470ffc8aa 100644 --- a/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md +++ b/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md @@ -4,7 +4,7 @@ The main function called for calculating the fusion reactions produced by neutra Due to the small contribution of fusion power from the neutral beams only D-T reactions are taken into account, as D-D additions to fusion power are deemed to be negligible. The beam fusion calculations will only run if the calculated beam current is greater than 0. This is done by having a NBI heating and current drive configuration. -The NBI parameters taken from the current drive module to be used in the beam fusion calculations are the beam current (`beam_current`), beam energy (`beam_energy`) and the tritium component of the beam (`f_tritium_beam`). +The NBI parameters taken from the current drive module to be used in the beam fusion calculations are the beam current (`c_beam_total`), beam energy (`beam_energy`) and the tritium component of the beam (`f_tritium_beam`). Please see the [H&CD section](../../eng-models/heating_and_current_drive/heating-and-current-drive.md) of the docs for more info. diff --git a/process/current_drive.py b/process/current_drive.py index 7757648df8..6ec585030a 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -35,7 +35,7 @@ def cudriv(self, output: bool): current_drive_variables.echpwr = 0.0e0 current_drive_variables.pnbeam = 0.0e0 current_drive_variables.plhybd = 0.0e0 - current_drive_variables.beam_current = 0.0e0 + current_drive_variables.c_beam_total = 0.0e0 beam_current_fix = 0.0e0 current_drive_variables.p_beam_orbit_loss = 0.0e0 porbitlossmwfix = 0.0e0 @@ -692,7 +692,7 @@ def cudriv(self, output: bool): ) gamnb = effnbss * (dene20 * physics_variables.rmajor) current_drive_variables.gamcd = gamnb - current_drive_variables.beam_current = ( + current_drive_variables.c_beam_total = ( 1.0e-3 * (current_drive_variables.p_beam_injected * 1.0e6) / current_drive_variables.beam_energy @@ -1063,8 +1063,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Neutral beam current (A)", - "(beam_current)", - current_drive_variables.beam_current, + "(c_beam_total)", + current_drive_variables.c_beam_total, "OP ", ) diff --git a/process/fusion_reactions.py b/process/fusion_reactions.py index 4ec13a8f0b..0676c53890 100644 --- a/process/fusion_reactions.py +++ b/process/fusion_reactions.py @@ -794,7 +794,7 @@ def beam_fusion( betbm0: float, bp: float, bt: float, - beam_current: float, + c_beam_total: float, dene: float, nd_fuel_ions: float, ion_electron_coulomb_log: float, @@ -819,7 +819,7 @@ def beam_fusion( betbm0 (float): Leading coefficient for neutral beam beta fraction. bp (float): Poloidal field (T). bt (float): Toroidal field on axis (T). - beam_current (float): Neutral beam current (A). + c_beam_total (float): Neutral beam current (A). dene (float): Electron density (m^-3). nd_fuel_ions (float): Fuel ion density (m^-3). ion_electron_coulomb_log (float): Ion-electron coulomb logarithm. @@ -902,7 +902,7 @@ def beam_fusion( critical_energy_tritium, beam_slow_time, f_tritium_beam, - beam_current, + c_beam_total, tin, vol_plasma, sigmav_dt_average, @@ -934,7 +934,7 @@ def beamcalc( critical_energy_tritium: float, beam_slow_time: float, f_tritium_beam: float, - beam_current: float, + c_beam_total: float, ti: float, vol_plasma: float, svdt: float, @@ -954,7 +954,7 @@ def beamcalc( critical_energy_tritium (float): Critical energy for beam slowing down (tritium neutral beam) (keV). beam_slow_time (float): Beam ion slowing down time on electrons (s). f_tritium_beam (float): Beam tritium fraction (0.0 = deuterium beam). - beam_current (float): Beam current (A). + c_beam_total (float): Beam current (A). ti (float): Thermal ion temperature (keV). vol_plasma (float): Plasma volume (m^3). svdt (float): Profile averaged for D-T (m^3/s). @@ -990,8 +990,8 @@ def beamcalc( """ # D and T beam current fractions - beam_current_deuterium = beam_current * (1.0 - f_tritium_beam) - beam_current_tritium = beam_current * f_tritium_beam + beam_current_deuterium = c_beam_total * (1.0 - f_tritium_beam) + beam_current_tritium = c_beam_total * f_tritium_beam # At a critical energy the rate of loss to the ions becomes equal to that to the electrons, # and at lower energies the loss to the ions predominates. diff --git a/process/physics.py b/process/physics.py index 4252c43cf8..4e32b458b3 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2067,7 +2067,7 @@ def physics(self): # Calculate neutral beam slowing down effects # If ignited, then ignore beam fusion effects - if (current_drive_variables.beam_current != 0.0e0) and ( + if (current_drive_variables.c_beam_total != 0.0e0) and ( physics_variables.ignite == 0 ): ( @@ -2079,7 +2079,7 @@ def physics(self): physics_variables.betbm0, physics_variables.bp, physics_variables.bt, - current_drive_variables.beam_current, + current_drive_variables.c_beam_total, physics_variables.dene, physics_variables.nd_fuel_ions, physics_variables.dlamie, diff --git a/process/stellarator.py b/process/stellarator.py index 5255c0c136..72f9ddd1cd 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4227,7 +4227,7 @@ def stphys(self, output): physics_variables.betbm0, physics_variables.bp, physics_variables.bt, - current_drive_variables.beam_current, + current_drive_variables.c_beam_total, physics_variables.dene, physics_variables.nd_fuel_ions, physics_variables.dlamie, @@ -4999,13 +4999,13 @@ def stheat(self, output: bool): # Calculate neutral beam current if abs(current_drive_variables.pnbeam) > 1e-8: - current_drive_variables.beam_current = ( + current_drive_variables.c_beam_total = ( 1e-3 * (current_drive_variables.pnbeam * 1e6) / current_drive_variables.beam_energy ) else: - current_drive_variables.beam_current = 0 + current_drive_variables.c_beam_total = 0 # Ratio of fusion to input (injection+ohmic) power @@ -5066,8 +5066,8 @@ def stheat(self, output: bool): po.ovarre( self.outfile, "Neutral beam current (A)", - "(beam_current)", - current_drive_variables.beam_current, + "(c_beam_total)", + current_drive_variables.c_beam_total, ) po.ovarre( self.outfile, diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 734f8837de..822fbbe6a8 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -66,7 +66,7 @@ module current_drive_variables real(dp) :: cboot !! bootstrap current fraction multiplier - real(dp) :: beam_current + real(dp) :: c_beam_total !! neutral beam current (A) real(dp) :: diacf_hender diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 03082cd69f..26fbe1c3c8 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1451,7 +1451,7 @@ "clh2": 15.0, "f_z_cryostat": 4.268, "cm": null, - "beam_current": 0.0, + "c_beam_total": 0.0, "cnorm": null, "coe": 0.0, "coecap": 0.0, @@ -9079,7 +9079,7 @@ "clh2": "clearance beneath TF coil to foundation (including basement) (m)", "f_z_cryostat": "cryostat lid height scaling factor (tokamaks)", "cm": "", - "beam_current": "neutral beam current (A)", + "c_beam_total": "neutral beam current (A)", "cnorm": "", "coe": "cost of electricity ($/MW-hr)", "coecap": "capital cost of electricity (m$/kW-hr)", @@ -17621,7 +17621,7 @@ "bscf_gi_I", "bscf_gi_II", "cboot", - "beam_current", + "c_beam_total", "diacf_hender", "diacf_scene", "diaipf", diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index ba462ae89b..94596defe4 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -33,7 +33,7 @@ class CudrivParam(NamedTuple): plhybd: Any = None - beam_current: Any = None + c_beam_total: Any = None p_beam_orbit_loss: Any = None @@ -209,7 +209,7 @@ class CudrivParam(NamedTuple): echpwr=0, pnbeam=0, plhybd=0, - beam_current=0, + c_beam_total=0, p_beam_orbit_loss=0, i_hcd_primary=10, i_hcd_secondary=0, @@ -299,7 +299,7 @@ class CudrivParam(NamedTuple): echpwr=120.49600019005746, pnbeam=0, plhybd=0, - beam_current=0, + c_beam_total=0, p_beam_orbit_loss=0, i_hcd_primary=10, i_hcd_secondary=0, @@ -409,7 +409,7 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "plhybd", cudrivparam.plhybd) monkeypatch.setattr( - current_drive_variables, "beam_current", cudrivparam.beam_current + current_drive_variables, "c_beam_total", cudrivparam.c_beam_total ) monkeypatch.setattr( From 4d0702a874546c69ddb6de50a9776fb73d5889d1 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 14:42:53 +0100 Subject: [PATCH 30/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20diacf=5Fhender=20?= =?UTF-8?q?to=20f=5Fc=5Fplasma=5Fdiamagnetic=5Fhender=20for=20clarity=20an?= =?UTF-8?q?d=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/physics.py | 8 ++--- source/fortran/current_drive_variables.f90 | 2 +- .../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 +- 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 0516d82e0e..850e1e1689 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -515,7 +515,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1436E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4713E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3036E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2877E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2877E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1680E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2449E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1436E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 3f155f47c4..6204ce4e34 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -511,7 +511,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 3170fd4f24..a9cb047069 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -511,7 +511,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index bfd6eac552..2d28e8d0d2 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -511,7 +511,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 87697a1faf..7b2428a0e4 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -511,7 +511,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index d19d65fbc7..c907ae34a9 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -368,7 +368,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -1363,7 +1363,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -2358,7 +2358,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -3353,7 +3353,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -4348,7 +4348,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -5343,7 +5343,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -6338,7 +6338,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -7333,7 +7333,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -8328,7 +8328,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 diff --git a/process/physics.py b/process/physics.py index 4e32b458b3..2459d54124 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1766,7 +1766,7 @@ def physics(self): # ***************************** # # Hender scaling for diamagnetic current at tight physics_variables.aspect ratio - current_drive_variables.diacf_hender = diamagnetic_fraction_hender( + current_drive_variables.f_c_plasma_diamagnetic_hender = diamagnetic_fraction_hender( physics_variables.beta ) @@ -1777,7 +1777,7 @@ def physics(self): if physics_variables.i_diamagnetic_current == 1: current_drive_variables.diamagnetic_current_fraction = ( - current_drive_variables.diacf_hender + current_drive_variables.f_c_plasma_diamagnetic_hender ) elif physics_variables.i_diamagnetic_current == 2: current_drive_variables.diamagnetic_current_fraction = ( @@ -5736,8 +5736,8 @@ def outplas(self): po.ovarrf( self.outfile, "Diamagnetic fraction (Hender)", - "(diacf_hender)", - current_drive_variables.diacf_hender, + "(f_c_plasma_diamagnetic_hender)", + current_drive_variables.f_c_plasma_diamagnetic_hender, "OP ", ) po.ovarrf( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 822fbbe6a8..d21b326888 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -69,7 +69,7 @@ module current_drive_variables real(dp) :: c_beam_total !! neutral beam current (A) - real(dp) :: diacf_hender + real(dp) :: f_c_plasma_diamagnetic_hender !! diamagnetic current fraction, Hender fit real(dp) :: diacf_scene diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 22429fbf77..a6feed080b 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -510,7 +510,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 8b1b00c1cd..c561ab6091 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -511,7 +511,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 5220a556a6..31abca5300 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -511,7 +511,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 156f6a207b..b93184d82d 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -511,7 +511,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1920E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2017E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b618f5858d..b2695aed05 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -508,7 +508,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2290E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5275E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3666E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.1803E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.1803E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1022E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.9744E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2290E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index e83688543a..45cf755b45 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -513,7 +513,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1061E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4049E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2523E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2084E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2084E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1130E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0453E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1061E-01 @@ -1676,7 +1676,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1146E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4347E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2711E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2599E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2599E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1485E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1749E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1146E-01 @@ -2839,7 +2839,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1238E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4650E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2922E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3125E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3125E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1846E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3075E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1238E-01 @@ -4002,7 +4002,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1715E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5110E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3397E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3186E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3186E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1924E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3228E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1715E-01 @@ -5165,7 +5165,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1531E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4765E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3114E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2692E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2692E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1579E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1983E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1531E-01 @@ -6328,7 +6328,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1452E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4491E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2936E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2193E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2193E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1237E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0727E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1452E-01 @@ -7491,7 +7491,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.1915E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4941E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3402E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2251E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2251E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1312E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0874E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1915E-01 @@ -8654,7 +8654,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2074E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5274E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3660E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2733E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2733E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1649E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2087E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2074E-01 @@ -9817,7 +9817,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2337E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5672E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4013E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3209E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3209E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1989E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3286E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2337E-01 @@ -10980,7 +10980,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2713E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.6076E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4400E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3304E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3304E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.2082E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3525E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2713E-01 @@ -12143,7 +12143,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2391E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5644E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4000E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2839E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2839E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1746E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2353E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2391E-01 @@ -13306,7 +13306,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2221E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5307E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3736E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2358E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2358E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1408E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1141E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2221E-01 @@ -14469,7 +14469,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2611E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5714E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4135E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2439E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2439E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1493E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1347E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2611E-01 @@ -15632,7 +15632,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2685E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5999E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4312E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.2956E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2956E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1848E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2650E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2685E-01 @@ -16795,7 +16795,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2763E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.6295E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4499E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.3506E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3506E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.2222E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.4036E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2763E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 92f1107d19..93316f2f4e 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -368,7 +368,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -1363,7 +1363,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -2358,7 +2358,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -3353,7 +3353,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -4348,7 +4348,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -5343,7 +5343,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -6338,7 +6338,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -7333,7 +7333,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 @@ -8328,7 +8328,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 3.8470E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.0963E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 26fbe1c3c8..903f8665cc 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1623,7 +1623,7 @@ "dg": null, "dh_tf_inner_bore": 0.0, "dhecoil": 0.005, - "diacf_hender": 0.0, + "f_c_plasma_diamagnetic_hender": 0.0, "diacf_scene": 0.0, "diaipf": 0.0, "dintrt": 0.0, @@ -9240,7 +9240,7 @@ "dg": "", "dh_tf_inner_bore": "TF coil vertical inner dr_bore (m)", "dhecoil": "diameter of central helium channel in TF winding (m)", - "diacf_hender": "diamagnetic current fraction, Hender fit", + "f_c_plasma_diamagnetic_hender": "diamagnetic current fraction, Hender fit", "diacf_scene": "diamagnetic current fraction, SCENE fit", "diaipf": "diamagnetic current fraction", "dintrt": "diff between borrowing and saving interest rates", @@ -17622,7 +17622,7 @@ "bscf_gi_II", "cboot", "c_beam_total", - "diacf_hender", + "f_c_plasma_diamagnetic_hender", "diacf_scene", "diaipf", "echpwr", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 49e56434cf..d3f5b205aa 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -508,7 +508,7 @@ Bootstrap_fraction_(Sauter_et_al)_______________________________________ (f_c_plasma_bootstrap_sauter)_________________ 4.2290E-01 Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5275E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3666E-01 - Diamagnetic_fraction_(Hender)___________________________________________ (diacf_hender)________________ 1.1803E-02 + Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.1803E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1022E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.9744E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2290E-01 From acd117eb1ce2a4e511dcf3d1066e983544616bee Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 14:43:51 +0100 Subject: [PATCH 31/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20diamagnetic=5Fcur?= =?UTF-8?q?rent=5Ffraction=20to=20f=5Fc=5Fplasma=5Fdiamagnetic=20for=20cla?= =?UTF-8?q?rity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 4 ++-- process/physics.py | 14 +++++++------- source/fortran/current_drive_variables.f90 | 2 +- tests/unit/test_current_drive.py | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index 6ec585030a..2ce831fda1 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -954,8 +954,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Diamagnetic fraction", - "(diamagnetic_current_fraction)", - current_drive_variables.diamagnetic_current_fraction, + "(f_c_plasma_diamagnetic)", + current_drive_variables.f_c_plasma_diamagnetic, "OP ", ) po.ovarrf( diff --git a/process/physics.py b/process/physics.py index 2459d54124..eb06a07b58 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1766,8 +1766,8 @@ def physics(self): # ***************************** # # Hender scaling for diamagnetic current at tight physics_variables.aspect ratio - current_drive_variables.f_c_plasma_diamagnetic_hender = diamagnetic_fraction_hender( - physics_variables.beta + current_drive_variables.f_c_plasma_diamagnetic_hender = ( + diamagnetic_fraction_hender(physics_variables.beta) ) # SCENE scaling for diamagnetic current @@ -1776,11 +1776,11 @@ def physics(self): ) if physics_variables.i_diamagnetic_current == 1: - current_drive_variables.diamagnetic_current_fraction = ( + current_drive_variables.f_c_plasma_diamagnetic = ( current_drive_variables.f_c_plasma_diamagnetic_hender ) elif physics_variables.i_diamagnetic_current == 2: - current_drive_variables.diamagnetic_current_fraction = ( + current_drive_variables.f_c_plasma_diamagnetic = ( current_drive_variables.diacf_scene ) @@ -2007,7 +2007,7 @@ def physics(self): current_drive_variables.plasma_current_internal_fraction = ( current_drive_variables.f_c_plasma_bootstrap - + current_drive_variables.diamagnetic_current_fraction + + current_drive_variables.f_c_plasma_diamagnetic + current_drive_variables.f_c_plasma_pfirsch_schluter ) @@ -5857,8 +5857,8 @@ def outplas(self): po.ovarrf( self.outfile, "Diamagnetic fraction (enforced)", - "(diamagnetic_current_fraction.)", - current_drive_variables.diamagnetic_current_fraction, + "(f_c_plasma_diamagnetic.)", + current_drive_variables.f_c_plasma_diamagnetic, "OP ", ) po.ovarrf( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index d21b326888..d75714bd9d 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -75,7 +75,7 @@ module current_drive_variables real(dp) :: diacf_scene !! diamagnetic current fraction, SCENE fit - real(dp) :: diamagnetic_current_fraction + real(dp) :: f_c_plasma_diamagnetic !! diamagnetic current fraction real(dp) :: echpwr diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 94596defe4..e2aec52b5e 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -109,7 +109,7 @@ class CudrivParam(NamedTuple): rtanmax: Any = None - diamagnetic_current_fraction: Any = None + f_c_plasma_diamagnetic: Any = None f_c_plasma_pfirsch_schluter: Any = None @@ -247,7 +247,7 @@ class CudrivParam(NamedTuple): frbeam=1.05, rtanbeam=0, rtanmax=0, - diamagnetic_current_fraction=0, + f_c_plasma_diamagnetic=0, f_c_plasma_pfirsch_schluter=0, plasma_current_internal_fraction=0.27635918746616817, harnum=1, @@ -337,7 +337,7 @@ class CudrivParam(NamedTuple): frbeam=1.05, rtanbeam=8.4000000000000004, rtanmax=13.179564451855533, - diamagnetic_current_fraction=0, + f_c_plasma_diamagnetic=0, f_c_plasma_pfirsch_schluter=0, plasma_current_internal_fraction=0.27635918746616817, harnum=1, @@ -542,8 +542,8 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr( current_drive_variables, - "diamagnetic_current_fraction", - cudrivparam.diamagnetic_current_fraction, + "f_c_plasma_diamagnetic", + cudrivparam.f_c_plasma_diamagnetic, ) monkeypatch.setattr( From 303ba3e8100e1815a42fe3ff175d6a95b8fcee46 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 14:44:48 +0100 Subject: [PATCH 32/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20diacf=5Fscene=20t?= =?UTF-8?q?o=20f=5Fc=5Fplasma=5Fdiamagnetic=5Fscene=20for=20clarity=20and?= =?UTF-8?q?=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/physics.py | 14 +++++---- source/fortran/current_drive_variables.f90 | 2 +- .../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 +- 17 files changed, 56 insertions(+), 54 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 850e1e1689..2d1c365cc3 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -516,7 +516,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4713E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3036E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2877E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1680E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1680E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2449E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1436E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 6204ce4e34..987c8eb29d 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -512,7 +512,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index a9cb047069..6e5580ed1d 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -512,7 +512,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 2d28e8d0d2..94013cdea5 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -512,7 +512,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 7b2428a0e4..1469445884 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -512,7 +512,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index c907ae34a9..86d08e36b0 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -369,7 +369,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -1364,7 +1364,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -2359,7 +2359,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -3354,7 +3354,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -4349,7 +4349,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -5344,7 +5344,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -6339,7 +6339,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -7334,7 +7334,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -8329,7 +8329,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/process/physics.py b/process/physics.py index eb06a07b58..52322265d8 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1771,8 +1771,10 @@ def physics(self): ) # SCENE scaling for diamagnetic current - current_drive_variables.diacf_scene = diamagnetic_fraction_scene( - physics_variables.beta, physics_variables.q95, physics_variables.q0 + current_drive_variables.f_c_plasma_diamagnetic_scene = ( + diamagnetic_fraction_scene( + physics_variables.beta, physics_variables.q95, physics_variables.q0 + ) ) if physics_variables.i_diamagnetic_current == 1: @@ -1781,7 +1783,7 @@ def physics(self): ) elif physics_variables.i_diamagnetic_current == 2: current_drive_variables.f_c_plasma_diamagnetic = ( - current_drive_variables.diacf_scene + current_drive_variables.f_c_plasma_diamagnetic_scene ) # ***************************** # @@ -5743,8 +5745,8 @@ def outplas(self): po.ovarrf( self.outfile, "Diamagnetic fraction (SCENE)", - "(diacf_scene)", - current_drive_variables.diacf_scene, + "(f_c_plasma_diamagnetic_scene)", + current_drive_variables.f_c_plasma_diamagnetic_scene, "OP ", ) po.ovarrf( @@ -5825,7 +5827,7 @@ def outplas(self): self.outfile, " (Diamagnetic current fraction not calculated)" ) # Error to show if diamagnetic current is above 1% but not used - if current_drive_variables.diacf_scene > 0.01e0: + if current_drive_variables.f_c_plasma_diamagnetic_scene > 0.01e0: error_handling.report_error(244) elif physics_variables.i_diamagnetic_current == 1: diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index d75714bd9d..a947748bfa 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -72,7 +72,7 @@ module current_drive_variables real(dp) :: f_c_plasma_diamagnetic_hender !! diamagnetic current fraction, Hender fit - real(dp) :: diacf_scene + real(dp) :: f_c_plasma_diamagnetic_scene !! diamagnetic current fraction, SCENE fit real(dp) :: f_c_plasma_diamagnetic diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index a6feed080b..e7482250b3 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -511,7 +511,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index c561ab6091..4da4402c72 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -512,7 +512,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 31abca5300..168327f74a 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -512,7 +512,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index b93184d82d..257926bbe4 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -512,7 +512,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5042E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1139E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b2695aed05..381be7c0df 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -509,7 +509,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5275E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3666E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.1803E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1022E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1022E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.9744E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2290E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 45cf755b45..176b53af5c 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -514,7 +514,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4049E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2523E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2084E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1130E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1130E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0453E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1061E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -1677,7 +1677,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4347E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2711E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2599E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1485E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1485E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1749E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1146E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -2840,7 +2840,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4650E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2922E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3125E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1846E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1846E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3075E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1238E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -4003,7 +4003,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5110E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3397E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3186E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1924E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1924E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3228E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1715E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -5166,7 +5166,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4765E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3114E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2692E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1579E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1579E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1983E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1531E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -6329,7 +6329,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4491E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2936E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2193E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1237E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1237E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0727E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1452E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -7492,7 +7492,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.4941E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3402E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2251E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1312E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1312E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0874E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1915E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -8655,7 +8655,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5274E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3660E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2733E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1649E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1649E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2087E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2074E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -9818,7 +9818,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5672E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4013E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3209E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1989E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1989E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3286E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2337E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -10981,7 +10981,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.6076E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4400E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3304E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.2082E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.2082E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3525E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2713E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -12144,7 +12144,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5644E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4000E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2839E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1746E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1746E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2353E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2391E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -13307,7 +13307,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5307E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3736E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2358E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1408E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1408E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1141E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2221E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -14470,7 +14470,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5714E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4135E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2439E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1493E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1493E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1347E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2611E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -15633,7 +15633,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5999E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4312E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2956E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1848E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1848E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2650E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2685E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -16796,7 +16796,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.6295E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4499E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3506E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.2222E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.2222E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.4036E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2763E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 93316f2f4e..96012a671f 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -369,7 +369,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -1364,7 +1364,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -2359,7 +2359,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -3354,7 +3354,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -4349,7 +4349,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -5344,7 +5344,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -6339,7 +6339,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -7334,7 +7334,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 @@ -8329,7 +8329,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5123E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.0040E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 903f8665cc..229b190355 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1624,7 +1624,7 @@ "dh_tf_inner_bore": 0.0, "dhecoil": 0.005, "f_c_plasma_diamagnetic_hender": 0.0, - "diacf_scene": 0.0, + "f_c_plasma_diamagnetic_scene": 0.0, "diaipf": 0.0, "dintrt": 0.0, "discount_rate": 0.0435, @@ -9241,7 +9241,7 @@ "dh_tf_inner_bore": "TF coil vertical inner dr_bore (m)", "dhecoil": "diameter of central helium channel in TF winding (m)", "f_c_plasma_diamagnetic_hender": "diamagnetic current fraction, Hender fit", - "diacf_scene": "diamagnetic current fraction, SCENE fit", + "f_c_plasma_diamagnetic_scene": "diamagnetic current fraction, SCENE fit", "diaipf": "diamagnetic current fraction", "dintrt": "diff between borrowing and saving interest rates", "discount_rate": "effective cost of money in constant dollars", @@ -17623,7 +17623,7 @@ "cboot", "c_beam_total", "f_c_plasma_diamagnetic_hender", - "diacf_scene", + "f_c_plasma_diamagnetic_scene", "diaipf", "echpwr", "echwpow", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index d3f5b205aa..c00ba8c726 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -509,7 +509,7 @@ Bootstrap_fraction_(Nevins_et_al)_______________________________________ (f_c_plasma_bootstrap_nevins)_________________ 3.5275E-01 Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3666E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.1803E-02 - Diamagnetic_fraction_(SCENE)____________________________________________ (diacf_scene)_________________ 1.1022E-02 + Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1022E-02 Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.9744E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2290E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 From 3913684b3c036d7a8e2cd1bae593cafd329fdcc6 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 14:45:57 +0100 Subject: [PATCH 33/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20beam=5Fenergy=20t?= =?UTF-8?q?o=20e=5Fbeam=5Fkev=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NBI/culham_nb.md | 4 +- .../fusion_reactions/beam_reactions.md | 2 +- process/current_drive.py | 26 ++++++------- process/fusion_reactions.py | 38 +++++++++---------- process/input.py | 2 +- process/io/mfile_comparison.py | 4 +- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 2 +- process/physics.py | 2 +- process/stellarator.py | 4 +- source/fortran/current_drive_variables.f90 | 2 +- source/fortran/numerics.f90 | 2 +- tests/integration/ref_dicts.json | 20 +++++----- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_current_drive.py | 8 ++-- 15 files changed, 60 insertions(+), 60 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md index c81d07c6c7..2aa5cb45f9 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md @@ -72,7 +72,7 @@ plus correction terms outlined in Culham Report AEA FUS 172. | $\mathtt{aspect}$, $A$ | aspect ratio | | $\mathtt{dene}$, $n_{\text{e}}$ | volume averaged electron density $(\text{m}^{-3})$ | | $\mathtt{dnla}$, $n_{\text{e,0}}$ | line averaged electron density $(\text{m}^{-3})$ | -| $\mathtt{beam_energy}$ | neutral beam energy $(\text{keV})$ | +| $\mathtt{e_beam_kev}$ | neutral beam energy $(\text{keV})$ | | $\mathtt{frbeam}$ | R_tangent / R_major for neutral beam injection | | $\mathtt{fshine}$ | shine-through fraction of beam | | $\mathtt{rmajor}$, $R$ | plasma major radius $(\text{m})$ | @@ -114,7 +114,7 @@ $$ Beam energy in MeV $$ -\mathtt{ebmev} = \frac{\mathtt{beam_energy}}{10^3} +\mathtt{ebmev} = \frac{\mathtt{e_beam_kev}}{10^3} $$ x and y coefficients of function J0(x,y) (IPDG89) diff --git a/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md b/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md index b470ffc8aa..8d6806b85c 100644 --- a/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md +++ b/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md @@ -4,7 +4,7 @@ The main function called for calculating the fusion reactions produced by neutra Due to the small contribution of fusion power from the neutral beams only D-T reactions are taken into account, as D-D additions to fusion power are deemed to be negligible. The beam fusion calculations will only run if the calculated beam current is greater than 0. This is done by having a NBI heating and current drive configuration. -The NBI parameters taken from the current drive module to be used in the beam fusion calculations are the beam current (`c_beam_total`), beam energy (`beam_energy`) and the tritium component of the beam (`f_tritium_beam`). +The NBI parameters taken from the current drive module to be used in the beam fusion calculations are the beam current (`c_beam_total`), beam energy (`e_beam_kev`) and the tritium component of the beam (`f_tritium_beam`). Please see the [H&CD section](../../eng-models/heating_and_current_drive/heating-and-current-drive.md) of the docs for more info. diff --git a/process/current_drive.py b/process/current_drive.py index 2ce831fda1..2080b87c46 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -360,7 +360,7 @@ def cudriv(self, output: bool): gamnb = effnbssfix * (dene20 * physics_variables.rmajor) gamcdfix = gamnb beam_current_fix = ( - 1.0e-3 * (pnbitotfix * 1.0e6) / current_drive_variables.beam_energy + 1.0e-3 * (pnbitotfix * 1.0e6) / current_drive_variables.e_beam_kev ) # Neutral beam current (A) auxiliary_cdfix = ( effnbssfix @@ -695,7 +695,7 @@ def cudriv(self, output: bool): current_drive_variables.c_beam_total = ( 1.0e-3 * (current_drive_variables.p_beam_injected * 1.0e6) - / current_drive_variables.beam_energy + / current_drive_variables.e_beam_kev ) # Neutral beam current (A) # Total injected power @@ -1054,8 +1054,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Neutral beam energy (keV)", - "(beam_energy)", - current_drive_variables.beam_energy, + "(e_beam_kev)", + current_drive_variables.e_beam_kev, ) if (current_drive_variables.i_hcd_primary == 5) or ( current_drive_variables.i_hcd_primary == 8 @@ -1337,7 +1337,7 @@ def iternb(self): # Calculate beam stopping cross-section sigstop = self.sigbeam( - current_drive_variables.beam_energy / physics_variables.m_beam_amu, + current_drive_variables.e_beam_kev / physics_variables.m_beam_amu, physics_variables.te, physics_variables.dene, physics_variables.f_nd_alpha_electron, @@ -1364,7 +1364,7 @@ def iternb(self): # Power split to ions / electrons f_p_beam_injected_ions = self.cfnbi( physics_variables.m_beam_amu, - current_drive_variables.beam_energy, + current_drive_variables.e_beam_kev, physics_variables.ten, physics_variables.dene, dend, @@ -1380,7 +1380,7 @@ def iternb(self): physics_variables.alphat, physics_variables.aspect, physics_variables.dene, - current_drive_variables.beam_energy, + current_drive_variables.e_beam_kev, physics_variables.rmajor, physics_variables.ten, physics_variables.zeff, @@ -1615,7 +1615,7 @@ def culnbi(self): # Calculate beam stopping cross-section sigstop = self.sigbeam( - current_drive_variables.beam_energy / physics_variables.m_beam_amu, + current_drive_variables.e_beam_kev / physics_variables.m_beam_amu, physics_variables.te, physics_variables.dene, physics_variables.f_nd_alpha_electron, @@ -1646,7 +1646,7 @@ def culnbi(self): f_p_beam_injected_ions = self.cfnbi( physics_variables.m_beam_amu, - current_drive_variables.beam_energy, + current_drive_variables.e_beam_kev, physics_variables.ten, physics_variables.dene, dend, @@ -1664,7 +1664,7 @@ def culnbi(self): physics_variables.aspect, physics_variables.dene, physics_variables.dnla, - current_drive_variables.beam_energy, + current_drive_variables.e_beam_kev, current_drive_variables.frbeam, fshine, physics_variables.rmajor, @@ -1739,7 +1739,7 @@ def etanb2( aspect, dene, dnla, - beam_energy, + e_beam_kev, frbeam, fshine, rmajor, @@ -1757,7 +1757,7 @@ def etanb2( aspect : input real : aspect ratio dene : input real : volume averaged electron density (m**-3) dnla : input real : line averaged electron density (m**-3) - beam_energy : input real : neutral beam energy (keV) + e_beam_kev : input real : neutral beam energy (keV) frbeam : input real : R_tangent / R_major for neutral beam injection fshine : input real : shine-through fraction of beam rmajor : input real : plasma major radius (m) @@ -1789,7 +1789,7 @@ def etanb2( ecrit = 0.01 * m_beam_amu * ten # Beam energy in MeV - ebmev = beam_energy / 1e3 + ebmev = e_beam_kev / 1e3 # x and y coefficients of function J0(x,y) (IPDG89) xjs = ebmev / (bbd * ecrit) diff --git a/process/fusion_reactions.py b/process/fusion_reactions.py index 0676c53890..15b516203b 100644 --- a/process/fusion_reactions.py +++ b/process/fusion_reactions.py @@ -798,7 +798,7 @@ def beam_fusion( dene: float, nd_fuel_ions: float, ion_electron_coulomb_log: float, - beam_energy: float, + e_beam_kev: float, f_deuterium_plasma: float, f_tritium_plasma: float, f_tritium_beam: float, @@ -823,7 +823,7 @@ def beam_fusion( dene (float): Electron density (m^-3). nd_fuel_ions (float): Fuel ion density (m^-3). ion_electron_coulomb_log (float): Ion-electron coulomb logarithm. - beam_energy (float): Neutral beam energy (keV). + e_beam_kev (float): Neutral beam energy (keV). f_deuterium_plasma (float): Deuterium fraction of main plasma. f_tritium_plasma (float): Tritium fraction of main plasma. f_tritium_beam (float): Tritium fraction of neutral beam. @@ -897,7 +897,7 @@ def beam_fusion( ) = beamcalc( deuterium_density, tritium_density, - beam_energy, + e_beam_kev, critical_energy_deuterium, critical_energy_tritium, beam_slow_time, @@ -929,7 +929,7 @@ def beam_fusion( def beamcalc( nd: float, nt: float, - beam_energy: float, + e_beam_kev: float, critical_energy_deuterium: float, critical_energy_tritium: float, beam_slow_time: float, @@ -949,7 +949,7 @@ def beamcalc( Parameters: nd (float): Thermal deuterium density (m^-3). nt (float): Thermal tritium density (m^-3). - beam_energy (float): Beam energy (keV). + e_beam_kev (float): Beam energy (keV). critical_energy_deuterium (float): Critical energy for electron/ion slowing down of the beam ion (deuterium neutral beam) (keV). critical_energy_tritium (float): Critical energy for beam slowing down (tritium neutral beam) (keV). beam_slow_time (float): Beam ion slowing down time on electrons (s). @@ -997,7 +997,7 @@ def beamcalc( # and at lower energies the loss to the ions predominates. # Ratio of beam energy to critical energy for deuterium - beam_energy_ratio_deuterium = beam_energy / critical_energy_deuterium + beam_energy_ratio_deuterium = e_beam_kev / critical_energy_deuterium # Calculate the characterstic time for the deuterium ions to slow down to the thermal energy, eg E = 0. characteristic_deuterium_beam_slow_time = ( @@ -1011,7 +1011,7 @@ def beamcalc( ) # Ratio of beam energy to critical energy for tritium - beam_energy_ratio_tritium = beam_energy / critical_energy_tritium + beam_energy_ratio_tritium = e_beam_kev / critical_energy_tritium # Calculate the characterstic time for the tritium to slow down to the thermal energy, eg E = 0. # Wesson, J. (2011) Tokamaks. @@ -1073,10 +1073,10 @@ def beamcalc( # Fast Ion Pressure # This is the same form as the ideal gas law pressure, P=1/3 * nmv^2 deuterium_pressure = pressure_coeff_deuterium * fast_ion_pressure_integral( - beam_energy, critical_energy_deuterium + e_beam_kev, critical_energy_deuterium ) tritium_pressure = pressure_coeff_tritium * fast_ion_pressure_integral( - beam_energy, critical_energy_tritium + e_beam_kev, critical_energy_tritium ) # Beam deposited energy @@ -1090,11 +1090,11 @@ def beamcalc( ) / hot_beam_density hot_deuterium_rate = 1e-4 * beam_reaction_rate( - constants.m_deuteron_amu, deuterium_critical_energy_speed, beam_energy + constants.m_deuteron_amu, deuterium_critical_energy_speed, e_beam_kev ) hot_tritium_rate = 1e-4 * beam_reaction_rate( - constants.m_triton_amu, tritium_critical_energy_speed, beam_energy + constants.m_triton_amu, tritium_critical_energy_speed, e_beam_kev ) deuterium_beam_alpha_power = alpha_power_beam( @@ -1112,7 +1112,7 @@ def beamcalc( ) -def fast_ion_pressure_integral(beam_energy: float, critical_energy: float) -> float: +def fast_ion_pressure_integral(e_beam_kev: float, critical_energy: float) -> float: """ Calculate the fraction of initial beam energy given to the ions. @@ -1120,7 +1120,7 @@ def fast_ion_pressure_integral(beam_energy: float, critical_energy: float) -> fl and the critical energy for electron/ion slowing down of the beam ion. Parameters: - beam_energy (float): Neutral beam energy (keV). + e_beam_kev (float): Neutral beam energy (keV). critical_energy (float): Critical energy for electron/ion slowing down of the beam ion (keV). Returns: @@ -1140,7 +1140,7 @@ def fast_ion_pressure_integral(beam_energy: float, critical_energy: float) -> fl Report UWFDM-103 1974, Available: https://fti.neep.wisc.edu/fti.neep.wisc.edu/pdf/fdm103.pdf """ - xcs = beam_energy / critical_energy + xcs = e_beam_kev / critical_energy xc = np.sqrt(xcs) t1 = xcs / 2.0 @@ -1329,13 +1329,13 @@ def _beam_fusion_cross_section(vrelsq: float) -> float: a5 = 4.09e2 # Beam kinetic energy - beam_energy = 0.5 * constants.m_deuteron_amu * vrelsq + e_beam_kev = 0.5 * constants.m_deuteron_amu * vrelsq # Set limits on cross-section at low and high beam energies - if beam_energy < 10.0: + if e_beam_kev < 10.0: return 1.0e-27 - if beam_energy > 1.0e4: + if e_beam_kev > 1.0e4: return 8.0e-26 - t1 = a2 / (1.0 + (a3 * beam_energy - a4) ** 2) + a5 - t2 = beam_energy * (np.exp(a1 / np.sqrt(beam_energy)) - 1.0) + t1 = a2 / (1.0 + (a3 * e_beam_kev - a4) ** 2) + a5 + t2 = e_beam_kev * (np.exp(a1 / np.sqrt(e_beam_kev)) - 1.0) return 1.0e-24 * t1 / t2 diff --git a/process/input.py b/process/input.py index fe5b7412e1..ae9be8f24f 100644 --- a/process/input.py +++ b/process/input.py @@ -187,7 +187,7 @@ def __post_init__(self): ), "bcritsc": InputVariable(fortran.tfcoil_variables, float, range=(10.0, 50.0)), "bctmp": InputVariable(fortran.pulse_variables, float, range=(1.0, 800.0)), - "beam_energy": InputVariable( + "e_beam_kev": InputVariable( fortran.current_drive_variables, float, range=(1.0, 1000000.0) ), "beamwd": InputVariable(fortran.current_drive_variables, float, range=(0.001, 5.0)), diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 77eb04093a..86e95b61d4 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -89,7 +89,7 @@ "aux_current_fraction", "inductive_current_fraction", "gamnb", - "beam_energy", + "e_beam_kev", "p_plasma_loss_mw", ] @@ -178,7 +178,7 @@ "aux_current_fraction", "inductive_current_fraction", "gamnb", - "beam_energy", + "e_beam_kev", "p_plasma_loss_mw", "pdivt", "vssoft", diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 4bf7a093b2..f134323e76 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -128,7 +128,7 @@ "vgap2": "dz_shld_vv_gap", "vgap": "dz_xpoint_divertor", "ftritbm": "f_tritium_bream", - "enbeam": "beam_energy", + "enbeam": "e_beam_kev", "fdeut": "f_deuterium", "ftrit": "f_tritium", "fhe3": "f_helium3", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 7c7c96ac16..0cb820b2aa 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3158,7 +3158,7 @@ def plot_current_drive_info(axis, mfile_data, scan): ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), ("gamnb", "NB gamma", "$10^{20}$ A W$^{-1}$ m$^{-2}$"), - ("beam_energy", "NB energy", "keV"), + ("e_beam_kev", "NB energy", "keV"), ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"), (pdivr, r"$\frac{P_{\mathrm{div}}}{R_{0}}$", "MW m$^{-1}$"), ( diff --git a/process/physics.py b/process/physics.py index 52322265d8..d5779fb2cd 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2085,7 +2085,7 @@ def physics(self): physics_variables.dene, physics_variables.nd_fuel_ions, physics_variables.dlamie, - current_drive_variables.beam_energy, + current_drive_variables.e_beam_kev, physics_variables.f_deuterium, physics_variables.f_tritium, current_drive_variables.f_tritium_beam, diff --git a/process/stellarator.py b/process/stellarator.py index 72f9ddd1cd..4f70880cd6 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4231,7 +4231,7 @@ def stphys(self, output): physics_variables.dene, physics_variables.nd_fuel_ions, physics_variables.dlamie, - current_drive_variables.beam_energy, + current_drive_variables.e_beam_kev, physics_variables.f_deuterium, physics_variables.f_tritium, current_drive_variables.f_tritium_beam, @@ -5002,7 +5002,7 @@ def stheat(self, output: bool): current_drive_variables.c_beam_total = ( 1e-3 * (current_drive_variables.pnbeam * 1e6) - / current_drive_variables.beam_energy + / current_drive_variables.e_beam_kev ) else: current_drive_variables.c_beam_total = 0 diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index a947748bfa..db73cf53ec 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -96,7 +96,7 @@ module current_drive_variables !! - =0 O-mode !! - =1 X-mode - real(dp) :: beam_energy + real(dp) :: e_beam_kev !! neutral beam energy (keV) (`iteration variable 19`) real(dp) :: etacd diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 22f02f8072..bb1c58a185 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -224,7 +224,7 @@ module numerics !!
  • (16) dr_cs !!
  • (17) t_between_pulse !!
  • (18) q - !!
  • (19) beam_energy + !!
  • (19) e_beam_kev !!
  • (20) temp_cp_average !!
  • (21) ft_burn (f-value for equation 13) !!
  • (22) NOT USED diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 229b190355..48dea19a62 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1739,7 +1739,7 @@ "emult": 1.269, "emult_all": 1.17, "emultmw": 0.0, - "beam_energy": 1000.0, + "e_beam_kev": 1000.0, "end_of_file": -1.0, "end_of_record": -2.0, "energypervol": 0.0, @@ -9343,7 +9343,7 @@ "emult": "energy multiplication in blanket and shield", "emult_all": "", "emultmw": "power due to energy multiplication in blanket and shield [MW]", - "beam_energy": "neutral beam energy (keV) (`iteration variable 19`)", + "e_beam_kev": "neutral beam energy (keV) (`iteration variable 19`)", "end_of_file": "", "end_of_record": "", "energypervol": "input waste (heat) energy cooled per evaporated volume (J/m3)", @@ -12211,7 +12211,7 @@ "lb": 1.0, "ub": 2.0 }, - "beam_energy": { + "e_beam_kev": { "lb": 1.0, "ub": 1000000.0 }, @@ -15012,7 +15012,7 @@ "lb": 100000.0, "ub": 50000000.0 }, - "beam_energy": { + "e_beam_kev": { "lb": 1.0, "ub": 1000000.0 }, @@ -15571,7 +15571,7 @@ "dr_tf_wp": 0.0, "drveff": 0.28, "edrive": 5000000.0, - "beam_energy": 1000.0, + "e_beam_kev": 1000.0, "f_avspace": 1.0, "f_coppera_m2": 1.0, "f_copperaoh_m2": 1.0, @@ -16104,7 +16104,7 @@ }, "19": { "lb": 1.0, - "name": "beam_energy", + "name": "e_beam_kev", "ub": 1000000.0 }, "2": { @@ -16575,7 +16575,7 @@ "174": "DUMMY", "175": "DUMMY", "18": "q", - "19": "beam_energy", + "19": "e_beam_kev", "2": "bt", "20": "temp_cp_average", "21": "ft_burn", @@ -16672,7 +16672,7 @@ "dr_tf_wp": "140", "drveff": "82", "edrive": "81", - "beam_energy": "19", + "e_beam_kev": "19", "f_avspace": "160", "f_coppera_m2": "143", "f_copperaoh_m2": "166", @@ -17629,7 +17629,7 @@ "echwpow", "effcd", "harnum", - "beam_energy", + "e_beam_kev", "etacd", "etacdfix", "eta_ecrh_injector_wall_plug", @@ -19988,7 +19988,7 @@ "elecstore_l": "real_variable", "elecstore_w": "real_variable", "emult": "real_variable", - "beam_energy": "real_variable", + "e_beam_kev": "real_variable", "beta_poloidal_eps_max": "real_variable", "epsfcn": "real_variable", "epsvmc": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index d29d2a2cab..812ce6f750 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2736,7 +2736,7 @@ feffcd = 1.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Neutral Beam Injection ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -*beam_energy = +*e_beam_kev = * DESCRIPTION: Neutral beam energy (keV) * JUSTIFICATION: Not used as no NBI used diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index e2aec52b5e..dece1951a0 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -75,7 +75,7 @@ class CudrivParam(NamedTuple): eta_beam_injector_wall_plug: Any = None - beam_energy: Any = None + e_beam_kev: Any = None effcd: Any = None @@ -230,7 +230,7 @@ class CudrivParam(NamedTuple): p_hcd_injected_total_mw=0, pwpnb=0, eta_beam_injector_wall_plug=0.29999999999999999, - beam_energy=1000, + e_beam_kev=1000, effcd=0, pwplh=0, echwpow=0, @@ -320,7 +320,7 @@ class CudrivParam(NamedTuple): p_hcd_injected_total_mw=120.49600019005746, pwpnb=0, eta_beam_injector_wall_plug=0.29999999999999999, - beam_energy=1000, + e_beam_kev=1000, effcd=0.05000000000000001, pwplh=0, echwpow=240.99200038011492, @@ -484,7 +484,7 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.eta_beam_injector_wall_plug, ) - monkeypatch.setattr(current_drive_variables, "beam_energy", cudrivparam.beam_energy) + monkeypatch.setattr(current_drive_variables, "e_beam_kev", cudrivparam.e_beam_kev) monkeypatch.setattr(current_drive_variables, "effcd", cudrivparam.effcd) From baab5867ff264d2ffac1095829197b0841cfc612 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 14:57:55 +0100 Subject: [PATCH 34/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20wave=5Fmode=20to?= =?UTF-8?q?=20i=5Fecrh=5Fwave=5Fmode=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 12 ++++++------ process/input.py | 4 +++- source/fortran/current_drive_variables.f90 | 2 +- .../spherical_tokamak_once_through.IN.DAT | 2 +- tests/regression/input_files/st_regression.IN.DAT | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index 2080b87c46..934d346b2b 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -237,11 +237,11 @@ def cudriv(self, output: bool): ) # O-mode case - if current_drive_variables.wave_mode == 0: + if current_drive_variables.i_ecrh_wave_mode == 0: f_cutoff = fp # X-mode case - elif current_drive_variables.wave_mode == 1: + elif current_drive_variables.i_ecrh_wave_mode == 1: f_cutoff = 0.5 * ( fc + np.sqrt(current_drive_variables.harnum * fc**2 + 4 * fp**2) ) @@ -542,11 +542,11 @@ def cudriv(self, output: bool): ) # O-mode case - if current_drive_variables.wave_mode == 0: + if current_drive_variables.i_ecrh_wave_mode == 0: f_cutoff = fp # X-mode case - elif current_drive_variables.wave_mode == 1: + elif current_drive_variables.i_ecrh_wave_mode == 1: f_cutoff = 0.5 * ( fc + np.sqrt(current_drive_variables.harnum * fc**2 + 4 * fp**2) ) @@ -917,8 +917,8 @@ def cudriv(self, output: bool): po.ovarin( self.outfile, "EC cutoff wave mode switch", - "(wave_mode)", - current_drive_variables.wave_mode, + "(i_ecrh_wave_mode)", + current_drive_variables.i_ecrh_wave_mode, ) if current_drive_variables.i_hcd_secondary != 0: diff --git a/process/input.py b/process/input.py index ae9be8f24f..c34962ab86 100644 --- a/process/input.py +++ b/process/input.py @@ -1568,7 +1568,9 @@ def __post_init__(self): "secondary_cycle_liq": InputVariable(fortran.fwbs_variables, int, range=(2, 4)), "supercond_cost_model": InputVariable(fortran.cost_variables, int, choices=[0, 1]), "i_tf_inside_cs": InputVariable(fortran.build_variables, int, choices=[0, 1]), - "wave_mode": InputVariable(fortran.current_drive_variables, int, choices=[0, 1]), + "i_ecrh_wave_mode": InputVariable( + fortran.current_drive_variables, int, choices=[0, 1] + ), "i_confinement_time": InputVariable( fortran.physics_variables, int, diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index db73cf53ec..3552268a90 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -90,7 +90,7 @@ module current_drive_variables real(dp) :: harnum !! cyclotron harmonic frequency number, used in cut-off function - integer :: wave_mode + integer :: i_ecrh_wave_mode !! Switch for ECRH wave mode : !! !! - =0 O-mode 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 70bcdbaf2f..1752bc72d5 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -196,7 +196,7 @@ output_costs = 1 * Switch for costs output; f_c_plasma_bootstrap_max = 0.9 * maximum fraction of plasma current from bootstrap; if `f_c_plasma_bootstrap_max < 0`; harnum = 2 * cyclotron harmonic frequency number; used in cut-off function -wave_mode = 0 * Switch for ECRH wave mode ; +i_ecrh_wave_mode = 0 * Switch for ECRH wave mode ; eta_ecrh_injector_wall_plug = 0.45 * ECH wall plug to injector efficiency feffcd = 1.0 * current drive efficiency fudge factor (`iteration variable 47`) i_hcd_primary = 13 * Switch for current drive efficiency model; diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 812ce6f750..0910e99995 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2821,7 +2821,7 @@ harnum = 2 * DESCRIPTION: Cyclotron harmonic frequency number * JUSTIFICATION: Not set assuming default ==2 -wave_mode = 0 +i_ecrh_wave_mode = 0 * DESCRIPTION: EM cutoff wave mode (X or O) * JUSTIFICATION: Not set assuming default ==0 (O-mode) From 01c5ec33892f76a8780d3d54906a47f2488de6f9 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 15:15:22 +0100 Subject: [PATCH 35/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20f=5Ftritium=5Fbea?= =?UTF-8?q?m=20to=20f=5Fbeam=5Ftritium=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating_and_current_drive/NBI/culham_nb.md | 4 ++-- .../heating_and_current_drive/NBI/iter_nb.md | 4 ++-- .../fusion_reactions/beam_reactions.md | 2 +- process/current_drive.py | 8 ++++---- process/fusion_reactions.py | 18 +++++++++--------- process/input.py | 2 +- process/physics.py | 10 +++++----- process/stellarator.py | 2 +- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 10 +++++----- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_physics.py | 8 ++++---- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md index 2aa5cb45f9..4da5ee1262 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md @@ -49,11 +49,11 @@ $$ Deuterium and tritium beam densities $$ -\mathtt{dend} = n_{\text{ion}} \times (1-\mathtt{f_tritium_beam}) +\mathtt{dend} = n_{\text{ion}} \times (1-\mathtt{f_beam_tritium}) $$ $$ -\mathtt{dent} = n_{\text{ion}} \times \mathtt{f_tritium_beam} +\mathtt{dent} = n_{\text{ion}} \times \mathtt{f_beam_tritium} $$ Power split to the ions and electrons is clauclated with the $\mathtt{cfnbi()}$ method found [here](../NBI/nbi_overview.md/#ion-coupled-power-cfnbi) and outputs $\mathtt{f_p_beam_injected_ions}$ diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md index 45091e1a8e..2f7b651d18 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md @@ -39,11 +39,11 @@ $$ Deuterium and tritium beam densities: $$ -n_D = n_i * (1.0 - \mathtt{f_tritium_beam}) +n_D = n_i * (1.0 - \mathtt{f_beam_tritium}) $$ $$ -n_T = n_i * \mathtt{f_tritium_beam} +n_T = n_i * \mathtt{f_beam_tritium} $$ Power split to ions / electrons is calculated via the the `cfnbi` method described [here](nbi_overview.md) diff --git a/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md b/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md index 8d6806b85c..0c7e0eda20 100644 --- a/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md +++ b/documentation/proc-pages/physics-models/fusion_reactions/beam_reactions.md @@ -4,7 +4,7 @@ The main function called for calculating the fusion reactions produced by neutra Due to the small contribution of fusion power from the neutral beams only D-T reactions are taken into account, as D-D additions to fusion power are deemed to be negligible. The beam fusion calculations will only run if the calculated beam current is greater than 0. This is done by having a NBI heating and current drive configuration. -The NBI parameters taken from the current drive module to be used in the beam fusion calculations are the beam current (`c_beam_total`), beam energy (`e_beam_kev`) and the tritium component of the beam (`f_tritium_beam`). +The NBI parameters taken from the current drive module to be used in the beam fusion calculations are the beam current (`c_beam_total`), beam energy (`e_beam_kev`) and the tritium component of the beam (`f_beam_tritium`). Please see the [H&CD section](../../eng-models/heating_and_current_drive/heating-and-current-drive.md) of the docs for more info. diff --git a/process/current_drive.py b/process/current_drive.py index 934d346b2b..a9650f75f6 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -1357,9 +1357,9 @@ def iternb(self): # Deuterium and tritium beam densities dend = physics_variables.nd_fuel_ions * ( - 1.0 - current_drive_variables.f_tritium_beam + 1.0 - current_drive_variables.f_beam_tritium ) - dent = physics_variables.nd_fuel_ions * current_drive_variables.f_tritium_beam + dent = physics_variables.nd_fuel_ions * current_drive_variables.f_beam_tritium # Power split to ions / electrons f_p_beam_injected_ions = self.cfnbi( @@ -1638,9 +1638,9 @@ def culnbi(self): # Deuterium and tritium beam densities dend = physics_variables.nd_fuel_ions * ( - 1.0e0 - current_drive_variables.f_tritium_beam + 1.0e0 - current_drive_variables.f_beam_tritium ) - dent = physics_variables.nd_fuel_ions * current_drive_variables.f_tritium_beam + dent = physics_variables.nd_fuel_ions * current_drive_variables.f_beam_tritium # Power split to ions / electrons diff --git a/process/fusion_reactions.py b/process/fusion_reactions.py index 15b516203b..7772163a5d 100644 --- a/process/fusion_reactions.py +++ b/process/fusion_reactions.py @@ -801,7 +801,7 @@ def beam_fusion( e_beam_kev: float, f_deuterium_plasma: float, f_tritium_plasma: float, - f_tritium_beam: float, + f_beam_tritium: float, sigmav_dt_average: float, ten: float, tin: float, @@ -826,7 +826,7 @@ def beam_fusion( e_beam_kev (float): Neutral beam energy (keV). f_deuterium_plasma (float): Deuterium fraction of main plasma. f_tritium_plasma (float): Tritium fraction of main plasma. - f_tritium_beam (float): Tritium fraction of neutral beam. + f_beam_tritium (float): Tritium fraction of neutral beam. sigmav_dt_average (float): Profile averaged for D-T (m^3/s). ten (float): Density-weighted electron temperature (keV). tin (float): Density-weighted ion temperature (keV). @@ -863,8 +863,8 @@ def beam_fusion( beam_slow_time = ( 1.99e19 * ( - constants.m_deuteron_amu * (1.0 - f_tritium_beam) - + (constants.m_triton_amu * f_tritium_beam) + constants.m_deuteron_amu * (1.0 - f_beam_tritium) + + (constants.m_triton_amu * f_beam_tritium) ) * (ten**1.5 / dene) / ion_electron_coulomb_log @@ -901,7 +901,7 @@ def beam_fusion( critical_energy_deuterium, critical_energy_tritium, beam_slow_time, - f_tritium_beam, + f_beam_tritium, c_beam_total, tin, vol_plasma, @@ -933,7 +933,7 @@ def beamcalc( critical_energy_deuterium: float, critical_energy_tritium: float, beam_slow_time: float, - f_tritium_beam: float, + f_beam_tritium: float, c_beam_total: float, ti: float, vol_plasma: float, @@ -953,7 +953,7 @@ def beamcalc( critical_energy_deuterium (float): Critical energy for electron/ion slowing down of the beam ion (deuterium neutral beam) (keV). critical_energy_tritium (float): Critical energy for beam slowing down (tritium neutral beam) (keV). beam_slow_time (float): Beam ion slowing down time on electrons (s). - f_tritium_beam (float): Beam tritium fraction (0.0 = deuterium beam). + f_beam_tritium (float): Beam tritium fraction (0.0 = deuterium beam). c_beam_total (float): Beam current (A). ti (float): Thermal ion temperature (keV). vol_plasma (float): Plasma volume (m^3). @@ -990,8 +990,8 @@ def beamcalc( """ # D and T beam current fractions - beam_current_deuterium = c_beam_total * (1.0 - f_tritium_beam) - beam_current_tritium = c_beam_total * f_tritium_beam + beam_current_deuterium = c_beam_total * (1.0 - f_beam_tritium) + beam_current_tritium = c_beam_total * f_beam_tritium # At a critical energy the rate of loss to the ions becomes equal to that to the electrons, # and at lower energies the loss to the ions predominates. diff --git a/process/input.py b/process/input.py index c34962ab86..8d8cc1b67d 100644 --- a/process/input.py +++ b/process/input.py @@ -525,7 +525,7 @@ def __post_init__(self): "f_sync_reflect": InputVariable(fortran.physics_variables, float, range=(0.0, 1.0)), "f_t_turn_tf": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)), "f_tritium": InputVariable(fortran.physics_variables, float, range=(0.0, 1.0)), - "f_tritium_beam": InputVariable( + "f_beam_tritium": InputVariable( fortran.current_drive_variables, float, range=(0.0, 1.0) ), "f_vforce_inboard": InputVariable( diff --git a/process/physics.py b/process/physics.py index d5779fb2cd..016b1817b7 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2088,7 +2088,7 @@ def physics(self): current_drive_variables.e_beam_kev, physics_variables.f_deuterium, physics_variables.f_tritium, - current_drive_variables.f_tritium_beam, + current_drive_variables.f_beam_tritium, physics_module.sigmav_dt_average, physics_variables.ten, physics_variables.tin, @@ -2988,8 +2988,8 @@ def plasma_composition() -> None: # Average atomic masses of injected fuel species in the neutral beams # Only deuterium and tritium in the beams physics_variables.m_beam_amu = ( - constants.m_deuteron_amu * (1.0 - current_drive_variables.f_tritium_beam) - ) + (constants.m_triton_amu * current_drive_variables.f_tritium_beam) + constants.m_deuteron_amu * (1.0 - current_drive_variables.f_beam_tritium) + ) + (constants.m_triton_amu * current_drive_variables.f_beam_tritium) # ====================================================================== @@ -3036,12 +3036,12 @@ def plasma_composition() -> None: + (4.0 * physics_variables.nd_alphas / constants.m_alpha_amu) + (physics_variables.nd_protons / constants.m_proton_amu) + ( - (1.0 - current_drive_variables.f_tritium_beam) + (1.0 - current_drive_variables.f_beam_tritium) * physics_variables.nd_beam_ions / constants.m_deuteron_amu ) + ( - current_drive_variables.f_tritium_beam + current_drive_variables.f_beam_tritium * physics_variables.nd_beam_ions / constants.m_triton_amu ) diff --git a/process/stellarator.py b/process/stellarator.py index 4f70880cd6..dcc9604eff 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4234,7 +4234,7 @@ def stphys(self, output): current_drive_variables.e_beam_kev, physics_variables.f_deuterium, physics_variables.f_tritium, - current_drive_variables.f_tritium_beam, + current_drive_variables.f_beam_tritium, physics_module.sigmav_dt_average, physics_variables.ten, physics_variables.tin, diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 3552268a90..ecad707624 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -136,7 +136,7 @@ module current_drive_variables real(dp) :: frbeam !! R_tangential / R_major for neutral beam injection - real(dp) :: f_tritium_beam + real(dp) :: f_beam_tritium !! fraction of beam that is tritium real(dp) :: gamcd diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 48dea19a62..6df21a4cab 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2032,7 +2032,7 @@ "ftoroidalgap": 1.0, "ftpeak": 1.0, "f_tritium": 0.5, - "f_tritium_beam": 1e-06, + "f_beam_tritium": 1e-06, "fusion_rate_density_total": 0.0, "fusion_rate_density_plasma": 0.0, "fvdump": 1.0, @@ -9589,7 +9589,7 @@ "ftoroidalgap": "F-value for minimum dx_tf_inboard_out_toroidal (`constraint equation 82`)", "ftpeak": "f-value for first wall peak temperature (`constraint equation 39`, `iteration variable 63`)", "f_tritium": "tritium fuel fraction", - "f_tritium_beam": "fraction of beam that is tritium", + "f_beam_tritium": "fraction of beam that is tritium", "fusion_rate_density_total": "fusion reaction rate, from plasma and beams (reactions/m3/sec)", "fusion_rate_density_plasma": "fusion reaction rate, just from plasma (reactions/m3/sec)", "fvdump": "f-value for dump voltage (`constraint equation 34`, `iteration variable 51`)", @@ -12819,7 +12819,7 @@ "lb": 0.0, "ub": 1.0 }, - "f_tritium_beam": { + "f_beam_tritium": { "lb": 0.0, "ub": 1.0 }, @@ -17642,7 +17642,7 @@ "feffcd", "f_p_beam_orbit_loss", "frbeam", - "f_tritium_beam", + "f_beam_tritium", "gamcd", "gamma_ecrh", "xi_ebw", @@ -20142,7 +20142,7 @@ "ftoroidalgap": "real_variable", "ftpeak": "real_variable", "f_tritium": "real_variable", - "f_tritium_beam": "real_variable", + "f_beam_tritium": "real_variable", "fvdump": "real_variable", "fvoldw": "real_variable", "fvolsi": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 0910e99995..53508b4616 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2760,7 +2760,7 @@ feffcd = 1.0 * DESCRIPTION: R_tan / R_major for NBI * JUSTIFICATION: Not used as no NBI used -*f_tritium_beam +*f_beam_tritium * DESCRIPTION: Tritium fraction of beam * JUSTIFICATION: Not used as no NBI used diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 0091d5d8be..74c6331378 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -1129,7 +1129,7 @@ def test_conhas(): class PlasmaCompositionParam(NamedTuple): - f_tritium_beam: Any = None + f_beam_tritium: Any = None impurity_arr_frac: Any = None @@ -1258,7 +1258,7 @@ class PlasmaCompositionParam(NamedTuple): "plasmacompositionparam", ( PlasmaCompositionParam( - f_tritium_beam=9.9999999999999995e-07, + f_beam_tritium=9.9999999999999995e-07, impurity_arr_frac=[ 0.90000000000000002, 0.10000000000000001, @@ -1367,7 +1367,7 @@ class PlasmaCompositionParam(NamedTuple): expected_first_call=0, ), PlasmaCompositionParam( - f_tritium_beam=9.9999999999999995e-07, + f_beam_tritium=9.9999999999999995e-07, impurity_arr_frac=( 0.78128900936605694, 0.10000000000000001, @@ -1502,7 +1502,7 @@ def test_plasma_composition(plasmacompositionparam, monkeypatch, physics): initialise_imprad() monkeypatch.setattr( - current_drive_variables, "f_tritium_beam", plasmacompositionparam.f_tritium_beam + current_drive_variables, "f_beam_tritium", plasmacompositionparam.f_beam_tritium ) monkeypatch.setattr( From a3dedc424bd30e338ff4a145cd5f7ab6c8d710e2 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 15:33:28 +0100 Subject: [PATCH 36/61] :memo: Update standards documentation to include current drive efficiencies and their prefixes --- .../proc-pages/development/standards.md | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/documentation/proc-pages/development/standards.md b/documentation/proc-pages/development/standards.md index 8daf908309..ad35016833 100644 --- a/documentation/proc-pages/development/standards.md +++ b/documentation/proc-pages/development/standards.md @@ -365,10 +365,32 @@ The unit declaration `_fpy` can be used to specify that it is the full-power yea --------------------- +##### Current drive efficiencies + +Absolute current drive efficiencies ($\eta_{\text{CD}}$) representing Amps driven per Watt of injected power start with the `eta_cd` prefix. + +$$ +\eta_{\text{CD}} = \frac{I_{\text{driven}}}{P_{\text{injected}}} +$$ + +Normalized current drive efficiecnies using major radius and volume averaged electron temperature start with the `eta_cd_norm` prefix + +$$ +\eta_{\text{CD,norm}} = R_0 n_{\text{e,20}} \eta_{\text{CD}} +$$ + +$\eta_{\text{CD,norm}}$ has the units of $\frac{1\times 10^{20} \text{A}}{\text{W} \text{m}^2}$ + +The above is concurrent with that of general efficiencies given [below](#efficiencies). + +-------------- + ##### Variables representing fractions If a variable is intended to demonstrate a fraction of a value or distribution etc. Then it should start with the `f_` prefix. +###### Efficiencies + Similar to this is variables representing efficiencies. If a variable is intended to represent an engineering efficiency then it should start with the `eta_` prefix to represent $\eta$ From 68391e2d7366d67b50a694a5b6eeda76f0424b05 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 15:50:29 +0100 Subject: [PATCH 37/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20gamma=5Fecrh=20to?= =?UTF-8?q?=20eta=5Fcd=5Fnorm=5Fecrh=20for=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RF/ecrh_gamma.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/current_drive.py | 8 ++--- process/input.py | 2 +- source/fortran/current_drive_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 20 ++++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 10 +++--- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 4 +-- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_current_drive.py | 10 +++--- 32 files changed, 89 insertions(+), 87 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md index d8c4b4b300..c233d52f6b 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ecrh_gamma.md @@ -2,7 +2,7 @@ - `i_hcd_primary/i_hcd_secondary` = 10 -This model allows the user to input a scaling factor to the current drive efficiency with the variable `gamma_ecrh`. The value of this variable should follow the value and form of the expression below: +This model allows the user to input a scaling factor to the current drive efficiency with the variable `eta_cd_norm_ecrh`. The value of this variable should follow the value and form of the expression below: $$ \gamma_{CD} = \frac{\langle n_{e,20} \rangle I_{CD}R_0}{P_{CD}} diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 2d1c365cc3..7f176b1f89 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -541,7 +541,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6299E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1436E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1652,7 +1652,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 987c8eb29d..cd65e70595 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -539,7 +539,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1646,7 +1646,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 6e5580ed1d..df1d72815f 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -539,7 +539,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1646,7 +1646,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 94013cdea5..53531ddb91 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -539,7 +539,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1647,7 +1647,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 1469445884..9112c5a467 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -539,7 +539,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1647,7 +1647,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index eaa711fad0..9a9a126832 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -457,7 +457,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 86d08e36b0..54b87da785 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -394,7 +394,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1389,7 +1389,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -2384,7 +2384,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -3379,7 +3379,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -4374,7 +4374,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -5369,7 +5369,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -6364,7 +6364,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -7359,7 +7359,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -8354,7 +8354,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -9146,7 +9146,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) f_c_plasma_bootstrap_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; -gamma_ecrh = 0.30 * ECRH gamma_CD (user input) +eta_cd_norm_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 5d602cb732..75a4f81b04 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -457,7 +457,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/process/current_drive.py b/process/current_drive.py index a9650f75f6..67e0ac097a 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -148,7 +148,7 @@ def cudriv(self, output: bool): # ECRH user input gamma elif current_drive_variables.i_hcd_secondary == 10: # Normalised current drive efficiency gamma - current_drive_variables.gamcd = current_drive_variables.gamma_ecrh + current_drive_variables.gamcd = current_drive_variables.eta_cd_norm_ecrh # Absolute current drive efficiency effrfssfix = current_drive_variables.gamcd / ( @@ -450,7 +450,7 @@ def cudriv(self, output: bool): current_drive_variables.effcd = effnbss # ECRH user input gamma elif current_drive_variables.i_hcd_primary == 10: - current_drive_variables.gamcd = current_drive_variables.gamma_ecrh + current_drive_variables.gamcd = current_drive_variables.eta_cd_norm_ecrh # Absolute current drive efficiency effrfss = current_drive_variables.gamcd / ( @@ -896,8 +896,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "ECRH plasma heating efficiency", - "(gamma_ecrh)", - current_drive_variables.gamma_ecrh, + "(eta_cd_norm_ecrh)", + current_drive_variables.eta_cd_norm_ecrh, ) if current_drive_variables.i_hcd_primary == 12: po.ovarre( diff --git a/process/input.py b/process/input.py index 8d8cc1b67d..c42b17c8d8 100644 --- a/process/input.py +++ b/process/input.py @@ -725,7 +725,7 @@ def __post_init__(self): "fwdzu": InputVariable(fortran.ife_variables, float, range=(0.0, 10.0)), "fzactual": InputVariable(fortran.reinke_variables, float, range=(0.0, 1.0)), "fzeffmax": InputVariable(fortran.constraint_variables, float, range=(0.001, 1.0)), - "gamma_ecrh": InputVariable( + "eta_cd_norm_ecrh": InputVariable( fortran.current_drive_variables, float, range=(0.0, 1.0) ), "gamma_he": InputVariable( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index ecad707624..59cb7af767 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -142,7 +142,7 @@ module current_drive_variables real(dp) :: gamcd !! normalised current drive efficiency (1.0e20 A/(W m^2)) - real(dp) :: gamma_ecrh + real(dp) :: eta_cd_norm_ecrh !! User input ECRH gamma (1.0e20 A/(W m^2)) real(dp) :: xi_ebw diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index e7482250b3..08f8d89a3b 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -538,7 +538,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1645,7 +1645,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 4da4402c72..f172f16fa0 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -539,7 +539,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1646,7 +1646,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 168327f74a..c020c37a13 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -539,7 +539,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1646,7 +1646,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 257926bbe4..28d44fa46c 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -539,7 +539,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1646,7 +1646,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 24c463c201..51971638b0 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -456,7 +456,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 381be7c0df..d0d88cc9f8 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -536,7 +536,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6799E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2290E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1647,7 +1647,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index da5d95e6f4..73f00d5e33 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -162,7 +162,7 @@ output_costs = 1 * Switch for costs output; f_c_plasma_bootstrap_max = 0.95 * maximum fraction of plasma current from bootstrap; if `bscfmax < 0`; eta_ecrh_injector_wall_plug = 0.5 * ECH wall plug to injector efficiency -gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) +eta_cd_norm_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) i_hcd_primary = 10 * Switch for current drive efficiency model; pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) p_hcd_injected_max = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 924c57a193..c8ce5349d3 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -167,7 +167,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) f_c_plasma_bootstrap_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; -gamma_ecrh = 0.30 * ECRH gamma_CD (user input) +eta_cd_norm_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 176b53af5c..927aa2711e 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -540,7 +540,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6662E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1061E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1703,7 +1703,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6483E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1146E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -2866,7 +2866,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6344E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1238E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -4029,7 +4029,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6548E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1715E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -5192,7 +5192,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6564E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1531E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -6355,7 +6355,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6722E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1452E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -7518,7 +7518,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6916E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1915E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -8681,7 +8681,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6867E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2074E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -9844,7 +9844,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6949E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2337E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -11007,7 +11007,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.7010E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2713E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -12170,7 +12170,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6863E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2391E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -13333,7 +13333,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6900E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2221E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -14496,7 +14496,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6986E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2611E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -15659,7 +15659,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6811E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2685E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -16822,7 +16822,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6629E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2763E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -17933,7 +17933,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 96012a671f..83402ce063 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -394,7 +394,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1389,7 +1389,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -2384,7 +2384,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -3379,7 +3379,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -4374,7 +4374,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -5369,7 +5369,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -6364,7 +6364,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -7359,7 +7359,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -8354,7 +8354,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -9146,7 +9146,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) f_c_plasma_bootstrap_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; -gamma_ecrh = 0.30 * ECRH gamma_CD (user input) +eta_cd_norm_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 5c5e5fef45..bd95297d56 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -167,7 +167,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) f_c_plasma_bootstrap_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; -gamma_ecrh = 0.30 * ECRH gamma_CD (user input) +eta_cd_norm_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 89d4dd61b5..793e9d3b4f 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -167,7 +167,7 @@ ucme = 3.0d8 * Unit cost of maintenance equipment ($/w**0;3) f_c_plasma_bootstrap_max = 0.99 * Maximum fraction of plasma current from bootstrap; i_hcd_primary = 10 * Switch for current drive efficiency model; -gamma_ecrh = 0.30 * ECRH gamma_CD (user input) +eta_cd_norm_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) pheat = 50.0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 6df21a4cab..db68895533 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2162,7 +2162,7 @@ ], "gamcd": 0.0, "ejima_coeff": 0.4, - "gamma_ecrh": 0.35, + "eta_cd_norm_ecrh": 0.35, "gamma_he": 1.667, "f_beta_alpha_beam_thermal": 0.0, "gammax": 2.0, @@ -9652,7 +9652,7 @@ "gainve": "IFE target gain vs driver energy (`ifedrv=-1`)", "gamcd": "normalised current drive efficiency (1.0e20 A/(W m^2))", "ejima_coeff": "Ejima coefficient for resistive startup V-s formula", - "gamma_ecrh": "User input ECRH gamma (1.0e20 A/(W m^2))", + "eta_cd_norm_ecrh": "User input ECRH gamma (1.0e20 A/(W m^2))", "gamma_he": "ratio of specific heats for helium (`i_coolant_pumping=3`)", "f_beta_alpha_beam_thermal": "ratio of (fast alpha + neutral beam beta) to thermal beta", "gammax": "maximum current drive gamma (`constraint equation 37`)", @@ -12943,7 +12943,7 @@ "lb": 0.1, "ub": 1.0 }, - "gamma_ecrh": { + "eta_cd_norm_ecrh": { "lb": 0.0, "ub": 1.0 }, @@ -17644,7 +17644,7 @@ "frbeam", "f_beam_tritium", "gamcd", - "gamma_ecrh", + "eta_cd_norm_ecrh", "xi_ebw", "i_hcd_primary", "i_hcd_secondary", @@ -20175,7 +20175,7 @@ "fzeffmax": "real_variable", "gainve": "real_array", "ejima_coeff": "real_variable", - "gamma_ecrh": "real_variable", + "eta_cd_norm_ecrh": "real_variable", "gamma_he": "real_variable", "gammax": "real_variable", "dr_shld_vv_gap_inboard": "real_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index b3702b8ff7..7fb387338f 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -459,7 +459,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index fa1eac2969..6b9d577679 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -441,7 +441,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 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 0cd2dae22b..9e2fc64b9e 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -162,7 +162,7 @@ output_costs = 1 * Switch for costs output; f_c_plasma_bootstrap_max = 0.95 * maximum fraction of plasma current from bootstrap; if `f_c_plasma_bootstrap_max < 0`; eta_ecrh_injector_wall_plug = 0.5 * ECH wall plug to injector efficiency -gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) +eta_cd_norm_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) i_hcd_primary = 10 * Switch for current drive efficiency model; pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) p_hcd_injected_max = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 53508b4616..54f11141bc 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2841,7 +2841,7 @@ eta_ecrh_injector_wall_plug = 0.45 * DESCRIPTION: ECRH Wall Plug to Injector Efficiency * JUSTIFICATION: -*gamma_ecrh = +*eta_cd_norm_ecrh = * DESCRIPTION: User Input ECRH Gamma * JUSTIFICATION: @@ -2853,7 +2853,7 @@ eta_ecrh_injector_wall_plug = 0.45 * Electron Bernstein Wave * *-------------------------* -* xi_ebw = 0.43 * switch in if using EBW, instead of gamma_ecrh * +* xi_ebw = 0.43 * switch in if using EBW, instead of eta_cd_norm_ecrh * * DESCRIPTION: User Input EBW Gamma * JUSTIFICATION: user input for current drive efficiency. Default xi_ebw = 0.43 diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 2217529b0a..d75aac1831 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -457,7 +457,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c00ba8c726..8f9876aeb6 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -536,7 +536,7 @@ Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6799E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 - ECRH_plasma_heating_efficiency__________________________________________ (gamma_ecrh)__________________ 3.0000E-01 + ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2290E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 Pfirsch-Schlueter_fraction______________________________________________ (f_c_plasma_pfirsch_schluter)_______________________ 0.0000E+00 @@ -1648,7 +1648,7 @@ f_c_plasma_bootstrap_max = 0.95 i_hcd_primary = 10 * ECRH gamma_CD (user input) -gamma_ecrh = 0.30 +eta_cd_norm_ecrh = 0.30 * ECRH wall-plug efficiency eta_ecrh_injector_wall_plug = 0.5 diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index dece1951a0..675ccce38a 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -57,7 +57,7 @@ class CudrivParam(NamedTuple): gamcd: Any = None - gamma_ecrh: Any = None + eta_cd_norm_ecrh: Any = None eta_lowhyb_injector_wall_plug: Any = None @@ -221,7 +221,7 @@ class CudrivParam(NamedTuple): f_p_beam_injected_ions=0.5, f_p_beam_shine_through=0, gamcd=0, - gamma_ecrh=0.30000000000000004, + eta_cd_norm_ecrh=0.30000000000000004, eta_lowhyb_injector_wall_plug=0.29999999999999999, etacd=0, etacdfix=0, @@ -311,7 +311,7 @@ class CudrivParam(NamedTuple): f_p_beam_injected_ions=0.5, f_p_beam_shine_through=0, gamcd=0.30000000000000004, - gamma_ecrh=0.30000000000000004, + eta_cd_norm_ecrh=0.30000000000000004, eta_lowhyb_injector_wall_plug=0.29999999999999999, etacd=0.5, etacdfix=0, @@ -448,7 +448,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "gamcd", cudrivparam.gamcd) - monkeypatch.setattr(current_drive_variables, "gamma_ecrh", cudrivparam.gamma_ecrh) + monkeypatch.setattr( + current_drive_variables, "eta_cd_norm_ecrh", cudrivparam.eta_cd_norm_ecrh + ) monkeypatch.setattr( current_drive_variables, From ca1b63441282233cd63288e005c4498244f5fb7a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 16:03:04 +0100 Subject: [PATCH 38/61] =?UTF-8?q?=E2=9C=A8=20=F0=9F=90=9Bcreate=20new=20et?= =?UTF-8?q?a=5Fcd=5Fnorm=5Fhcd=5Fsecondary=20variable=20for=20secondary=20?= =?UTF-8?q?system=20and=20update=20in=20current=5Fdrive.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 12 +++++++----- process/io/plot_proc.py | 2 +- source/fortran/current_drive_variables.f90 | 3 +++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index 67e0ac097a..59ce63d2d3 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -148,10 +148,12 @@ def cudriv(self, output: bool): # ECRH user input gamma elif current_drive_variables.i_hcd_secondary == 10: # Normalised current drive efficiency gamma - current_drive_variables.gamcd = current_drive_variables.eta_cd_norm_ecrh + current_drive_variables.eta_cd_norm_hcd_secondary = ( + current_drive_variables.eta_cd_norm_ecrh + ) # Absolute current drive efficiency - effrfssfix = current_drive_variables.gamcd / ( + effrfssfix = current_drive_variables.eta_cd_norm_hcd_secondary / ( dene20 * physics_variables.rmajor ) effcdfix = effrfssfix @@ -160,12 +162,12 @@ def cudriv(self, output: bool): # Scaling author Simon Freethy # Ref : PROCESS issue 1262 # Normalised current drive efficiency gamma - current_drive_variables.gamcd = ( + current_drive_variables.eta_cd_norm_hcd_secondary = ( current_drive_variables.xi_ebw / 32.7e0 ) * physics_variables.te # Absolute current drive efficiency - effrfssfix = current_drive_variables.gamcd / ( + effrfssfix = current_drive_variables.eta_cd_norm_hcd_secondary / ( dene20 * physics_variables.rmajor ) effcdfix = effrfssfix @@ -880,7 +882,7 @@ def cudriv(self, output: bool): ) po.ovarre( self.outfile, - "Normalised current drive efficiency, gamma (10^20 A/W-m2)", + "Normalised current drive efficiency of primary HCD system (10^20 A / W m^2)", "(gamcd)", current_drive_variables.gamcd, "OP ", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 0cb820b2aa..deeb9db880 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3186,7 +3186,7 @@ def plot_current_drive_info(axis, mfile_data, scan): ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"), ( "gamcd", - "Normalised current drive efficiency", + "Normalised current drive efficiency of primary HCD system", "(10$^{20}$ A/(Wm$^{2}$))", ), (pdivr, r"$\frac{P_{\mathrm{div}}}{R_{0}}$", "MW m$^{-1}$"), diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 59cb7af767..12a05599d3 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -142,6 +142,9 @@ module current_drive_variables real(dp) :: gamcd !! normalised current drive efficiency (1.0e20 A/(W m^2)) + real(dp) :: eta_cd_norm_hcd_secondary + !! Normalised current drive efficiency for secondary HCD system [(1.0e20 A)/(W m^2)] + real(dp) :: eta_cd_norm_ecrh !! User input ECRH gamma (1.0e20 A/(W m^2)) From 2fb176420213e23298762feb080f0690c4fb983b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 16:14:20 +0100 Subject: [PATCH 39/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20gamcd=20to=20eta?= =?UTF-8?q?=5Fcd=5Fnorm=5Fhcd=5Fprimary=20for=20clarity=20and=20consistenc?= =?UTF-8?q?y=20in=20current=20drive=20variables?= 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/current_drive.py | 18 ++++++----- process/io/plot_proc.py | 6 ++-- source/fortran/constraint_equations.f90 | 8 ++--- source/fortran/current_drive_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_current_drive.py | 16 ++++++---- 21 files changed, 78 insertions(+), 70 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 7f176b1f89..a73bbae2b3 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -539,7 +539,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0990E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 9.8586E+03 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6299E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1436E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index cd65e70595..4970395371 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -537,7 +537,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index df1d72815f..4fd607cef7 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -537,7 +537,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 53531ddb91..9cf543ae26 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -537,7 +537,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 9112c5a467..9c1961343d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -537,7 +537,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 54b87da785..0b13712166 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -392,7 +392,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -1387,7 +1387,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -2382,7 +2382,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -3377,7 +3377,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -4372,7 +4372,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -5367,7 +5367,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -6362,7 +6362,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -7357,7 +7357,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -8352,7 +8352,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 diff --git a/process/current_drive.py b/process/current_drive.py index 59ce63d2d3..adbcba9da3 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -452,10 +452,12 @@ def cudriv(self, output: bool): current_drive_variables.effcd = effnbss # ECRH user input gamma elif current_drive_variables.i_hcd_primary == 10: - current_drive_variables.gamcd = current_drive_variables.eta_cd_norm_ecrh + current_drive_variables.eta_cd_norm_hcd_primary = ( + current_drive_variables.eta_cd_norm_ecrh + ) # Absolute current drive efficiency - effrfss = current_drive_variables.gamcd / ( + effrfss = current_drive_variables.eta_cd_norm_hcd_primary / ( dene20 * physics_variables.rmajor ) current_drive_variables.effcd = effrfss @@ -465,12 +467,12 @@ def cudriv(self, output: bool): # Ref : PROCESS issue 1262 # Normalised current drive efficiency gamma - current_drive_variables.gamcd = ( + current_drive_variables.eta_cd_norm_hcd_primary = ( current_drive_variables.xi_ebw / 32.7e0 ) * physics_variables.te # Absolute current drive efficiency - effrfss = current_drive_variables.gamcd / ( + effrfss = current_drive_variables.eta_cd_norm_hcd_primary / ( dene20 * physics_variables.rmajor ) current_drive_variables.effcd = effrfss @@ -604,7 +606,7 @@ def cudriv(self, output: bool): # Normalised current drive efficiency gamma gamrf = effrfss * (dene20 * physics_variables.rmajor) - current_drive_variables.gamcd = gamrf + current_drive_variables.eta_cd_norm_hcd_primary = gamrf # ECCD elif current_drive_variables.i_hcd_primary in [3, 7, 10, 12, 13]: # Injected power (set to close to close the Steady-state current equilibrium) @@ -693,7 +695,7 @@ def cudriv(self, output: bool): current_drive_variables.eta_beam_injector_wall_plug ) gamnb = effnbss * (dene20 * physics_variables.rmajor) - current_drive_variables.gamcd = gamnb + current_drive_variables.eta_cd_norm_hcd_primary = gamnb current_drive_variables.c_beam_total = ( 1.0e-3 * (current_drive_variables.p_beam_injected * 1.0e6) @@ -883,8 +885,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Normalised current drive efficiency of primary HCD system (10^20 A / W m^2)", - "(gamcd)", - current_drive_variables.gamcd, + "(eta_cd_norm_hcd_primary)", + current_drive_variables.eta_cd_norm_hcd_primary, "OP ", ) po.ovarre( diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index deeb9db880..7ae357d8dc 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3185,7 +3185,7 @@ def plot_current_drive_info(axis, mfile_data, scan): ("inductive_current_fraction", "Inductive fraction", ""), ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"), ( - "gamcd", + "eta_cd_norm_hcd_primary", "Normalised current drive efficiency of primary HCD system", "(10$^{20}$ A/(Wm$^{2}$))", ), @@ -3214,7 +3214,7 @@ def plot_current_drive_info(axis, mfile_data, scan): ("inductive_current_fraction", "Inductive fraction", ""), ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"), ( - "gamcd", + "eta_cd_norm_hcd_primary", "Normalised current drive efficiency", "(10$^{20}$ A/(Wm$^{2}$))", ), @@ -3243,7 +3243,7 @@ def plot_current_drive_info(axis, mfile_data, scan): ("inductive_current_fraction", "Inductive fraction", ""), ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"), ( - "gamcd", + "eta_cd_norm_hcd_primary", "Normalised current drive efficiency", "(10$^{20}$ A/(Wm$^{2}$))", ), diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 05626a74b8..701e431987 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -1711,9 +1711,9 @@ subroutine constraint_eqn_037(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fgamcd : input real : f-value for current drive gamma !! gammax : input real : maximum current drive gamma - !! gamcd : input real : normalised current drive efficiency (1.0e20 A/W-m2) + !! eta_cd_norm_hcd_primary : input real : normalised current drive efficiency (1.0e20 A/W-m2) use constraint_variables, only: fgamcd, gammax - use current_drive_variables, only: gamcd + use current_drive_variables, only: eta_cd_norm_hcd_primary implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1721,9 +1721,9 @@ subroutine constraint_eqn_037(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 = gamcd/gammax - 1.0D0 * fgamcd + tmp_cc = eta_cd_norm_hcd_primary/gammax - 1.0D0 * fgamcd tmp_con = gammax * (1.0D0 - tmp_cc) - tmp_err = gamcd * tmp_cc + tmp_err = eta_cd_norm_hcd_primary * tmp_cc tmp_symbol = '<' tmp_units = '1E20 A/Wm2' diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 12a05599d3..6b0c8f07fd 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -139,8 +139,8 @@ module current_drive_variables real(dp) :: f_beam_tritium !! fraction of beam that is tritium - real(dp) :: gamcd - !! normalised current drive efficiency (1.0e20 A/(W m^2)) + real(dp) :: eta_cd_norm_hcd_primary + !! Normalised current drive efficiency for primary HCD system [(1.0e20 A)/(W m^2)] real(dp) :: eta_cd_norm_hcd_secondary !! Normalised current drive efficiency for secondary HCD system [(1.0e20 A)/(W m^2)] diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 08f8d89a3b..2eb5ecaf4a 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -536,7 +536,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index f172f16fa0..761747c5b9 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -537,7 +537,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index c020c37a13..d1f06d2c37 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -537,7 +537,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 28d44fa46c..01200db0b6 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -537,7 +537,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index d0d88cc9f8..1b9e5fea14 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -534,7 +534,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0141E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.2041E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6799E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2290E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 927aa2711e..64dfad8d63 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -538,7 +538,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1129E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6662E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1061E-01 @@ -1701,7 +1701,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1326E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6483E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1146E-01 @@ -2864,7 +2864,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1272E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.5902E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6344E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1238E-01 @@ -4027,7 +4027,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1468E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6548E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1715E-01 @@ -5190,7 +5190,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1502E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6564E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1531E-01 @@ -6353,7 +6353,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1436E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6722E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1452E-01 @@ -7516,7 +7516,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1481E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6916E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1915E-01 @@ -8679,7 +8679,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1510E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6867E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2074E-01 @@ -9842,7 +9842,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1428E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6949E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2337E-01 @@ -11005,7 +11005,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1568E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.7010E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2713E-01 @@ -12168,7 +12168,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1696E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6863E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2391E-01 @@ -13331,7 +13331,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1690E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6900E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2221E-01 @@ -14494,7 +14494,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1807E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6986E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2611E-01 @@ -15657,7 +15657,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1919E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6811E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2685E-01 @@ -16820,7 +16820,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.2037E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6629E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2763E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 83402ce063..53e3256b54 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -392,7 +392,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -1387,7 +1387,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -2382,7 +2382,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -3377,7 +3377,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -4372,7 +4372,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -5367,7 +5367,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -6362,7 +6362,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -7357,7 +7357,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 @@ -8352,7 +8352,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index db68895533..9f5a816360 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2160,7 +2160,7 @@ 165.0, 170.0 ], - "gamcd": 0.0, + "eta_cd_norm_hcd_primary": 0.0, "ejima_coeff": 0.4, "eta_cd_norm_ecrh": 0.35, "gamma_he": 1.667, @@ -9650,7 +9650,7 @@ "fzmin": "Minimum impurity fraction necessary for detachment. This is the impurity at the SOL/Div.", "gain": "IFE target gain", "gainve": "IFE target gain vs driver energy (`ifedrv=-1`)", - "gamcd": "normalised current drive efficiency (1.0e20 A/(W m^2))", + "eta_cd_norm_hcd_primary": "normalised current drive efficiency (1.0e20 A/(W m^2))", "ejima_coeff": "Ejima coefficient for resistive startup V-s formula", "eta_cd_norm_ecrh": "User input ECRH gamma (1.0e20 A/(W m^2))", "gamma_he": "ratio of specific heats for helium (`i_coolant_pumping=3`)", @@ -17643,7 +17643,7 @@ "f_p_beam_orbit_loss", "frbeam", "f_beam_tritium", - "gamcd", + "eta_cd_norm_hcd_primary", "eta_cd_norm_ecrh", "xi_ebw", "i_hcd_primary", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 54f11141bc..ea0bc8353b 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2662,7 +2662,7 @@ irfcd = 1 *icc = 37 * DESCRIPTION: Constraint equation for current drive gamma upper limit * JUSTIFICATION: Turned off, do not care about maximum current drive gamma -* VARIABLES: gamcd(1.0e20 A/W-m2) calculated in-situ +* VARIABLES: eta_cd_norm_hcd_primary(1.0e20 A/W-m2) calculated in-situ *gammax = * DESCRIPTION: Maximum current drive gamma (icc = 37) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 8f9876aeb6..ba0fd29b37 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -534,7 +534,7 @@ Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0141E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.2041E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6799E-02 OP - Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (gamcd)_______________________ 3.0000E-01 OP + Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2290E-01 diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 675ccce38a..20a127c026 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -55,7 +55,7 @@ class CudrivParam(NamedTuple): f_p_beam_shine_through: Any = None - gamcd: Any = None + eta_cd_norm_hcd_primary: Any = None eta_cd_norm_ecrh: Any = None @@ -220,7 +220,7 @@ class CudrivParam(NamedTuple): feffcd=1, f_p_beam_injected_ions=0.5, f_p_beam_shine_through=0, - gamcd=0, + eta_cd_norm_hcd_primary=0, eta_cd_norm_ecrh=0.30000000000000004, eta_lowhyb_injector_wall_plug=0.29999999999999999, etacd=0, @@ -310,7 +310,7 @@ class CudrivParam(NamedTuple): feffcd=1, f_p_beam_injected_ions=0.5, f_p_beam_shine_through=0, - gamcd=0.30000000000000004, + eta_cd_norm_hcd_primary=0.30000000000000004, eta_cd_norm_ecrh=0.30000000000000004, eta_lowhyb_injector_wall_plug=0.29999999999999999, etacd=0.5, @@ -446,7 +446,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.f_p_beam_shine_through, ) - monkeypatch.setattr(current_drive_variables, "gamcd", cudrivparam.gamcd) + monkeypatch.setattr( + current_drive_variables, + "eta_cd_norm_hcd_primary", + cudrivparam.eta_cd_norm_hcd_primary, + ) monkeypatch.setattr( current_drive_variables, "eta_cd_norm_ecrh", cudrivparam.eta_cd_norm_ecrh @@ -636,7 +640,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): assert current_drive_variables.echpwr == pytest.approx(cudrivparam.expected_echpwr) - assert current_drive_variables.gamcd == pytest.approx(cudrivparam.expected_gamcd) + assert current_drive_variables.eta_cd_norm_hcd_primary == pytest.approx( + cudrivparam.expected_gamcd + ) assert current_drive_variables.etacd == pytest.approx(cudrivparam.expected_etacd) From 9caf0c1575d4e272d7fb8ecfeb643e12baa1adb7 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 16:16:51 +0100 Subject: [PATCH 40/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20effcd=20to=20eta?= =?UTF-8?q?=5Fcd=5Fhcd=5Fprimary=20for=20clarity=20and=20consistency=20in?= =?UTF-8?q?=20current=20drive=20efficiency=20variables?= 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/current_drive.py | 30 +++++++++---------- process/io/plot_proc.py | 2 +- process/io/variable_metadata.py | 2 +- source/fortran/current_drive_variables.f90 | 2 +- .../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_current_drive.py | 10 +++---- 20 files changed, 70 insertions(+), 70 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index a73bbae2b3..470383e3ae 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -538,7 +538,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0990E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 9.8586E+03 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6299E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6299E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 4970395371..ac41c9ba79 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -536,7 +536,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 4fd607cef7..519fe5f9e4 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -536,7 +536,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 9cf543ae26..c63ba764ba 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -536,7 +536,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 9c1961343d..bcd6cfa01e 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -536,7 +536,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 0b13712166..07d2106068 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -391,7 +391,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -1386,7 +1386,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -2381,7 +2381,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -3376,7 +3376,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -4371,7 +4371,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -5366,7 +5366,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -6361,7 +6361,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -7356,7 +7356,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -8351,7 +8351,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/process/current_drive.py b/process/current_drive.py index adbcba9da3..795d6ebfac 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -383,7 +383,7 @@ def cudriv(self, output: bool): / (physics_variables.rmajor * dene20) * current_drive_variables.feffcd ) - current_drive_variables.effcd = effrfss + current_drive_variables.eta_cd_hcd_primary = effrfss # Ion-Cyclotron current drive elif current_drive_variables.i_hcd_primary == 2: effrfss = ( @@ -394,7 +394,7 @@ def cudriv(self, output: bool): / (physics_variables.rmajor * dene20) * current_drive_variables.feffcd ) - current_drive_variables.effcd = effrfss + current_drive_variables.eta_cd_hcd_primary = effrfss # Fenstermacher Electron Cyclotron Resonance model elif current_drive_variables.i_hcd_primary == 3: effrfss = ( @@ -403,7 +403,7 @@ def cudriv(self, output: bool): / (physics_variables.rmajor * dene20 * physics_variables.dlamee) * current_drive_variables.feffcd ) - current_drive_variables.effcd = effrfss + current_drive_variables.eta_cd_hcd_primary = effrfss # Ehst Lower Hybrid / Fast Wave current drive elif current_drive_variables.i_hcd_primary == 4: effrfss = ( @@ -421,7 +421,7 @@ def cudriv(self, output: bool): / 12.507e0 * current_drive_variables.feffcd ) - current_drive_variables.effcd = effrfss + current_drive_variables.eta_cd_hcd_primary = effrfss # ITER Neutral Beam current drive elif current_drive_variables.i_hcd_primary == 5: ( @@ -430,17 +430,17 @@ def cudriv(self, output: bool): current_drive_variables.f_p_beam_shine_through, ) = self.iternb() effnbss = effnbss * current_drive_variables.feffcd - current_drive_variables.effcd = effnbss + current_drive_variables.eta_cd_hcd_primary = effnbss # Culham Lower Hybrid current drive model elif current_drive_variables.i_hcd_primary == 6: effrfss = self.cullhy() effrfss = effrfss * current_drive_variables.feffcd - current_drive_variables.effcd = effrfss + current_drive_variables.eta_cd_hcd_primary = effrfss # Culham ECCD model elif current_drive_variables.i_hcd_primary == 7: effrfss = self.culecd() effrfss = effrfss * current_drive_variables.feffcd - current_drive_variables.effcd = effrfss + current_drive_variables.eta_cd_hcd_primary = effrfss # Culham Neutral Beam model elif current_drive_variables.i_hcd_primary == 8: ( @@ -449,7 +449,7 @@ def cudriv(self, output: bool): current_drive_variables.f_p_beam_shine_through, ) = self.culnbi() effnbss = effnbss * current_drive_variables.feffcd - current_drive_variables.effcd = effnbss + current_drive_variables.eta_cd_hcd_primary = effnbss # ECRH user input gamma elif current_drive_variables.i_hcd_primary == 10: current_drive_variables.eta_cd_norm_hcd_primary = ( @@ -460,7 +460,7 @@ def cudriv(self, output: bool): effrfss = current_drive_variables.eta_cd_norm_hcd_primary / ( dene20 * physics_variables.rmajor ) - current_drive_variables.effcd = effrfss + current_drive_variables.eta_cd_hcd_primary = effrfss # EBW scaling elif current_drive_variables.i_hcd_primary == 12: # Scaling author Simon Freethy @@ -475,7 +475,7 @@ def cudriv(self, output: bool): effrfss = current_drive_variables.eta_cd_norm_hcd_primary / ( dene20 * physics_variables.rmajor ) - current_drive_variables.effcd = effrfss + current_drive_variables.eta_cd_hcd_primary = effrfss # EBWs can only couple to plasma if cyclotron harmonic is above plasma density cut-off; # this behaviour is captured in the following function (ref issue #1262): # current_drive_variables.harnum = cyclotron harmonic number (fundamental used as default) @@ -504,8 +504,8 @@ def cudriv(self, output: bool): 1.0e0 + np.tanh((2.0e0 / a) * ((fp - fc) / fp - a)) ) - current_drive_variables.effcd = ( - current_drive_variables.effcd * density_factor + current_drive_variables.eta_cd_hcd_primary = ( + current_drive_variables.eta_cd_hcd_primary * density_factor ) effrfss = effrfss * density_factor @@ -564,7 +564,7 @@ def cudriv(self, output: bool): * ((current_drive_variables.harnum * fc - f_cutoff) / fp - a) ) ) - current_drive_variables.effcd = effrfss * cutoff_factor + current_drive_variables.eta_cd_hcd_primary = effrfss * cutoff_factor else: raise ProcessValueError( f"Current drive switch is invalid: {current_drive_variables.i_hcd_primary = }" @@ -878,8 +878,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Current drive efficiency (A/W)", - "(effcd)", - current_drive_variables.effcd, + "(eta_cd_hcd_primary)", + current_drive_variables.eta_cd_hcd_primary, "OP ", ) po.ovarre( diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 7ae357d8dc..f269603a17 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3129,7 +3129,7 @@ def plot_current_drive_info(axis, mfile_data, scan): ("inductive_current_fraction", "Inductive fraction", ""), ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"), ( - "effcd", + "eta_cd_hcd_primary", "Current drive efficiency", "A W$^{-1}$", ), diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index dc6fc3b665..ba286b0628 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -228,7 +228,7 @@ class VariableMetadata: "pheat": VariableMetadata( latex=r"$ P_{\mathrm{heat}}$ [$MW$]", description="Heat power", units="MW" ), - "effcd": VariableMetadata( + "eta_cd_hcd_primary": VariableMetadata( latex=r"$\eta_{\mathrm{CD}}$[$A/W$]", description="CD efficiency", units="A/W" ), "bigq": VariableMetadata(latex=r"$Q$", description="Plasma Q value", units=""), diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 6b0c8f07fd..eff16f575e 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -84,7 +84,7 @@ module current_drive_variables real(dp) :: echwpow !! ECH wall plug power (MW) - real(dp) :: effcd + real(dp) :: eta_cd_hcd_primary !! current drive efficiency (A/W) real(dp) :: harnum diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 2eb5ecaf4a..972ad774e5 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -535,7 +535,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 761747c5b9..a9ae8b9591 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -536,7 +536,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index d1f06d2c37..ca6cb51d97 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -536,7 +536,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 01200db0b6..81580aae61 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -536,7 +536,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6488E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 1b9e5fea14..634128e130 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -533,7 +533,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0141E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.2041E+05 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6799E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6799E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 64dfad8d63..16c50a3aaf 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -537,7 +537,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1129E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6662E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6662E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -1700,7 +1700,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1326E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6483E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6483E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -2863,7 +2863,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1272E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.5902E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6344E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6344E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -4026,7 +4026,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1468E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6548E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6548E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -5189,7 +5189,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1502E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6564E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6564E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -6352,7 +6352,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1436E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6722E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6722E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -7515,7 +7515,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1481E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6916E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6916E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -8678,7 +8678,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1510E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6867E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6867E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -9841,7 +9841,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1428E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6949E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6949E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -11004,7 +11004,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1568E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.7010E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.7010E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -12167,7 +12167,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1696E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6863E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6863E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -13330,7 +13330,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1690E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6900E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6900E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -14493,7 +14493,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1807E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6986E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6986E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -15656,7 +15656,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1919E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6811E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6811E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -16819,7 +16819,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.2037E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6629E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6629E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 53e3256b54..703958f312 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -391,7 +391,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -1386,7 +1386,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -2381,7 +2381,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -3376,7 +3376,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -4371,7 +4371,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -5366,7 +5366,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -6361,7 +6361,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -7356,7 +7356,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 @@ -8351,7 +8351,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.5950E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9f5a816360..fe5b66f11a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1720,7 +1720,7 @@ "echwpow": 0.0, "edrive": 5000000.0, "eff_tf_cryo": -1.0, - "effcd": 0.0, + "eta_cd_hcd_primary": 0.0, "efloor": 0.0, "eightemi": 0.0, "eightemi48": 0.0, @@ -9324,7 +9324,7 @@ "echwpow": "ECH wall plug power (MW)", "edrive": "IFE driver energy (J) (`iteration variable 81`)", "eff_tf_cryo": "TF cryoplant efficiency (compared to pefect Carnot cycle).\n Using -1 set the default value depending on magnet technology:\n
      \n
    • i_tf_sup = 1 : SC magnet, eff_tf_cryo = 0.13 (ITER design)
      • \n
    • i_tf_sup = 2 : Cryo-aluminium, eff_tf_cryo = 0.4
      • \n
    ", - "effcd": "current drive efficiency (A/W)", + "eta_cd_hcd_primary": "current drive efficiency (A/W)", "efloor": "effective total floor space (m2)", "eightemi": "", "eightemi48": "", @@ -17627,7 +17627,7 @@ "diaipf", "echpwr", "echwpow", - "effcd", + "eta_cd_hcd_primary", "harnum", "e_beam_kev", "etacd", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index ba0fd29b37..c9fff1c75b 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -533,7 +533,7 @@ Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0141E+01 OP Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.2041E+05 OP - Current_drive_efficiency_(A/W)__________________________________________ (effcd)_______________________ 4.6799E-02 OP + Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6799E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 20a127c026..113e75d3ab 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -77,7 +77,7 @@ class CudrivParam(NamedTuple): e_beam_kev: Any = None - effcd: Any = None + eta_cd_hcd_primary: Any = None pwplh: Any = None @@ -231,7 +231,7 @@ class CudrivParam(NamedTuple): pwpnb=0, eta_beam_injector_wall_plug=0.29999999999999999, e_beam_kev=1000, - effcd=0, + eta_cd_hcd_primary=0, pwplh=0, echwpow=0, p_beam_injected=0, @@ -321,7 +321,7 @@ class CudrivParam(NamedTuple): pwpnb=0, eta_beam_injector_wall_plug=0.29999999999999999, e_beam_kev=1000, - effcd=0.05000000000000001, + eta_cd_hcd_primary=0.05000000000000001, pwplh=0, echwpow=240.99200038011492, p_beam_injected=0, @@ -492,7 +492,7 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "e_beam_kev", cudrivparam.e_beam_kev) - monkeypatch.setattr(current_drive_variables, "effcd", cudrivparam.effcd) + monkeypatch.setattr(current_drive_variables, "eta_cd_hcd_primary", cudrivparam.eta_cd_hcd_primary) monkeypatch.setattr(current_drive_variables, "pwplh", cudrivparam.pwplh) @@ -650,7 +650,7 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.expected_p_hcd_injected_total_mw ) - assert current_drive_variables.effcd == pytest.approx(cudrivparam.expected_effcd) + assert current_drive_variables.eta_cd_hcd_primary == pytest.approx(cudrivparam.expected_effcd) assert current_drive_variables.echwpow == pytest.approx( cudrivparam.expected_echwpow From ea1994d5d4335f880e92c1c49b7bd430cb3f43c8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 3 Apr 2025 16:18:51 +0100 Subject: [PATCH 41/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20effcdfix=20to=20e?= =?UTF-8?q?ta=5Fcd=5Fhcd=5Fsecondary=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20in=20secondary=20current=20drive=20efficiency=20calculations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 28 ++++++++++++++-------------- tests/unit/test_current_drive.py | 8 ++++++-- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index 795d6ebfac..d650c1c4c6 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -79,7 +79,7 @@ def cudriv(self, output: bool): / (physics_variables.rmajor * dene20) * current_drive_variables.feffcd ) - effcdfix = effrfssfix + eta_cd_hcd_secondary = effrfssfix # Ion-Cyclotron current drive elif current_drive_variables.i_hcd_secondary == 2: effrfssfix = ( @@ -90,7 +90,7 @@ def cudriv(self, output: bool): / (physics_variables.rmajor * dene20) * current_drive_variables.feffcd ) - effcdfix = effrfssfix + eta_cd_hcd_secondary = effrfssfix # Fenstermacher Electron Cyclotron Resonance model elif current_drive_variables.i_hcd_secondary == 3: effrfssfix = ( @@ -99,7 +99,7 @@ def cudriv(self, output: bool): / (physics_variables.rmajor * dene20 * physics_variables.dlamee) * current_drive_variables.feffcd ) - effcdfix = effrfssfix + eta_cd_hcd_secondary = effrfssfix # Ehst Lower Hybrid / Fast Wave current drive elif current_drive_variables.i_hcd_secondary == 4: effrfssfix = ( @@ -117,7 +117,7 @@ def cudriv(self, output: bool): / 12.507e0 * current_drive_variables.feffcd ) - effcdfix = effrfssfix + eta_cd_hcd_secondary = effrfssfix elif current_drive_variables.i_hcd_secondary == 5: ( effnbss, @@ -125,17 +125,17 @@ def cudriv(self, output: bool): current_drive_variables.f_p_beam_shine_through, ) = self.iternb() effnbssfix = effnbss * current_drive_variables.feffcd - effcdfix = effnbssfix + eta_cd_hcd_secondary = effnbssfix # Culham Lower Hybrid current drive model elif current_drive_variables.i_hcd_secondary == 6: effrfss = self.cullhy() effrfssfix = effrfss * current_drive_variables.feffcd - effcdfix = effrfssfix + eta_cd_hcd_secondary = effrfssfix # Culham ECCD model elif current_drive_variables.i_hcd_secondary == 7: effrfss = self.culecd() effrfssfix = effrfss * current_drive_variables.feffcd - effcdfix = effrfssfix + eta_cd_hcd_secondary = effrfssfix # Culham Neutral Beam model elif current_drive_variables.i_hcd_secondary == 8: ( @@ -144,7 +144,7 @@ def cudriv(self, output: bool): current_drive_variables.f_p_beam_shine_through, ) = self.culnbi() effnbssfix = effnbss * current_drive_variables.feffcd - effcdfix = effnbssfix + eta_cd_hcd_secondary = effnbssfix # ECRH user input gamma elif current_drive_variables.i_hcd_secondary == 10: # Normalised current drive efficiency gamma @@ -156,7 +156,7 @@ def cudriv(self, output: bool): effrfssfix = current_drive_variables.eta_cd_norm_hcd_secondary / ( dene20 * physics_variables.rmajor ) - effcdfix = effrfssfix + eta_cd_hcd_secondary = effrfssfix # EBW scaling elif current_drive_variables.i_hcd_secondary == 12: # Scaling author Simon Freethy @@ -170,7 +170,7 @@ def cudriv(self, output: bool): effrfssfix = current_drive_variables.eta_cd_norm_hcd_secondary / ( dene20 * physics_variables.rmajor ) - effcdfix = effrfssfix + eta_cd_hcd_secondary = effrfssfix # EBWs can only couple to plasma if cyclotron harmonic is above plasma density cut-off; # this behaviour is captured in the following function (ref issue #1262): @@ -200,7 +200,7 @@ def cudriv(self, output: bool): 1.0e0 + np.tanh((2.0e0 / a) * ((fp - fc) / fp - a)) ) - effcdfix = effcdfix * density_factor + eta_cd_hcd_secondary = eta_cd_hcd_secondary * density_factor effrfssfix = effrfssfix * density_factor elif current_drive_variables.i_hcd_secondary == 13: # ECCD model for O-mode cut-off with added Te and Zeff dependance @@ -257,7 +257,7 @@ def cudriv(self, output: bool): * ((current_drive_variables.harnum * fc - f_cutoff) / fp - a) ) ) - effcdfix = effrfssfix * cutoff_factor + eta_cd_hcd_secondary = effrfssfix * cutoff_factor elif current_drive_variables.i_hcd_secondary != 0: raise ProcessValueError( f"Current drive switch is invalid: {current_drive_variables.i_hcd_secondary = }" @@ -929,8 +929,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Secondary current drive efficiency (A/W)", - "(effcdfix)", - effcdfix, + "(eta_cd_hcd_secondary)", + eta_cd_hcd_secondary, "OP ", ) po.ovarre( diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 113e75d3ab..06aa149fa2 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -492,7 +492,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "e_beam_kev", cudrivparam.e_beam_kev) - monkeypatch.setattr(current_drive_variables, "eta_cd_hcd_primary", cudrivparam.eta_cd_hcd_primary) + monkeypatch.setattr( + current_drive_variables, "eta_cd_hcd_primary", cudrivparam.eta_cd_hcd_primary + ) monkeypatch.setattr(current_drive_variables, "pwplh", cudrivparam.pwplh) @@ -650,7 +652,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.expected_p_hcd_injected_total_mw ) - assert current_drive_variables.eta_cd_hcd_primary == pytest.approx(cudrivparam.expected_effcd) + assert current_drive_variables.eta_cd_hcd_primary == pytest.approx( + cudrivparam.expected_effcd + ) assert current_drive_variables.echwpow == pytest.approx( cudrivparam.expected_echwpow From f29ca5aa0941c5c986f8e0be21859e12f2f571f3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 10:12:33 +0100 Subject: [PATCH 42/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20harnum=20to=20n?= =?UTF-8?q?=5Fecrh=5Fharmonic=20for=20clarity=20and=20consistency=20in=20c?= =?UTF-8?q?urrent=20drive=20variables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RF/cutoff_ecrh.md | 6 ++-- .../RF/ebw_freethy.md | 4 +-- process/current_drive.py | 34 +++++++++++++------ process/input.py | 4 ++- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 10 +++--- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_current_drive.py | 10 +++--- 9 files changed, 46 insertions(+), 28 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md index 92af22f8bd..99da123282 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/cutoff_ecrh.md @@ -9,7 +9,7 @@ | `rmajor`, $R_0$ | Major radius $\left[\text{m}\right]$ | | `bt`, $B_{\text{T}}$ | Toroidal magnetic field $\left[\text{T}\right]$ | | `zeff`, $Z_{\text{eff}}$ | Effective charge | -| `harnum` | Harmonic number | +| `n_ecrh_harmonic` | Harmonic number | | `mode` | RF mode | ---- @@ -43,14 +43,14 @@ $$ For the X-mode case: $$ -\mathtt{f_{cutoff}} = 0.5\left(\mathtt{fc}+\sqrt{\mathtt{harnum}\times\mathtt{fc}^2+4\mathtt{fp}^2}\right) +\mathtt{f_{cutoff}} = 0.5\left(\mathtt{fc}+\sqrt{\mathtt{n_ecrh_harmonic}\times\mathtt{fc}^2+4\mathtt{fp}^2}\right) $$ Plasma coupling only occurs if the plasma cut-off is below the cyclotron harmonic (a = 0.1). This controls how sharply the transition is reached $$ -\mathtt{cutoff_{factor}} = 0.5\left(1+\tanh\left({\left(\frac{2}{a}\right)((\mathtt{harnum}\times \mathtt{fc} -\mathtt{f_cutoff})/\mathtt{fp -a })}\right)\right) +\mathtt{cutoff_{factor}} = 0.5\left(1+\tanh\left({\left(\frac{2}{a}\right)((\mathtt{n_ecrh_harmonic}\times \mathtt{fc} -\mathtt{f_cutoff})/\mathtt{fp -a })}\right)\right) $$ $$ diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ebw_freethy.md b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ebw_freethy.md index 58c898ee41..7a4708ab73 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ebw_freethy.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/RF/ebw_freethy.md @@ -37,7 +37,7 @@ $$ The EBWs can only couple to the plasma if the cyclotron harmonic is above the plasma density cut-off. In order to capture this behaviour, we introduce an ad-hoc model which reduces the plasma current up to this condition, by way of a tanh function: -Where $\mathtt{fp}$ is the plasma frequency, $\mathtt{fc}$ is the cyclotron frequency, $\mathtt{harnum}$ is the harmonic number and $a$ is a free parameter which defines the sharpness of the transition. +Where $\mathtt{fp}$ is the plasma frequency, $\mathtt{fc}$ is the cyclotron frequency, $\mathtt{n_ecrh_harmonic}$ is the harmonic number and $a$ is a free parameter which defines the sharpness of the transition. The effect of this factor can be seen below: @@ -46,7 +46,7 @@ a = 0.1 $$ $$ -\mathtt{fc} = \frac{\frac{1}{2\pi}\times \mathtt{harnum} \times e B_{\text{T}}}{m_{\text{e}}} +\mathtt{fc} = \frac{\frac{1}{2\pi}\times \mathtt{n_ecrh_harmonic} \times e B_{\text{T}}}{m_{\text{e}}} $$ $$ diff --git a/process/current_drive.py b/process/current_drive.py index d650c1c4c6..5c851d95ab 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -174,14 +174,14 @@ def cudriv(self, output: bool): # EBWs can only couple to plasma if cyclotron harmonic is above plasma density cut-off; # this behaviour is captured in the following function (ref issue #1262): - # current_drive_variables.harnum = cyclotron harmonic number (fundamental used as default) + # current_drive_variables.n_ecrh_harmonic = cyclotron harmonic number (fundamental used as default) # constant 'a' controls sharpness of transition a = 0.1e0 fc = ( 1.0e0 / (2.0e0 * np.pi) - * current_drive_variables.harnum + * current_drive_variables.n_ecrh_harmonic * constants.electron_charge * physics_variables.bt / constants.electron_mass @@ -245,7 +245,10 @@ def cudriv(self, output: bool): # X-mode case elif current_drive_variables.i_ecrh_wave_mode == 1: f_cutoff = 0.5 * ( - fc + np.sqrt(current_drive_variables.harnum * fc**2 + 4 * fp**2) + fc + + np.sqrt( + current_drive_variables.n_ecrh_harmonic * fc**2 + 4 * fp**2 + ) ) # Plasma coupling only occurs if the plasma cut-off is below the cyclotron harmonic @@ -254,7 +257,11 @@ def cudriv(self, output: bool): 1 + np.tanh( (2 / (a)) - * ((current_drive_variables.harnum * fc - f_cutoff) / fp - a) + * ( + (current_drive_variables.n_ecrh_harmonic * fc - f_cutoff) + / fp + - a + ) ) ) eta_cd_hcd_secondary = effrfssfix * cutoff_factor @@ -478,14 +485,14 @@ def cudriv(self, output: bool): current_drive_variables.eta_cd_hcd_primary = effrfss # EBWs can only couple to plasma if cyclotron harmonic is above plasma density cut-off; # this behaviour is captured in the following function (ref issue #1262): - # current_drive_variables.harnum = cyclotron harmonic number (fundamental used as default) + # current_drive_variables.n_ecrh_harmonic = cyclotron harmonic number (fundamental used as default) # contant 'a' controls sharpness of transition a = 0.1e0 fc = ( 1.0e0 / (2.0e0 * np.pi) - * current_drive_variables.harnum + * current_drive_variables.n_ecrh_harmonic * constants.electron_charge * physics_variables.bt / constants.electron_mass @@ -552,7 +559,10 @@ def cudriv(self, output: bool): # X-mode case elif current_drive_variables.i_ecrh_wave_mode == 1: f_cutoff = 0.5 * ( - fc + np.sqrt(current_drive_variables.harnum * fc**2 + 4 * fp**2) + fc + + np.sqrt( + current_drive_variables.n_ecrh_harmonic * fc**2 + 4 * fp**2 + ) ) # Plasma coupling only occurs if the plasma cut-off is below the cyclotron harmonic @@ -561,7 +571,11 @@ def cudriv(self, output: bool): 1 + np.tanh( (2 / (a)) - * ((current_drive_variables.harnum * fc - f_cutoff) / fp - a) + * ( + (current_drive_variables.n_ecrh_harmonic * fc - f_cutoff) + / fp + - a + ) ) ) current_drive_variables.eta_cd_hcd_primary = effrfss * cutoff_factor @@ -914,8 +928,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "EC harmonic number", - "(harnum)", - current_drive_variables.harnum, + "(n_ecrh_harmonic)", + current_drive_variables.n_ecrh_harmonic, ) if current_drive_variables.i_hcd_primary == 13: po.ovarin( diff --git a/process/input.py b/process/input.py index c42b17c8d8..0a35860cd4 100644 --- a/process/input.py +++ b/process/input.py @@ -745,7 +745,9 @@ def __post_init__(self): "ground_clrnc": InputVariable( fortran.buildings_variables, float, range=(0.0, 10.0) ), - "harnum": InputVariable(fortran.current_drive_variables, float, range=(1.0, 10.0)), + "n_ecrh_harmonic": InputVariable( + fortran.current_drive_variables, float, range=(1.0, 10.0) + ), "hastelloy_thickness": InputVariable( fortran.rebco_variables, float, range=(1e-08, 0.001) ), diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index eff16f575e..091c1e2a34 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -87,7 +87,7 @@ module current_drive_variables real(dp) :: eta_cd_hcd_primary !! current drive efficiency (A/W) - real(dp) :: harnum + real(dp) :: n_ecrh_harmonic !! cyclotron harmonic frequency number, used in cut-off function integer :: i_ecrh_wave_mode diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index fe5b66f11a..a8d768e0f5 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2186,7 +2186,7 @@ "z_cp_top": 0.0, "h_ib": 0.0, "h_ob": 0.0, - "harnum": 1.0, + "n_ecrh_harmonic": 1.0, "hastelloy": null, "hastelloy_area": 0.0, "hastelloy_thickness": 5e-05, @@ -9675,7 +9675,7 @@ "z_cp_top": "Vertical distance from the midplane to the top of the tapered section [m]", "h_ib": "", "h_ob": "", - "harnum": "cyclotron harmonic frequency number, used in EBW cut-off", + "n_ecrh_harmonic": "cyclotron harmonic frequency number, used in EBW cut-off", "hastelloy": "", "hastelloy_area": "", "hastelloy_thickness": "thickness of Hastelloy layer in tape (m)", @@ -12987,7 +12987,7 @@ "lb": 0, "ub": 2 }, - "harnum": { + "n_ecrh_harmonic": { "lb": 1.0, "ub": 10.0 }, @@ -17628,7 +17628,7 @@ "echpwr", "echwpow", "eta_cd_hcd_primary", - "harnum", + "n_ecrh_harmonic", "e_beam_kev", "etacd", "etacdfix", @@ -20186,7 +20186,7 @@ "gas_buildings_w": "real_variable", "ground_clrnc": "real_variable", "gtscale": "int_variable", - "harnum": "real_variable", + "n_ecrh_harmonic": "real_variable", "hastelloy_thickness": "real_variable", "hccl": "real_variable", "hcd_building_h": "real_variable", diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 1752bc72d5..6a81295c4f 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -195,7 +195,7 @@ output_costs = 1 * Switch for costs output; *-------------Current Drive Variables--------------* f_c_plasma_bootstrap_max = 0.9 * maximum fraction of plasma current from bootstrap; if `f_c_plasma_bootstrap_max < 0`; -harnum = 2 * cyclotron harmonic frequency number; used in cut-off function +n_ecrh_harmonic = 2 * cyclotron harmonic frequency number; used in cut-off function i_ecrh_wave_mode = 0 * Switch for ECRH wave mode ; eta_ecrh_injector_wall_plug = 0.45 * ECH wall plug to injector efficiency feffcd = 1.0 * current drive efficiency fudge factor (`iteration variable 47`) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index ea0bc8353b..8a6fd5e8d0 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2817,7 +2817,7 @@ feffcd = 1.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Radio Frequency Heating ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -harnum = 2 +n_ecrh_harmonic = 2 * DESCRIPTION: Cyclotron harmonic frequency number * JUSTIFICATION: Not set assuming default ==2 diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 06aa149fa2..b7e305be4a 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -115,7 +115,7 @@ class CudrivParam(NamedTuple): plasma_current_internal_fraction: Any = None - harnum: Any = None + n_ecrh_harmonic: Any = None xi_ebw: Any = None @@ -250,7 +250,7 @@ class CudrivParam(NamedTuple): f_c_plasma_diamagnetic=0, f_c_plasma_pfirsch_schluter=0, plasma_current_internal_fraction=0.27635918746616817, - harnum=1, + n_ecrh_harmonic=1, xi_ebw=0.80000000000000004, dene=7.5e19, te=12, @@ -340,7 +340,7 @@ class CudrivParam(NamedTuple): f_c_plasma_diamagnetic=0, f_c_plasma_pfirsch_schluter=0, plasma_current_internal_fraction=0.27635918746616817, - harnum=1, + n_ecrh_harmonic=1, xi_ebw=0.80000000000000004, dene=7.5e19, te=12, @@ -566,7 +566,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.plasma_current_internal_fraction, ) - monkeypatch.setattr(current_drive_variables, "harnum", cudrivparam.harnum) + monkeypatch.setattr( + current_drive_variables, "n_ecrh_harmonic", cudrivparam.n_ecrh_harmonic + ) monkeypatch.setattr(current_drive_variables, "xi_ebw", cudrivparam.xi_ebw) From 3416db49cd783f36cd443782694e5af97c5c8319 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 10:39:24 +0100 Subject: [PATCH 43/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20pinjfixmw=20to=20?= =?UTF-8?q?p=5Fhcd=5Fsecondary=5Finjected=5Fmw=20for=20clarity=20and=20con?= =?UTF-8?q?sistency=20in=20current=20drive=20variables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating-and-current-drive.md | 2 +- process/current_drive.py | 27 +++++++++++-------- process/input.py | 2 +- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 10 +++---- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_current_drive.py | 12 ++++++--- 7 files changed, 33 insertions(+), 24 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md index 9c490a1ce3..073d9bc964 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md @@ -32,7 +32,7 @@ Similarly the lower bound on required heating and current drive power can be set ### Secondary current drive It is possible to have more than one type of heating and current drive system in `PROCESS`. This can be enabled by setting the `i_hcd_secondary` switch to the desired current drive scheme, following the same numbered selection for `i_hcd_primary`. -The power injected by the secondary current drive scheme has to be set to a fixed value. This value can be set with the `pinjfixmw` variable. +The power injected by the secondary current drive scheme has to be set to a fixed value. This value can be set with the `p_hcd_secondary_injected_mw` variable. ## Plasma heating only diff --git a/process/current_drive.py b/process/current_drive.py index 5c851d95ab..59713953cf 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -57,8 +57,13 @@ def cudriv(self, output: bool): # check for unphysically large heating in # secondary injected power source - if current_drive_variables.pheatfix > current_drive_variables.pinjfixmw: - current_drive_variables.pheatfix = current_drive_variables.pinjfixmw + if ( + current_drive_variables.pheatfix + > current_drive_variables.p_hcd_secondary_injected_mw + ): + current_drive_variables.pheatfix = ( + current_drive_variables.p_hcd_secondary_injected_mw + ) # current_drive_variables.irfcd | switch for current drive calculation # = 0 | turned off @@ -272,11 +277,11 @@ def cudriv(self, output: bool): if current_drive_variables.i_hcd_secondary in [1, 2, 4, 6]: # Injected power - pinjemwfix = current_drive_variables.pinjfixmw + pinjemwfix = current_drive_variables.p_hcd_secondary_injected_mw # Wall plug power heat_transport_variables.pinjwpfix = ( - current_drive_variables.pinjfixmw + current_drive_variables.p_hcd_secondary_injected_mw / current_drive_variables.eta_lowhyb_injector_wall_plug ) @@ -292,7 +297,7 @@ def cudriv(self, output: bool): auxiliary_cdfix = ( effrfssfix * ( - current_drive_variables.pinjfixmw + current_drive_variables.p_hcd_secondary_injected_mw - current_drive_variables.pheatfix ) * 1.0e6 @@ -302,11 +307,11 @@ def cudriv(self, output: bool): ) elif current_drive_variables.i_hcd_secondary in [3, 7, 10, 12, 13]: # Injected power - pinjemwfix = current_drive_variables.pinjfixmw + pinjemwfix = current_drive_variables.p_hcd_secondary_injected_mw # Wall plug power heat_transport_variables.pinjwpfix = ( - current_drive_variables.pinjfixmw + current_drive_variables.p_hcd_secondary_injected_mw / current_drive_variables.eta_ecrh_injector_wall_plug ) @@ -319,7 +324,7 @@ def cudriv(self, output: bool): auxiliary_cdfix = ( effrfssfix * ( - current_drive_variables.pinjfixmw + current_drive_variables.p_hcd_secondary_injected_mw - current_drive_variables.pheatfix ) * 1.0e6 @@ -335,7 +340,7 @@ def cudriv(self, output: bool): 0.999, current_drive_variables.f_p_beam_orbit_loss ) # Should never be needed - pnbitotfix = current_drive_variables.pinjfixmw / ( + pnbitotfix = current_drive_variables.p_hcd_secondary_injected_mw / ( 1.0e0 - current_drive_variables.f_p_beam_orbit_loss + current_drive_variables.f_p_beam_orbit_loss @@ -374,7 +379,7 @@ def cudriv(self, output: bool): auxiliary_cdfix = ( effnbssfix * ( - current_drive_variables.pinjfixmw + current_drive_variables.p_hcd_secondary_injected_mw - current_drive_variables.pheatfix ) * 1.0e6 @@ -1308,7 +1313,7 @@ def cudriv(self, output: bool): "OP ", ) - if abs(current_drive_variables.pinjfixmw) > 1.0e-8: + if abs(current_drive_variables.p_hcd_secondary_injected_mw) > 1.0e-8: po.ovarrf( self.outfile, "Fixed ECRH power (MW)", diff --git a/process/input.py b/process/input.py index 0a35860cd4..6f89cc3d6d 100644 --- a/process/input.py +++ b/process/input.py @@ -971,7 +971,7 @@ def __post_init__(self): "p_hcd_injected_max": InputVariable( fortran.current_drive_variables, float, range=(0.0, 1000.0) ), - "pinjfixmw": InputVariable( + "p_hcd_secondary_injected_mw": InputVariable( fortran.current_drive_variables, float, range=(0.0, 1000.0) ), "pinjmax": InputVariable( diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 091c1e2a34..33bb4f2009 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -214,7 +214,7 @@ module current_drive_variables real(dp) :: p_hcd_injected_total_mw !! total auxiliary injected power (MW) - real(dp) :: pinjfixmw + real(dp) :: p_hcd_secondary_injected_mw !! secondary total fixed auxiliary injected power (MW) real(dp) :: plasma_current_internal_fraction diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a8d768e0f5..72e1971929 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3507,7 +3507,7 @@ "pifecr": 10.0, "p_hcd_injected_max": 150.0, "pinjemw": 0.0, - "pinjfixmw": 0.0, + "p_hcd_secondary_injected_mw": 0.0, "pinjht": 0.0, "pinjimw": 0.0, "pinjmax": 120.0, @@ -10230,7 +10230,7 @@ "pifecr": "IFE cryogenic power requirements (MW)", "p_hcd_injected_max": "maximum allowable value for injected power (MW) (`constraint equation 30`)", "pinjemw": "auxiliary injected power to electrons (MW)", - "pinjfixmw": "secondary total fixed auxiliary injected power (MW)", + "p_hcd_secondary_injected_mw": "secondary total fixed auxiliary injected power (MW)", "pinjht": "power dissipated in heating and current drive system (MW)", "pinjimw": "auxiliary injected power to ions (MW)", "pinjmax": "maximum injector power during pulse (heating and ramp-up/down phase) (MW)", @@ -13763,7 +13763,7 @@ "lb": 0.0, "ub": 1000.0 }, - "pinjfixmw": { + "p_hcd_secondary_injected_mw": { "lb": 0.0, "ub": 1000.0 }, @@ -17657,7 +17657,7 @@ "pinjemw", "pinjimw", "p_hcd_injected_total_mw", - "pinjfixmw", + "p_hcd_secondary_injected_mw", "plasipf", "plhybd", "pnbeam", @@ -20396,7 +20396,7 @@ "pibv": "real_variable", "pifecr": "real_variable", "p_hcd_injected_max": "real_variable", - "pinjfixmw": "real_variable", + "p_hcd_secondary_injected_mw": "real_variable", "pinjmax": "real_variable", "dx_fw_module": "real_variable", "plasma_res_factor": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 8a6fd5e8d0..edfb0881a4 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2725,7 +2725,7 @@ feffcd = 1.0 * DESCRIPTION: Switch for 2nd current drive efficiency model * JUSTIFICATION: Not used, ECRH only -*pinjfixmw = +*p_hcd_secondary_injected_mw = * DESCRIPTION: Secondary auxiliary injection power (MW) * JUSTIFICATION: Not used, ECRH only diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index b7e305be4a..670b3335f0 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -45,7 +45,7 @@ class CudrivParam(NamedTuple): pheatfix: Any = None - pinjfixmw: Any = None + p_hcd_secondary_injected_mw: Any = None irfcd: Any = None @@ -215,7 +215,7 @@ class CudrivParam(NamedTuple): i_hcd_secondary=0, pheat=75, pheatfix=0, - pinjfixmw=0, + p_hcd_secondary_injected_mw=0, irfcd=1, feffcd=1, f_p_beam_injected_ions=0.5, @@ -305,7 +305,7 @@ class CudrivParam(NamedTuple): i_hcd_secondary=0, pheat=75, pheatfix=0, - pinjfixmw=0, + p_hcd_secondary_injected_mw=0, irfcd=1, feffcd=1, f_p_beam_injected_ions=0.5, @@ -428,7 +428,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "pheatfix", cudrivparam.pheatfix) - monkeypatch.setattr(current_drive_variables, "pinjfixmw", cudrivparam.pinjfixmw) + monkeypatch.setattr( + current_drive_variables, + "p_hcd_secondary_injected_mw", + cudrivparam.p_hcd_secondary_injected_mw, + ) monkeypatch.setattr(current_drive_variables, "irfcd", cudrivparam.irfcd) From 4c78f742b606162f37c9dcf574da5cf4f82d4e82 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 10:40:50 +0100 Subject: [PATCH 44/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20plasma=5Fcurrent?= =?UTF-8?q?=5Finternal=5Ffraction=20to=20f=5Fc=5Fplasma=5Finternal=20for?= =?UTF-8?q?=20clarity=20and=20consistency=20in=20current=20drive=20calcula?= =?UTF-8?q?tions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 6 +++--- process/physics.py | 12 ++++++------ source/fortran/current_drive_variables.f90 | 2 +- tests/unit/test_current_drive.py | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index 59713953cf..b22ef25aa7 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -1006,14 +1006,14 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Total", - "(plasma_current_internal_fraction+aux_current_fraction+inductive_current_fraction)", - current_drive_variables.plasma_current_internal_fraction + "(f_c_plasma_internal+aux_current_fraction+inductive_current_fraction)", + current_drive_variables.f_c_plasma_internal + physics_variables.aux_current_fraction + physics_variables.inductive_current_fraction, ) if ( abs( - current_drive_variables.plasma_current_internal_fraction + current_drive_variables.f_c_plasma_internal + physics_variables.aux_current_fraction + physics_variables.inductive_current_fraction - 1.0e0 diff --git a/process/physics.py b/process/physics.py index 016b1817b7..f681311861 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1940,7 +1940,7 @@ def physics(self): current_drive_variables.f_c_plasma_bootstrap = abs( current_drive_variables.f_c_plasma_bootstrap_max ) - current_drive_variables.plasma_current_internal_fraction = ( + current_drive_variables.f_c_plasma_internal = ( current_drive_variables.f_c_plasma_bootstrap ) else: @@ -2007,7 +2007,7 @@ def physics(self): ) physics_module.err242 = 1 - current_drive_variables.plasma_current_internal_fraction = ( + current_drive_variables.f_c_plasma_internal = ( current_drive_variables.f_c_plasma_bootstrap + current_drive_variables.f_c_plasma_diamagnetic + current_drive_variables.f_c_plasma_pfirsch_schluter @@ -2020,11 +2020,11 @@ def physics(self): # the current drive proportion) physics_module.err243 = 0 if ( - current_drive_variables.plasma_current_internal_fraction + current_drive_variables.f_c_plasma_internal > physics_variables.fvsbrnni ): - current_drive_variables.plasma_current_internal_fraction = min( - current_drive_variables.plasma_current_internal_fraction, + current_drive_variables.f_c_plasma_internal = min( + current_drive_variables.f_c_plasma_internal, physics_variables.fvsbrnni, ) physics_module.err243 = 1 @@ -2036,7 +2036,7 @@ def physics(self): # Fraction of plasma current produced by auxiliary current drive physics_variables.aux_current_fraction = ( physics_variables.fvsbrnni - - current_drive_variables.plasma_current_internal_fraction + - current_drive_variables.f_c_plasma_internal ) # Auxiliary current drive power calculations diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 33bb4f2009..b9395cec5a 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -217,7 +217,7 @@ module current_drive_variables real(dp) :: p_hcd_secondary_injected_mw !! secondary total fixed auxiliary injected power (MW) - real(dp) :: plasma_current_internal_fraction + real(dp) :: f_c_plasma_internal !! plasma current fraction driven internally (Bootstrap + Diamagnetic + PS) real(dp) :: plhybd diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 670b3335f0..b3de592256 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -113,7 +113,7 @@ class CudrivParam(NamedTuple): f_c_plasma_pfirsch_schluter: Any = None - plasma_current_internal_fraction: Any = None + f_c_plasma_internal: Any = None n_ecrh_harmonic: Any = None @@ -249,7 +249,7 @@ class CudrivParam(NamedTuple): rtanmax=0, f_c_plasma_diamagnetic=0, f_c_plasma_pfirsch_schluter=0, - plasma_current_internal_fraction=0.27635918746616817, + f_c_plasma_internal=0.27635918746616817, n_ecrh_harmonic=1, xi_ebw=0.80000000000000004, dene=7.5e19, @@ -339,7 +339,7 @@ class CudrivParam(NamedTuple): rtanmax=13.179564451855533, f_c_plasma_diamagnetic=0, f_c_plasma_pfirsch_schluter=0, - plasma_current_internal_fraction=0.27635918746616817, + f_c_plasma_internal=0.27635918746616817, n_ecrh_harmonic=1, xi_ebw=0.80000000000000004, dene=7.5e19, @@ -566,8 +566,8 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr( current_drive_variables, - "plasma_current_internal_fraction", - cudrivparam.plasma_current_internal_fraction, + "f_c_plasma_internal", + cudrivparam.f_c_plasma_internal, ) monkeypatch.setattr( From 3c9927d19540ce48314c8a2582b42202959353ed Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 10:52:27 +0100 Subject: [PATCH 45/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20p=5Fbeam=5Finject?= =?UTF-8?q?ed=20to=20p=5Fbeam=5Finjected=5Fmw=20for=20clarity=20and=20cons?= =?UTF-8?q?istency=20in=20current=20drive=20power=20calculations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 2 +- process/current_drive.py | 16 ++++++++-------- process/physics.py | 8 ++------ source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_costs_1990.py | 8 ++++---- tests/unit/test_current_drive.py | 8 ++++---- 7 files changed, 23 insertions(+), 27 deletions(-) diff --git a/process/costs.py b/process/costs.py index c5d8276773..157ad6426d 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1839,7 +1839,7 @@ def acc223(self): self.c2233 = ( 1.0e-6 * cost_variables.ucnbi - * (1.0e6 * current_drive_variables.p_beam_injected) ** exprf + * (1.0e6 * current_drive_variables.p_beam_injected_mw) ** exprf ) if cost_variables.ifueltyp == 1: diff --git a/process/current_drive.py b/process/current_drive.py index b22ef25aa7..d876f8fc24 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -672,7 +672,7 @@ def cudriv(self, output: bool): 0.999, current_drive_variables.f_p_beam_orbit_loss ) # Should never be needed - current_drive_variables.p_beam_injected = power1 / ( + current_drive_variables.p_beam_injected_mw = power1 / ( 1.0e0 - current_drive_variables.f_p_beam_orbit_loss + current_drive_variables.f_p_beam_orbit_loss @@ -681,7 +681,7 @@ def cudriv(self, output: bool): # Shinethrough power (atoms that are not ionised) [MW]: current_drive_variables.p_beam_shine_through_mw = ( - current_drive_variables.p_beam_injected + current_drive_variables.p_beam_injected_mw * current_drive_variables.f_p_beam_shine_through ) @@ -689,14 +689,14 @@ def cudriv(self, output: bool): current_drive_variables.p_beam_orbit_loss = ( current_drive_variables.f_p_beam_orbit_loss * ( - current_drive_variables.p_beam_injected + current_drive_variables.p_beam_injected_mw - current_drive_variables.p_beam_shine_through_mw ) ) # Power deposited pinjmw1 = ( - current_drive_variables.p_beam_injected + current_drive_variables.p_beam_injected_mw - current_drive_variables.p_beam_shine_through_mw - current_drive_variables.p_beam_orbit_loss ) @@ -706,7 +706,7 @@ def cudriv(self, output: bool): ) current_drive_variables.pwpnb = ( - current_drive_variables.p_beam_injected + current_drive_variables.p_beam_injected_mw / current_drive_variables.eta_beam_injector_wall_plug ) # neutral beam wall plug power pinjwp1 = current_drive_variables.pwpnb @@ -717,7 +717,7 @@ def cudriv(self, output: bool): current_drive_variables.eta_cd_norm_hcd_primary = gamnb current_drive_variables.c_beam_total = ( 1.0e-3 - * (current_drive_variables.p_beam_injected * 1.0e6) + * (current_drive_variables.p_beam_injected_mw * 1.0e6) / current_drive_variables.e_beam_kev ) # Neutral beam current (A) @@ -1196,8 +1196,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Beam power entering vacuum vessel (MW)", - "(p_beam_injected)", - current_drive_variables.p_beam_injected, + "(p_beam_injected_mw)", + current_drive_variables.p_beam_injected_mw, "OP ", ) diff --git a/process/physics.py b/process/physics.py index f681311861..7e6b5d90d1 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2019,10 +2019,7 @@ def physics(self): # produced by non-inductive means (which also includes # the current drive proportion) physics_module.err243 = 0 - if ( - current_drive_variables.f_c_plasma_internal - > physics_variables.fvsbrnni - ): + if current_drive_variables.f_c_plasma_internal > physics_variables.fvsbrnni: current_drive_variables.f_c_plasma_internal = min( current_drive_variables.f_c_plasma_internal, physics_variables.fvsbrnni, @@ -2035,8 +2032,7 @@ def physics(self): ) # Fraction of plasma current produced by auxiliary current drive physics_variables.aux_current_fraction = ( - physics_variables.fvsbrnni - - current_drive_variables.f_c_plasma_internal + physics_variables.fvsbrnni - current_drive_variables.f_c_plasma_internal ) # Auxiliary current drive power calculations diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index b9395cec5a..8a4fc71ea7 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -117,7 +117,7 @@ module current_drive_variables real(dp) :: f_p_beam_injected_ions !! fraction of beam energy to ions - real(dp) :: p_beam_injected + real(dp) :: p_beam_injected_mw !! neutral beam power entering vacuum vessel real(dp) :: pscf_scene diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 72e1971929..9718c02874 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3527,7 +3527,7 @@ "plsepi": 1.0, "plsepo": 1.5, "pnbeam": 0.0, - "p_beam_injected": 0.0, + "p_beam_injected_mw": 0.0, "pnetelin": 1000.0, "pnetelmw": 0.0, "neutron_power_total": 0.0, @@ -10250,7 +10250,7 @@ "plsepi": "poloidal length, x-point to inboard strike point (m)", "plsepo": "poloidal length, x-point to outboard strike point (m)", "pnbeam": "neutral beam injection power (MW)", - "p_beam_injected": "neutral beam power entering vacuum vessel", + "p_beam_injected_mw": "neutral beam power entering vacuum vessel", "pnetelin": "required net electric power (MW) (`constraint equation 16`)", "pnetelmw": "net electric power (MW)", "neutron_power_total": "neutron fusion power (MW)", @@ -17636,7 +17636,7 @@ "eta_lowhyb_injector_wall_plug", "eta_beam_injector_wall_plug", "f_p_beam_injected_ions", - "p_beam_injected", + "p_beam_injected_mw", "pscf_scene", "p_beam_shine_through_mw", "feffcd", diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index c916394399..a41493c88a 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2887,7 +2887,7 @@ class Acc223Param(NamedTuple): echpwr: Any = None - p_beam_injected: Any = None + p_beam_injected_mw: Any = None dcdrv2: Any = None @@ -2947,7 +2947,7 @@ class Acc223Param(NamedTuple): plhybd=0, i_hcd_primary=10, echpwr=51.978447720428512, - p_beam_injected=0, + p_beam_injected_mw=0, dcdrv2=59.899999999999999, mcdriv=1, cdriv2=244.90000000000001, @@ -2982,7 +2982,7 @@ class Acc223Param(NamedTuple): plhybd=0, i_hcd_primary=10, echpwr=51.978447720428512, - p_beam_injected=0, + p_beam_injected_mw=0, dcdrv2=59.899999999999999, mcdriv=1, cdriv2=244.90000000000001, @@ -3045,7 +3045,7 @@ def test_acc223(acc223param, monkeypatch, costs): monkeypatch.setattr(current_drive_variables, "echpwr", acc223param.echpwr) monkeypatch.setattr( - current_drive_variables, "p_beam_injected", acc223param.p_beam_injected + current_drive_variables, "p_beam_injected_mw", acc223param.p_beam_injected_mw ) monkeypatch.setattr(ife_variables, "dcdrv2", acc223param.dcdrv2) diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index b3de592256..66c86f9a4c 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -83,7 +83,7 @@ class CudrivParam(NamedTuple): echwpow: Any = None - p_beam_injected: Any = None + p_beam_injected_mw: Any = None p_beam_shine_through_mw: Any = None @@ -234,7 +234,7 @@ class CudrivParam(NamedTuple): eta_cd_hcd_primary=0, pwplh=0, echwpow=0, - p_beam_injected=0, + p_beam_injected_mw=0, p_beam_shine_through_mw=0, pinjemw=0, pinjimw=0, @@ -324,7 +324,7 @@ class CudrivParam(NamedTuple): eta_cd_hcd_primary=0.05000000000000001, pwplh=0, echwpow=240.99200038011492, - p_beam_injected=0, + p_beam_injected_mw=0, p_beam_shine_through_mw=0, pinjemw=120.49600019005746, pinjimw=0, @@ -505,7 +505,7 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(current_drive_variables, "echwpow", cudrivparam.echwpow) monkeypatch.setattr( - current_drive_variables, "p_beam_injected", cudrivparam.p_beam_injected + current_drive_variables, "p_beam_injected_mw", cudrivparam.p_beam_injected_mw ) monkeypatch.setattr( From 61e55fed53321962cf923f2a886ebaae1b8f7da3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 10:53:34 +0100 Subject: [PATCH 46/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20p=5Fbeam=5Forbit?= =?UTF-8?q?=5Floss=20to=20p=5Fbeam=5Forbit=5Floss=5Fmw=20for=20clarity=20a?= =?UTF-8?q?nd=20consistency=20in=20current=20drive=20calculations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 18 +++++++++--------- process/dcll.py | 2 +- process/hcpb.py | 2 +- process/objectives.py | 2 +- process/power.py | 14 +++++++------- process/stellarator.py | 14 +++++++------- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_ccfe_hcpb.py | 10 +++++----- tests/unit/test_current_drive.py | 10 ++++++---- tests/unit/test_dcll.py | 10 +++++----- 11 files changed, 46 insertions(+), 44 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index d876f8fc24..181a6f79e2 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -37,7 +37,7 @@ def cudriv(self, output: bool): current_drive_variables.plhybd = 0.0e0 current_drive_variables.c_beam_total = 0.0e0 beam_current_fix = 0.0e0 - current_drive_variables.p_beam_orbit_loss = 0.0e0 + current_drive_variables.p_beam_orbit_loss_mw = 0.0e0 porbitlossmwfix = 0.0e0 pinjmw1 = 0.0 @@ -686,7 +686,7 @@ def cudriv(self, output: bool): ) # First orbit loss - current_drive_variables.p_beam_orbit_loss = ( + current_drive_variables.p_beam_orbit_loss_mw = ( current_drive_variables.f_p_beam_orbit_loss * ( current_drive_variables.p_beam_injected_mw @@ -698,7 +698,7 @@ def cudriv(self, output: bool): pinjmw1 = ( current_drive_variables.p_beam_injected_mw - current_drive_variables.p_beam_shine_through_mw - - current_drive_variables.p_beam_orbit_loss + - current_drive_variables.p_beam_orbit_loss_mw ) pinjimw1 = pinjmw1 * current_drive_variables.f_p_beam_injected_ions pinjemw1 = pinjmw1 * ( @@ -742,7 +742,7 @@ def cudriv(self, output: bool): if ( abs( current_drive_variables.p_hcd_injected_total_mw - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_plasma_ohmic_mw ) < 1.0e-6 @@ -751,7 +751,7 @@ def cudriv(self, output: bool): else: current_drive_variables.bigq = physics_variables.fusion_power / ( current_drive_variables.p_hcd_injected_total_mw - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_plasma_ohmic_mw ) @@ -1160,8 +1160,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Beam first orbit loss power (MW)", - "(p_beam_orbit_loss)", - current_drive_variables.p_beam_orbit_loss, + "(p_beam_orbit_loss_mw)", + current_drive_variables.p_beam_orbit_loss_mw, "OP ", ) po.ovarrf( @@ -1187,8 +1187,8 @@ def cudriv(self, output: bool): po.ovarrf( self.outfile, "Total (MW)", - "(current_drive_variables.p_beam_orbit_loss+current_drive_variables.p_beam_shine_through_mw+current_drive_variables.p_hcd_injected_total_mw)", - current_drive_variables.p_beam_orbit_loss + "(current_drive_variables.p_beam_orbit_loss_mw+current_drive_variables.p_beam_shine_through_mw+current_drive_variables.p_hcd_injected_total_mw)", + current_drive_variables.p_beam_orbit_loss_mw + current_drive_variables.p_beam_shine_through_mw + pinjmw1, ) diff --git a/process/dcll.py b/process/dcll.py index be80f624c7..ee7df26b8c 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -205,7 +205,7 @@ def dcll_neutronics_and_power(self, output: bool): fwbs_variables.p_fw_rad_total_mw * build_variables.a_fw_outboard / build_variables.a_fw_total - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_fw_alpha_mw ) fwbs_variables.psurffwi = fwbs_variables.p_fw_rad_total_mw * ( diff --git a/process/hcpb.py b/process/hcpb.py index ae106d03f7..d0a1a0be16 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -701,7 +701,7 @@ def powerflow_calc(self, output: bool): fwbs_variables.p_fw_rad_total_mw * build_variables.a_fw_outboard / build_variables.a_fw_total - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_fw_alpha_mw ) fwbs_variables.psurffwi = fwbs_variables.p_fw_rad_total_mw * ( diff --git a/process/objectives.py b/process/objectives.py index 5b7a3b865d..2f8ea564dc 100644 --- a/process/objectives.py +++ b/process/objectives.py @@ -74,7 +74,7 @@ def objective_function(minmax: int) -> float: case 5: objective_metric = physics_variables.fusion_power / ( current_drive_variables.p_hcd_injected_total_mw - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_plasma_ohmic_mw ) case 6: diff --git a/process/power.py b/process/power.py index b40b24dd56..067fbccb8a 100644 --- a/process/power.py +++ b/process/power.py @@ -653,7 +653,7 @@ def power1(self): * (1 - fwbs_variables.f_nuc_pow_bz_liq) ) + primary_pumping_variables.htpmw_fw_blkt - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_fw_alpha_mw + current_drive_variables.p_beam_shine_through_mw ) @@ -664,7 +664,7 @@ def power1(self): + fwbs_variables.p_fw_rad_total_mw + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_fw_alpha_mw + current_drive_variables.p_beam_shine_through_mw ) @@ -674,7 +674,7 @@ def power1(self): + fwbs_variables.p_fw_rad_total_mw + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_fw_alpha_mw + current_drive_variables.p_beam_shine_through_mw ) @@ -686,7 +686,7 @@ def power1(self): + fwbs_variables.p_fw_rad_total_mw + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_fw_alpha_mw + current_drive_variables.p_beam_shine_through_mw ) @@ -697,7 +697,7 @@ def power1(self): fwbs_variables.p_fw_nuclear_heat_total_mw + fwbs_variables.p_fw_rad_total_mw + heat_transport_variables.htpmw_fw - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_fw_alpha_mw + current_drive_variables.p_beam_shine_through_mw ) @@ -790,13 +790,13 @@ def power1(self): # Secondary heat (some of it... rest calculated in POWER2) # Wall plug injection power # MDK - # heat_transport_variables.pinjwp = (current_drive_variables.p_hcd_injected_total_mw + current_drive_variables.p_beam_orbit_loss + physics_variables.p_fw_alpha_mw)/etacd + # heat_transport_variables.pinjwp = (current_drive_variables.p_hcd_injected_total_mw + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_fw_alpha_mw)/etacd # heat_transport_variables.pinjwp calculated in current_drive.f90 # Waste injection power if physics_variables.ignite == 0: # MDK - # pinjht = heat_transport_variables.pinjwp - current_drive_variables.p_hcd_injected_total_mw - current_drive_variables.p_beam_orbit_loss - physics_variables.p_fw_alpha_mw + # pinjht = heat_transport_variables.pinjwp - current_drive_variables.p_hcd_injected_total_mw - current_drive_variables.p_beam_orbit_loss_mw - physics_variables.p_fw_alpha_mw heat_transport_variables.pinjht = ( heat_transport_variables.pinjwp - current_drive_variables.p_hcd_injected_total_mw diff --git a/process/stellarator.py b/process/stellarator.py index dcc9604eff..f03c796fb8 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1230,7 +1230,7 @@ def stfwbs(self, output: bool): heat_transport_variables.htpmw_fw = heat_transport_variables.fpumpfw * ( fwbs_variables.p_fw_nuclear_heat_total_mw + fwbs_variables.p_fw_rad_total_mw - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw ) heat_transport_variables.htpmw_blkt = ( heat_transport_variables.fpumpblkt @@ -1485,7 +1485,7 @@ def stfwbs(self, output: bool): + p_fw_outboard_nuclear_heat_mw + psurffwi + psurffwo - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw ) ) heat_transport_variables.htpmw_blkt = ( @@ -4969,7 +4969,7 @@ def stheat(self, output: bool): current_drive_variables.pnbeam = current_drive_variables.pheat * ( 1 - current_drive_variables.f_p_beam_orbit_loss ) - current_drive_variables.p_beam_orbit_loss = ( + current_drive_variables.p_beam_orbit_loss_mw = ( current_drive_variables.pheat * current_drive_variables.f_p_beam_orbit_loss ) @@ -5012,7 +5012,7 @@ def stheat(self, output: bool): if ( abs( current_drive_variables.p_hcd_injected_total_mw - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_plasma_ohmic_mw ) < 1e-6 @@ -5021,7 +5021,7 @@ def stheat(self, output: bool): else: current_drive_variables.bigq = physics_variables.fusion_power / ( current_drive_variables.p_hcd_injected_total_mw - + current_drive_variables.p_beam_orbit_loss + + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_plasma_ohmic_mw ) @@ -5084,8 +5084,8 @@ def stheat(self, output: bool): po.ovarre( self.outfile, "Neutral beam orbit loss power (MW)", - "(p_beam_orbit_loss)", - current_drive_variables.p_beam_orbit_loss, + "(p_beam_orbit_loss_mw)", + current_drive_variables.p_beam_orbit_loss_mw, ) po.ovarre( self.outfile, diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 8a4fc71ea7..ed0d4351f6 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -226,7 +226,7 @@ module current_drive_variables real(dp) :: pnbeam !! neutral beam injection power (MW) - real(dp) :: p_beam_orbit_loss + real(dp) :: p_beam_orbit_loss_mw !! neutral beam power lost after ionisation but before thermalisation (orbit loss power) (MW) real(dp) :: f_c_plasma_pfirsch_schluter diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9718c02874..96bacd38da 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3568,7 +3568,7 @@ 0.0, 0.0 ], - "p_beam_orbit_loss": 0.0, + "p_beam_orbit_loss_mw": 0.0, "p_plasma_outer_rad_mw": 0.0, "p_plasma_loss_mw": 0.0, "powfmax": 1500.0, @@ -10285,7 +10285,7 @@ "poisson_ins": "Insulation Poisson's ratio. Default: Kapton.\n Source : DuPont\u2122 Kapton\u00ae HN datasheet.", "poisson_steel": "Steel Poisson's ratio", "poloidalpower": "Poloidal power usage at time t (MW)", - "p_beam_orbit_loss": "neutral beam power lost after ionisation but before thermalisation (orbit loss power) (MW)", + "p_beam_orbit_loss_mw": "neutral beam power lost after ionisation but before thermalisation (orbit loss power) (MW)", "p_plasma_outer_rad_mw": "radiation power from outer zone (MW)", "p_plasma_loss_mw": "heating power (= transport loss power) (MW) used in confinement time calculation", "powfmax": "maximum fusion power (MW) (`constraint equation 9`)", @@ -17661,7 +17661,7 @@ "plasipf", "plhybd", "pnbeam", - "p_beam_orbit_loss", + "p_beam_orbit_loss_mw", "f_c_plasma_pfirsch_schluter", "pwplh", "pwpnb", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index dc74067461..3b786132d2 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -791,7 +791,7 @@ class PowerflowCalcParam(NamedTuple): a_fw_total: Any = None - p_beam_orbit_loss: Any = None + p_beam_orbit_loss_mw: Any = None f_ster_div_single: Any = None @@ -884,7 +884,7 @@ class PowerflowCalcParam(NamedTuple): PowerflowCalcParam( a_fw_outboard=988.92586580655245, a_fw_total=1601.1595634509963, - p_beam_orbit_loss=0, + p_beam_orbit_loss_mw=0, f_ster_div_single=0.115, p_div_rad_total_mw=0, p_fw_hcd_rad_total_mw=0, @@ -931,7 +931,7 @@ class PowerflowCalcParam(NamedTuple): PowerflowCalcParam( a_fw_outboard=1168.1172772224481, a_fw_total=1891.2865102700493, - p_beam_orbit_loss=0, + p_beam_orbit_loss_mw=0, f_ster_div_single=0.115, p_div_rad_total_mw=33.056596978820579, p_fw_hcd_rad_total_mw=0, @@ -998,8 +998,8 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr( current_drive_variables, - "p_beam_orbit_loss", - powerflowcalcparam.p_beam_orbit_loss, + "p_beam_orbit_loss_mw", + powerflowcalcparam.p_beam_orbit_loss_mw, ) monkeypatch.setattr( diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 66c86f9a4c..ca9e5627ae 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -35,7 +35,7 @@ class CudrivParam(NamedTuple): c_beam_total: Any = None - p_beam_orbit_loss: Any = None + p_beam_orbit_loss_mw: Any = None i_hcd_primary: Any = None @@ -210,7 +210,7 @@ class CudrivParam(NamedTuple): pnbeam=0, plhybd=0, c_beam_total=0, - p_beam_orbit_loss=0, + p_beam_orbit_loss_mw=0, i_hcd_primary=10, i_hcd_secondary=0, pheat=75, @@ -300,7 +300,7 @@ class CudrivParam(NamedTuple): pnbeam=0, plhybd=0, c_beam_total=0, - p_beam_orbit_loss=0, + p_beam_orbit_loss_mw=0, i_hcd_primary=10, i_hcd_secondary=0, pheat=75, @@ -413,7 +413,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): ) monkeypatch.setattr( - current_drive_variables, "p_beam_orbit_loss", cudrivparam.p_beam_orbit_loss + current_drive_variables, + "p_beam_orbit_loss_mw", + cudrivparam.p_beam_orbit_loss_mw, ) monkeypatch.setattr( diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 37a8e2542e..cbf6e5ce78 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -29,7 +29,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): a_fw_total: Any = None - p_beam_orbit_loss: Any = None + p_beam_orbit_loss_mw: Any = None f_ster_div_single: Any = None @@ -92,7 +92,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): DcllNeutronicsAndPowerParam( a_fw_outboard=988.92586580655245, a_fw_total=1601.1595634509963, - p_beam_orbit_loss=0, + p_beam_orbit_loss_mw=0, f_ster_div_single=0.115, p_div_rad_total_mw=0, p_div_nuclear_heat_total_mw=0, @@ -124,7 +124,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): DcllNeutronicsAndPowerParam( a_fw_outboard=1168.1172772224481, a_fw_total=1891.2865102700493, - p_beam_orbit_loss=0, + p_beam_orbit_loss_mw=0, f_ster_div_single=0.115, p_div_rad_total_mw=33.056596978820579, p_div_nuclear_heat_total_mw=182.58994516305046, @@ -178,8 +178,8 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl monkeypatch.setattr( current_drive_variables, - "p_beam_orbit_loss", - dcllneutronicsandpowerparam.p_beam_orbit_loss, + "p_beam_orbit_loss_mw", + dcllneutronicsandpowerparam.p_beam_orbit_loss_mw, ) monkeypatch.setattr( From 600c6f8657f1e6b3cdec1f1c8ec0bc9755c116e3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 11:16:26 +0100 Subject: [PATCH 47/61] =?UTF-8?q?=F0=9F=94=84=20Update=20calculation=20of?= =?UTF-8?q?=20tmp=5Fcc=20for=20consistency=20in=20beam=20shine=20through?= =?UTF-8?q?=20equations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/fortran/constraint_equations.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 701e431987..2fc47d9c50 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2387,7 +2387,7 @@ subroutine constraint_eqn_059(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) real(dp), intent(out) :: tmp_err character(len=1), intent(out) :: tmp_symbol character(len=10), intent(out) :: tmp_units - tmp_cc = nbshinef/f_p_beam_shine_through_max - 1.0D0 * f_p_beam_shine_through + tmp_cc = f_p_beam_shine_through/f_p_beam_shine_through_max - 1.0D0 * fnbshinef tmp_con = f_p_beam_shine_through_max * (1.0D0 - tmp_cc) tmp_err = f_p_beam_shine_through * tmp_cc tmp_symbol = '<' From 2e342842c3fa48dcd326b67ee587dcff54a85c0e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 11:25:53 +0100 Subject: [PATCH 48/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20irfcd=20to=20i=5F?= =?UTF-8?q?hcd=5Fcalculations=20for=20clarity=20and=20consistency=20in=20c?= =?UTF-8?q?urrent=20drive=20calculations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating-and-current-drive.md | 2 +- process/current_drive.py | 6 +++--- process/init.py | 2 +- process/input.py | 2 +- process/physics.py | 2 +- source/fortran/current_drive_variables.f90 | 2 +- source/fortran/stellarator.f90 | 4 ++-- tests/integration/ref_dicts.json | 10 +++++----- .../input_files/spherical_tokamak_once_through.IN.DAT | 2 +- tests/regression/input_files/st_regression.IN.DAT | 2 +- tests/unit/test_current_drive.py | 8 ++++---- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md index 073d9bc964..7bc547f5cc 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md @@ -4,7 +4,7 @@ The use of inductive current drive leads to pulsed plant operation because of the limited flux swing that can be achieved using the central solenoid. This poses problems due to the fact that fatigue failures may result, and there would be a need for thermal storage to maintain output of electricity between pulses, and supply power for starting a new pulse.However, the plasma current can also be produced and maintained (partially or wholly) using non-inductive means which, in principle, removes this restriction. `PROCESS` contains a number of auxiliary current drive schemes, including various RF methods (Lower Hybrid, Electron Cyclotron, Electron Bernstein Wave, and Ion Cyclotron (Fast Wave) current drives) and also Neutral Beam current drive systems. The code calculates the efficiency and the resulting power requirements of the chosen system. -The fraction of the required plasma current to be produced by non-inductive means, `fvsbrnni`, should be set, and flag `irfcd` should be set to 0 for purely inductive scenarios, or 1 otherwise. The current drive efficiency model to be used in this latter case is defined by the value of switch `i_hcd_primary`: +The fraction of the required plasma current to be produced by non-inductive means, `fvsbrnni`, should be set, and flag `i_hcd_calculations` should be set to 0 for purely inductive scenarios, or 1 otherwise. The current drive efficiency model to be used in this latter case is defined by the value of switch `i_hcd_primary`: - `i_hcd_primary` = 1: [Fenstermacher Lower Hybrid model](RF/fenstermacher_lower_hybrid.md) - `i_hcd_primary` = 2: [Ion cyclotron model](RF/ic_model.md)[^1], diff --git a/process/current_drive.py b/process/current_drive.py index 181a6f79e2..85cb55034e 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -65,10 +65,10 @@ def cudriv(self, output: bool): current_drive_variables.p_hcd_secondary_injected_mw ) - # current_drive_variables.irfcd | switch for current drive calculation + # current_drive_variables.i_hcd_calculations | switch for current drive calculation # = 0 | turned off # = 1 | turned on - if current_drive_variables.irfcd != 0: + if current_drive_variables.i_hcd_calculations != 0: # put electron density in desired units (10^-20 m-3) dene20 = physics_variables.dene * 1.0e-20 @@ -760,7 +760,7 @@ def cudriv(self, output: bool): po.oheadr(self.outfile, "Current Drive System") - if current_drive_variables.irfcd == 0: + if current_drive_variables.i_hcd_calculations == 0: po.ocmmnt(self.outfile, "No current drive used") po.oblnkl(self.outfile) return diff --git a/process/init.py b/process/init.py index 2ee60a6557..a43775b92f 100644 --- a/process/init.py +++ b/process/init.py @@ -1009,7 +1009,7 @@ def check_process(inputs): # noqa: ARG001 fortran.pfcoil_variables.rho_pf_coil = 0.0 # If there is no NBI, then hot beam density should be zero - if fortran.current_drive_variables.irfcd == 1: + if fortran.current_drive_variables.i_hcd_calculations == 1: if ( fortran.current_drive_variables.i_hcd_primary != 5 and fortran.current_drive_variables.i_hcd_primary != 8 diff --git a/process/input.py b/process/input.py index 6f89cc3d6d..1a864deac3 100644 --- a/process/input.py +++ b/process/input.py @@ -1522,7 +1522,7 @@ def __post_init__(self): ), "ireactor": InputVariable(fortran.cost_variables, int, choices=[0, 1]), "irefprop": InputVariable(fortran.fwbs_variables, int, choices=[0, 1]), - "irfcd": InputVariable(fortran.current_drive_variables, int, choices=[0, 1]), + "i_hcd_calculations": InputVariable(fortran.current_drive_variables, int, choices=[0, 1]), "iscenr": InputVariable(fortran.pf_power_variables, int, range=(1, 3)), "istell": InputVariable(fortran.stellarator_variables, int, range=(0, 6)), "isthtr": InputVariable(fortran.stellarator_variables, int, range=(1, 3)), diff --git a/process/physics.py b/process/physics.py index 7e6b5d90d1..21daae7772 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2037,7 +2037,7 @@ def physics(self): # Auxiliary current drive power calculations - if current_drive_variables.irfcd != 0: + if current_drive_variables.i_hcd_calculations != 0: self.current_drive.cudriv(False) # ***************************** # diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index ed0d4351f6..84e875c77e 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -184,7 +184,7 @@ module current_drive_variables !! - =11 ECRH "HARE" model (E. Poli, Physics of Plasmas 2019). Removed in #1811. !! - =12 EBW user scaling input. Scaling (S. Freethy) - integer :: irfcd + integer :: i_hcd_calculations !! Switch for current drive calculation: !! !! - =0 turned off diff --git a/source/fortran/stellarator.f90 b/source/fortran/stellarator.f90 index a47a2994fa..c9a3d1b5b8 100644 --- a/source/fortran/stellarator.f90 +++ b/source/fortran/stellarator.f90 @@ -39,7 +39,7 @@ subroutine stinit ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! use build_variables, only: dr_cs_tf_gap, iohcl, dr_cs, tfootfi - use current_drive_variables, only: irfcd + use current_drive_variables, only: i_hcd_calculations use pfcoil_variables, only: f_z_cs_tf_internal use physics_variables, only: aspect, beta_norm_max, kappa, kappa95, q95, rmajor, & triang, hfac, labels_confinement_scalings @@ -92,7 +92,7 @@ subroutine stinit ! Turn off current drive - irfcd = 0 + i_hcd_calculations = 0 ! Times for different phases diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 96bacd38da..2fd2b7c17a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2641,7 +2641,7 @@ "i_rad_loss": 1.0, "ireactor": 1.0, "irefprop": 1.0, - "irfcd": 1.0, + "i_hcd_calculations": 1.0, "is_leg_cp_temp_same": 0.0, "i_confinement_time": 34.0, "iscan_global": 0.0, @@ -9843,7 +9843,7 @@ "i_rad_loss": "switch for radiation loss term usage in power balance (see User Guide):\n
      \n
    • =0 total power lost is scaling power plus radiation (needed for `ipedestal=2,3`)
      • \n
    • =1 total power lost is scaling power plus core radiation only
      • \n
    • =2 total power lost is scaling power only, with no additional\n allowance for radiation. This is not recommended for power plant models.
      • \n
    ", "ireactor": "Switch for net electric power and cost of electricity calculations:\n
      \n
    • =0 do not calculate MW(electric) or c-o-e
      • \n
    • =1 calculate MW(electric) and c-o-e
      • \n
    ", "irefprop": "Switch to use REFPROP routines (stellarator only)", - "irfcd": "Switch for current drive calculation:\n
      \n
    • =0 turned off
      • \n
    • =1 turned on
      • \n
    ", + "i_hcd_calculations": "Switch for current drive calculation:\n
      \n
    • =0 turned off
      • \n
    • =1 turned on
      • \n
    ", "is_leg_cp_temp_same": "", "i_confinement_time": "switch for energy confinement time scaling law (see description in `labels_confinement_scalings`)", "iscan_global": "Makes iscan available globally.", @@ -13343,7 +13343,7 @@ "lb": 0, "ub": 1 }, - "irfcd": { + "i_hcd_calculations": { "lb": 0, "ub": 1 }, @@ -17648,7 +17648,7 @@ "xi_ebw", "i_hcd_primary", "i_hcd_secondary", - "irfcd", + "i_hcd_calculations", "f_p_beam_shine_through", "dx_beam_shield", "pheat", @@ -20278,7 +20278,7 @@ "i_rad_loss": "int_variable", "ireactor": "int_variable", "irefprop": "int_variable", - "irfcd": "int_variable", + "i_hcd_calculations": "int_variable", "i_confinement_time": "int_variable", "iscenr": "int_variable", "i_plasma_wall_gap": "int_variable", diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 6a81295c4f..32628f6389 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -200,7 +200,7 @@ i_ecrh_wave_mode = 0 * Switch for ECRH wave mode ; eta_ecrh_injector_wall_plug = 0.45 * ECH wall plug to injector efficiency feffcd = 1.0 * current drive efficiency fudge factor (`iteration variable 47`) i_hcd_primary = 13 * Switch for current drive efficiency model; -irfcd = 1 * Switch for current drive calculation; +i_hcd_calculations = 1 * Switch for current drive calculation; p_hcd_injected_max = 150.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) *-------------------Dcll Module--------------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index edfb0881a4..d9c898ce86 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2635,7 +2635,7 @@ boundu(116) = 1.0 *---------------------------Heating & Current Drive--------------------------------------------------------------------------------------------------------------------------------------------------------------* *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾* -irfcd = 1 +i_hcd_calculations = 1 * DESCRIPTION: Switch for current drive calculation * JUSTIFICATION: Consistency equation, should always be on. diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index ca9e5627ae..581cdf2d49 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -47,7 +47,7 @@ class CudrivParam(NamedTuple): p_hcd_secondary_injected_mw: Any = None - irfcd: Any = None + i_hcd_calculations: Any = None feffcd: Any = None @@ -216,7 +216,7 @@ class CudrivParam(NamedTuple): pheat=75, pheatfix=0, p_hcd_secondary_injected_mw=0, - irfcd=1, + i_hcd_calculations=1, feffcd=1, f_p_beam_injected_ions=0.5, f_p_beam_shine_through=0, @@ -306,7 +306,7 @@ class CudrivParam(NamedTuple): pheat=75, pheatfix=0, p_hcd_secondary_injected_mw=0, - irfcd=1, + i_hcd_calculations=1, feffcd=1, f_p_beam_injected_ions=0.5, f_p_beam_shine_through=0, @@ -436,7 +436,7 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.p_hcd_secondary_injected_mw, ) - monkeypatch.setattr(current_drive_variables, "irfcd", cudrivparam.irfcd) + monkeypatch.setattr(current_drive_variables, "i_hcd_calculations", cudrivparam.i_hcd_calculations) monkeypatch.setattr(current_drive_variables, "feffcd", cudrivparam.feffcd) From 94b37718cc300d64623db378e6698ce45122ddae Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 11:39:22 +0100 Subject: [PATCH 49/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20echpwr=20to=20p?= =?UTF-8?q?=5Fecrh=5Finjected=5Fmw=20for=20clarity=20and=20consistency=20i?= =?UTF-8?q?n=20current=20drive=20calculations?= 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.py | 2 +- process/current_drive.py | 14 ++++----- process/stellarator.py | 4 +-- source/fortran/current_drive_variables.f90 | 2 +- .../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_1990.py | 8 ++--- tests/unit/test_current_drive.py | 16 +++++----- 21 files changed, 70 insertions(+), 70 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 470383e3ae..058bec89df 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -549,7 +549,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.8505E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.1495E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5213E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5213E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5043E+02 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index ac41c9ba79..8b0e9e8439 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -547,7 +547,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 519fe5f9e4..432a3568fb 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -547,7 +547,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index c63ba764ba..a745f25077 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -547,7 +547,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index bcd6cfa01e..2f3847bea5 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -547,7 +547,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 07d2106068..9bdead2255 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -402,7 +402,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -1397,7 +1397,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -2392,7 +2392,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -3387,7 +3387,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -4382,7 +4382,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -5377,7 +5377,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -6372,7 +6372,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -7367,7 +7367,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -8362,7 +8362,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP diff --git a/process/costs.py b/process/costs.py index 157ad6426d..b7a44c6113 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1805,7 +1805,7 @@ def acc223(self): self.c2231 = ( 1.0e-6 * cost_variables.ucech - * (1.0e6 * current_drive_variables.echpwr) ** exprf + * (1.0e6 * current_drive_variables.p_ecrh_injected_mw) ** exprf ) if cost_variables.ifueltyp == 1: diff --git a/process/current_drive.py b/process/current_drive.py index 85cb55034e..ce775c1f2e 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -32,7 +32,7 @@ def cudriv(self, output: bool): efficiency. """ - current_drive_variables.echpwr = 0.0e0 + current_drive_variables.p_ecrh_injected_mw = 0.0e0 current_drive_variables.pnbeam = 0.0e0 current_drive_variables.plhybd = 0.0e0 current_drive_variables.c_beam_total = 0.0e0 @@ -629,7 +629,7 @@ def cudriv(self, output: bool): # ECCD elif current_drive_variables.i_hcd_primary in [3, 7, 10, 12, 13]: # Injected power (set to close to close the Steady-state current equilibrium) - current_drive_variables.echpwr = ( + current_drive_variables.p_ecrh_injected_mw = ( 1.0e-6 * ( physics_variables.aux_current_fraction @@ -639,11 +639,11 @@ def cudriv(self, output: bool): / effrfss + current_drive_variables.pheat ) - pinjemw1 = current_drive_variables.echpwr + pinjemw1 = current_drive_variables.p_ecrh_injected_mw # Wall plug power current_drive_variables.echwpow = ( - current_drive_variables.echpwr + current_drive_variables.p_ecrh_injected_mw / current_drive_variables.eta_ecrh_injector_wall_plug ) @@ -1285,12 +1285,12 @@ def cudriv(self, output: bool): "OP ", ) - if abs(current_drive_variables.echpwr) > 1.0e-8: + if abs(current_drive_variables.p_ecrh_injected_mw) > 1.0e-8: po.ovarre( self.outfile, "Electron cyclotron injected power (MW)", - "(echpwr)", - current_drive_variables.echpwr, + "(p_ecrh_injected_mw)", + current_drive_variables.p_ecrh_injected_mw, "OP ", ) po.ovarrf( diff --git a/process/stellarator.py b/process/stellarator.py index f03c796fb8..40d0672e03 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4941,9 +4941,9 @@ def stheat(self, output: bool): AEA FUS 172: Physics Assessment for the European Reactor Study """ if stellarator_variables.isthtr == 1: - current_drive_variables.echpwr = current_drive_variables.pheat + current_drive_variables.p_ecrh_injected_mw = current_drive_variables.pheat current_drive_variables.pinjimw = 0 - current_drive_variables.pinjemw = current_drive_variables.echpwr + current_drive_variables.pinjemw = current_drive_variables.p_ecrh_injected_mw current_drive_variables.etacd = ( current_drive_variables.eta_ecrh_injector_wall_plug ) diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 84e875c77e..3ad9e2120c 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -78,7 +78,7 @@ module current_drive_variables real(dp) :: f_c_plasma_diamagnetic !! diamagnetic current fraction - real(dp) :: echpwr + real(dp) :: p_ecrh_injected_mw !! ECH power (MW) real(dp) :: echwpow diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 972ad774e5..3170f063f1 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -546,7 +546,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index a9ae8b9591..c77d658f09 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -547,7 +547,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ca6cb51d97..ed4f2f89dd 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -547,7 +547,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 81580aae61..43cf6e29b0 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -547,7 +547,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6642E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3358E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 8.0143E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 8.0143E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 634128e130..a44a15f2df 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -544,7 +544,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6376E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3624E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.9710E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.9710E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5942E+02 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 16c50a3aaf..e19bd22caf 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -548,7 +548,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.0930E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.9070E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -1711,7 +1711,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9548E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0452E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -2874,7 +2874,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.8606E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.1394E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5559E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5559E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5112E+02 OP @@ -4037,7 +4037,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.8847E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.1153E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -5200,7 +5200,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9218E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0782E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -6363,7 +6363,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9136E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0864E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -7526,7 +7526,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9320E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0680E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -8689,7 +8689,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9395E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0605E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -9852,7 +9852,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9780E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0220E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -11015,7 +11015,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9910E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0090E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -12178,7 +12178,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9399E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0601E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -13341,7 +13341,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9353E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0647E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -14504,7 +14504,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9505E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0495E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -15667,7 +15667,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9754E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0246E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP @@ -16830,7 +16830,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.9990E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.0010E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.5000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.5000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 703958f312..78ccf09f98 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -402,7 +402,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -1397,7 +1397,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -2392,7 +2392,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -3387,7 +3387,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -4382,7 +4382,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -5377,7 +5377,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -6372,7 +6372,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -7367,7 +7367,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP @@ -8362,7 +8362,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 6.1276E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 3.8724E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 5.1000E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 5.1000E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 2fd2b7c17a..05c91de738 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1716,7 +1716,7 @@ "e_Li": 30.0, "e_Li_PPCS": 30.0, "electron_charge": 1.602176634e-19, - "echpwr": 0.0, + "p_ecrh_injected_mw": 0.0, "echwpow": 0.0, "edrive": 5000000.0, "eff_tf_cryo": -1.0, @@ -9320,7 +9320,7 @@ "e_Li": "Lithium 6 enrichment [%]", "e_Li_PPCS": "", "electron_charge": "electron charge [C]", - "echpwr": "ECH power (MW)", + "p_ecrh_injected_mw": "ECH power (MW)", "echwpow": "ECH wall plug power (MW)", "edrive": "IFE driver energy (J) (`iteration variable 81`)", "eff_tf_cryo": "TF cryoplant efficiency (compared to pefect Carnot cycle).\n Using -1 set the default value depending on magnet technology:\n
      \n
    • i_tf_sup = 1 : SC magnet, eff_tf_cryo = 0.13 (ITER design)
      • \n
    • i_tf_sup = 2 : Cryo-aluminium, eff_tf_cryo = 0.4
      • \n
    ", @@ -17625,7 +17625,7 @@ "f_c_plasma_diamagnetic_hender", "f_c_plasma_diamagnetic_scene", "diaipf", - "echpwr", + "p_ecrh_injected_mw", "echwpow", "eta_cd_hcd_primary", "n_ecrh_harmonic", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c9fff1c75b..56f1ef6370 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -544,7 +544,7 @@ Inductive_fraction______________________________________________________ (inductive_current_fraction)_______________________ 5.6376E-01 Total___________________________________________________________________ (plasipf+aux_current_fraction+inductive_current_fraction)_________ 1.0000E+00 Fraction_of_the_plasma_current_produced_by_non-inductive_means__________ (fvsbrnni)____________________ 4.3624E-01 ITV - Electron_cyclotron_injected_power_(MW)__________________________________ (echpwr)______________________ 7.9710E+01 OP + Electron_cyclotron_injected_power_(MW)__________________________________ (p_ecrh_injected_mw)______________________ 7.9710E+01 OP Maximum_allowable_ECRH_power_(MW)_______________________________________ (p_hcd_injected_max)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (eta_ecrh_injector_wall_plug)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5942E+02 OP diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index a41493c88a..6d0dbbfaec 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2885,7 +2885,7 @@ class Acc223Param(NamedTuple): i_hcd_primary: Any = None - echpwr: Any = None + p_ecrh_injected_mw: Any = None p_beam_injected_mw: Any = None @@ -2946,7 +2946,7 @@ class Acc223Param(NamedTuple): fcdfuel=0.10000000000000001, plhybd=0, i_hcd_primary=10, - echpwr=51.978447720428512, + p_ecrh_injected_mw=51.978447720428512, p_beam_injected_mw=0, dcdrv2=59.899999999999999, mcdriv=1, @@ -2981,7 +2981,7 @@ class Acc223Param(NamedTuple): fcdfuel=0.10000000000000001, plhybd=0, i_hcd_primary=10, - echpwr=51.978447720428512, + p_ecrh_injected_mw=51.978447720428512, p_beam_injected_mw=0, dcdrv2=59.899999999999999, mcdriv=1, @@ -3042,7 +3042,7 @@ def test_acc223(acc223param, monkeypatch, costs): current_drive_variables, "i_hcd_primary", acc223param.i_hcd_primary ) - monkeypatch.setattr(current_drive_variables, "echpwr", acc223param.echpwr) + monkeypatch.setattr(current_drive_variables, "p_ecrh_injected_mw", acc223param.p_ecrh_injected_mw) monkeypatch.setattr( current_drive_variables, "p_beam_injected_mw", acc223param.p_beam_injected_mw diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 581cdf2d49..9e1c7ccf74 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -27,7 +27,7 @@ class CudrivParam(NamedTuple): pinjwp: Any = None - echpwr: Any = None + p_ecrh_injected_mw: Any = None pnbeam: Any = None @@ -183,7 +183,7 @@ class CudrivParam(NamedTuple): expected_pinjwp: Any = None - expected_echpwr: Any = None + expected_p_ecrh_injected_mw: Any = None expected_gamcd: Any = None @@ -206,7 +206,7 @@ class CudrivParam(NamedTuple): CudrivParam( pinjwpfix=0, pinjwp=0, - echpwr=0, + p_ecrh_injected_mw=0, pnbeam=0, plhybd=0, c_beam_total=0, @@ -284,7 +284,7 @@ class CudrivParam(NamedTuple): iprint=0, outfile=11, expected_pinjwp=240.99200038011492, - expected_echpwr=120.49600019005746, + expected_p_ecrh_injected_mw=120.49600019005746, expected_gamcd=0.30000000000000004, expected_etacd=0.5, expected_p_hcd_injected_total_mw=120.49600019005746, @@ -296,7 +296,7 @@ class CudrivParam(NamedTuple): CudrivParam( pinjwpfix=0, pinjwp=240.99200038011492, - echpwr=120.49600019005746, + p_ecrh_injected_mw=120.49600019005746, pnbeam=0, plhybd=0, c_beam_total=0, @@ -374,7 +374,7 @@ class CudrivParam(NamedTuple): iprint=0, outfile=11, expected_pinjwp=240.99200038011492, - expected_echpwr=120.49600019005746, + expected_p_ecrh_injected_mw=120.49600019005746, expected_gamcd=0.30000000000000004, expected_etacd=0.5, expected_p_hcd_injected_total_mw=120.49600019005746, @@ -402,7 +402,7 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(heat_transport_variables, "pinjwp", cudrivparam.pinjwp) - monkeypatch.setattr(current_drive_variables, "echpwr", cudrivparam.echpwr) + monkeypatch.setattr(current_drive_variables, "p_ecrh_injected_mw", cudrivparam.p_ecrh_injected_mw) monkeypatch.setattr(current_drive_variables, "pnbeam", cudrivparam.pnbeam) @@ -648,7 +648,7 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): assert heat_transport_variables.pinjwp == pytest.approx(cudrivparam.expected_pinjwp) - assert current_drive_variables.echpwr == pytest.approx(cudrivparam.expected_echpwr) + assert current_drive_variables.p_ecrh_injected_mw == pytest.approx(cudrivparam.expected_p_ecrh_injected_mw) assert current_drive_variables.eta_cd_norm_hcd_primary == pytest.approx( cudrivparam.expected_gamcd From a3d5283c75426632df2bc0c1415ecfa97715db85 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 11:45:41 +0100 Subject: [PATCH 50/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20etacd=20to=20eta?= =?UTF-8?q?=5Fhcd=5Fprimary=5Finjector=5Fwall=5Fplug?= 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/current_drive.py | 10 +++---- process/input.py | 4 ++- process/power.py | 17 ++++++++--- process/stellarator.py | 12 ++++---- source/fortran/current_drive_variables.f90 | 2 +- .../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_1990.py | 4 ++- tests/unit/test_current_drive.py | 28 ++++++++++++----- tests/unit/test_power.py | 12 +++++--- 23 files changed, 106 insertions(+), 77 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 058bec89df..153bf1d4eb 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -540,7 +540,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 9.8586E+03 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6299E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1436E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 8b0e9e8439..b26202ac12 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -538,7 +538,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 432a3568fb..b0b1772ec0 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -538,7 +538,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index a745f25077..fc63f16e07 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -538,7 +538,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 2f3847bea5..c22e8411e7 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -538,7 +538,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 9bdead2255..1ed9336cd1 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -393,7 +393,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -1388,7 +1388,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -2383,7 +2383,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -3378,7 +3378,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -4373,7 +4373,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -5368,7 +5368,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -6363,7 +6363,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -7358,7 +7358,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -8353,7 +8353,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/process/current_drive.py b/process/current_drive.py index ce775c1f2e..89ebad5ca9 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -619,7 +619,7 @@ def cudriv(self, output: bool): pinjwp1 = current_drive_variables.pwplh # Wall plug to injector efficiency - current_drive_variables.etacd = ( + current_drive_variables.eta_hcd_primary_injector_wall_plug = ( current_drive_variables.eta_lowhyb_injector_wall_plug ) @@ -649,7 +649,7 @@ def cudriv(self, output: bool): # Wall plug to injector efficiency pinjwp1 = current_drive_variables.echwpow - current_drive_variables.etacd = ( + current_drive_variables.eta_hcd_primary_injector_wall_plug = ( current_drive_variables.eta_ecrh_injector_wall_plug ) elif current_drive_variables.i_hcd_primary in [5, 8]: @@ -710,7 +710,7 @@ def cudriv(self, output: bool): / current_drive_variables.eta_beam_injector_wall_plug ) # neutral beam wall plug power pinjwp1 = current_drive_variables.pwpnb - current_drive_variables.etacd = ( + current_drive_variables.eta_hcd_primary_injector_wall_plug = ( current_drive_variables.eta_beam_injector_wall_plug ) gamnb = effnbss * (dene20 * physics_variables.rmajor) @@ -911,8 +911,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Wall plug to injector efficiency", - "(etacd)", - current_drive_variables.etacd, + "(eta_hcd_primary_injector_wall_plug)", + current_drive_variables.eta_hcd_primary_injector_wall_plug, ) if current_drive_variables.i_hcd_primary == 10: diff --git a/process/input.py b/process/input.py index 1a864deac3..486411a70d 100644 --- a/process/input.py +++ b/process/input.py @@ -1522,7 +1522,9 @@ def __post_init__(self): ), "ireactor": InputVariable(fortran.cost_variables, int, choices=[0, 1]), "irefprop": InputVariable(fortran.fwbs_variables, int, choices=[0, 1]), - "i_hcd_calculations": InputVariable(fortran.current_drive_variables, int, choices=[0, 1]), + "i_hcd_calculations": InputVariable( + fortran.current_drive_variables, int, choices=[0, 1] + ), "iscenr": InputVariable(fortran.pf_power_variables, int, range=(1, 3)), "istell": InputVariable(fortran.stellarator_variables, int, range=(0, 6)), "isthtr": InputVariable(fortran.stellarator_variables, int, range=(1, 3)), diff --git a/process/power.py b/process/power.py index 067fbccb8a..dacb0067cf 100644 --- a/process/power.py +++ b/process/power.py @@ -790,7 +790,7 @@ def power1(self): # Secondary heat (some of it... rest calculated in POWER2) # Wall plug injection power # MDK - # heat_transport_variables.pinjwp = (current_drive_variables.p_hcd_injected_total_mw + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_fw_alpha_mw)/etacd + # heat_transport_variables.pinjwp = (current_drive_variables.p_hcd_injected_total_mw + current_drive_variables.p_beam_orbit_loss_mw + physics_variables.p_fw_alpha_mw)/eta_hcd_primary_injector_wall_plug # heat_transport_variables.pinjwp calculated in current_drive.f90 # Waste injection power @@ -2171,10 +2171,19 @@ def power3(self, output: bool): # Heating and current drive electrical power [MWe] p_hcd[0] = 0.0e0 - p_hcd[1] = heat_transport_variables.pinjmax / current_drive_variables.etacd - p_hcd[2] = heat_transport_variables.pinjmax / current_drive_variables.etacd + p_hcd[1] = ( + heat_transport_variables.pinjmax + / current_drive_variables.eta_hcd_primary_injector_wall_plug + ) + p_hcd[2] = ( + heat_transport_variables.pinjmax + / current_drive_variables.eta_hcd_primary_injector_wall_plug + ) p_hcd[3] = heat_transport_variables.pinjwp - p_hcd[4] = heat_transport_variables.pinjmax / current_drive_variables.etacd + p_hcd[4] = ( + heat_transport_variables.pinjmax + / current_drive_variables.eta_hcd_primary_injector_wall_plug + ) p_hcd[5] = 0.0e0 # PF coils electrical power [MWe] diff --git a/process/stellarator.py b/process/stellarator.py index 40d0672e03..45451c34a5 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4944,22 +4944,22 @@ def stheat(self, output: bool): current_drive_variables.p_ecrh_injected_mw = current_drive_variables.pheat current_drive_variables.pinjimw = 0 current_drive_variables.pinjemw = current_drive_variables.p_ecrh_injected_mw - current_drive_variables.etacd = ( + current_drive_variables.eta_hcd_primary_injector_wall_plug = ( current_drive_variables.eta_ecrh_injector_wall_plug ) current_drive_variables.pinjwp = ( current_drive_variables.pinjimw + current_drive_variables.pinjemw - ) / current_drive_variables.etacd + ) / current_drive_variables.eta_hcd_primary_injector_wall_plug elif stellarator_variables.isthtr == 2: current_drive_variables.plhybd = current_drive_variables.pheat current_drive_variables.pinjimw = 0 current_drive_variables.pinjemw = current_drive_variables.plhybd - current_drive_variables.etacd = ( + current_drive_variables.eta_hcd_primary_injector_wall_plug = ( current_drive_variables.eta_lowhyb_injector_wall_plug ) current_drive_variables.pinjwp = ( current_drive_variables.pinjimw + current_drive_variables.pinjemw - ) / current_drive_variables.etacd + ) / current_drive_variables.eta_hcd_primary_injector_wall_plug elif stellarator_variables.isthtr == 3: ( effnbss, @@ -4979,12 +4979,12 @@ def stheat(self, output: bool): current_drive_variables.pinjemw = current_drive_variables.pnbeam * ( 1 - f_p_beam_injected_ions ) - current_drive_variables.etacd = ( + current_drive_variables.eta_hcd_primary_injector_wall_plug = ( current_drive_variables.eta_beam_injector_wall_plug ) current_drive_variables.pinjwp = ( current_drive_variables.pinjimw + current_drive_variables.pinjemw - ) / current_drive_variables.etacd + ) / current_drive_variables.eta_hcd_primary_injector_wall_plug else: raise ProcessValueError( "Illegal value for isthtr", isthtr=stellarator_variables.isthtr diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 3ad9e2120c..c1d78021eb 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -99,7 +99,7 @@ module current_drive_variables real(dp) :: e_beam_kev !! neutral beam energy (keV) (`iteration variable 19`) - real(dp) :: etacd + real(dp) :: eta_hcd_primary_injector_wall_plug !! auxiliary power wall plug to injector efficiency real(dp) :: etacdfix diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 3170f063f1..d4ab3d5bea 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -537,7 +537,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index c77d658f09..de538a5c9e 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -538,7 +538,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ed4f2f89dd..b26960ab22 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -538,7 +538,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 43cf6e29b0..b8d1b9a4b6 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -538,7 +538,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.3908E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6488E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1920E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index a44a15f2df..2ede53745b 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -535,7 +535,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.2041E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6799E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2290E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index e19bd22caf..362786bf30 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -539,7 +539,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6662E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1061E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -1702,7 +1702,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6483E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1146E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -2865,7 +2865,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.5902E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6344E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1238E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -4028,7 +4028,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6548E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1715E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -5191,7 +5191,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6564E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1531E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -6354,7 +6354,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6722E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1452E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -7517,7 +7517,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6916E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.1915E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -8680,7 +8680,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6867E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2074E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -9843,7 +9843,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6949E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2337E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -11006,7 +11006,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.7010E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2713E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -12169,7 +12169,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6863E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2391E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -13332,7 +13332,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6900E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2221E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -14495,7 +14495,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6986E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2611E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -15658,7 +15658,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6811E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2685E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -16821,7 +16821,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 0.0000E+00 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6629E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2763E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 78ccf09f98..c1c8cae151 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -393,7 +393,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -1388,7 +1388,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -2383,7 +2383,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -3378,7 +3378,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -4373,7 +4373,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -5368,7 +5368,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -6363,7 +6363,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -7358,7 +7358,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 @@ -8353,7 +8353,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 4.5950E+04 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.5950E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 4.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 4.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 3.8470E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 05c91de738..af47f5db4d 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1764,7 +1764,7 @@ "e_tf_magnetic_stored_total": 0.0, "estotftgj": 0.0, "eta": null, - "etacd": 0.0, + "eta_hcd_primary_injector_wall_plug": 0.0, "etacdfix": 0.0, "etadrv": 0.0, "eta_ecrh_injector_wall_plug": 0.3, @@ -9368,7 +9368,7 @@ "e_tf_magnetic_stored_total": "", "estotftgj": "total stored energy in the toroidal field (GJ)", "eta": "", - "etacd": "auxiliary power wall plug to injector efficiency", + "eta_hcd_primary_injector_wall_plug": "auxiliary power wall plug to injector efficiency", "etacdfix": "secondary auxiliary power wall plug to injector efficiency", "etadrv": "IFE driver wall plug to target efficiency", "eta_ecrh_injector_wall_plug": "ECH wall plug to injector efficiency", @@ -17630,7 +17630,7 @@ "eta_cd_hcd_primary", "n_ecrh_harmonic", "e_beam_kev", - "etacd", + "eta_hcd_primary_injector_wall_plug", "etacdfix", "eta_ecrh_injector_wall_plug", "eta_lowhyb_injector_wall_plug", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 56f1ef6370..f5cf10a7ea 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -535,7 +535,7 @@ Auxiliary_current_drive_(A)_____________________________________________ (auxiliary_cd)________________ 2.2041E+05 OP Current_drive_efficiency_(A/W)__________________________________________ (eta_cd_hcd_primary)_______________________ 4.6799E-02 OP Normalised_current_drive_efficiency,_gamma_(10^20_A/W-m2)_______________ (eta_cd_norm_hcd_primary)_______________________ 3.0000E-01 OP - Wall_plug_to_injector_efficiency________________________________________ (etacd)_______________________ 5.0000E-01 + Wall_plug_to_injector_efficiency________________________________________ (eta_hcd_primary_injector_wall_plug)_______________________ 5.0000E-01 ECRH_plasma_heating_efficiency__________________________________________ (eta_cd_norm_ecrh)__________________ 3.0000E-01 Bootstrap_fraction______________________________________________________ (bootipf)_____________________ 4.2290E-01 Diamagnetic_fraction____________________________________________________ (diaipf)______________________ 0.0000E+00 diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 6d0dbbfaec..21e02684ce 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -3042,7 +3042,9 @@ def test_acc223(acc223param, monkeypatch, costs): current_drive_variables, "i_hcd_primary", acc223param.i_hcd_primary ) - monkeypatch.setattr(current_drive_variables, "p_ecrh_injected_mw", acc223param.p_ecrh_injected_mw) + monkeypatch.setattr( + current_drive_variables, "p_ecrh_injected_mw", acc223param.p_ecrh_injected_mw + ) monkeypatch.setattr( current_drive_variables, "p_beam_injected_mw", acc223param.p_beam_injected_mw diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 9e1c7ccf74..6e255fbe8b 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -61,7 +61,7 @@ class CudrivParam(NamedTuple): eta_lowhyb_injector_wall_plug: Any = None - etacd: Any = None + eta_hcd_primary_injector_wall_plug: Any = None etacdfix: Any = None @@ -223,7 +223,7 @@ class CudrivParam(NamedTuple): eta_cd_norm_hcd_primary=0, eta_cd_norm_ecrh=0.30000000000000004, eta_lowhyb_injector_wall_plug=0.29999999999999999, - etacd=0, + eta_hcd_primary_injector_wall_plug=0, etacdfix=0, eta_ecrh_injector_wall_plug=0.5, f_p_beam_orbit_loss=0, @@ -313,7 +313,7 @@ class CudrivParam(NamedTuple): eta_cd_norm_hcd_primary=0.30000000000000004, eta_cd_norm_ecrh=0.30000000000000004, eta_lowhyb_injector_wall_plug=0.29999999999999999, - etacd=0.5, + eta_hcd_primary_injector_wall_plug=0.5, etacdfix=0, eta_ecrh_injector_wall_plug=0.5, f_p_beam_orbit_loss=0, @@ -402,7 +402,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): monkeypatch.setattr(heat_transport_variables, "pinjwp", cudrivparam.pinjwp) - monkeypatch.setattr(current_drive_variables, "p_ecrh_injected_mw", cudrivparam.p_ecrh_injected_mw) + monkeypatch.setattr( + current_drive_variables, "p_ecrh_injected_mw", cudrivparam.p_ecrh_injected_mw + ) monkeypatch.setattr(current_drive_variables, "pnbeam", cudrivparam.pnbeam) @@ -436,7 +438,9 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.p_hcd_secondary_injected_mw, ) - monkeypatch.setattr(current_drive_variables, "i_hcd_calculations", cudrivparam.i_hcd_calculations) + monkeypatch.setattr( + current_drive_variables, "i_hcd_calculations", cudrivparam.i_hcd_calculations + ) monkeypatch.setattr(current_drive_variables, "feffcd", cudrivparam.feffcd) @@ -468,7 +472,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.eta_lowhyb_injector_wall_plug, ) - monkeypatch.setattr(current_drive_variables, "etacd", cudrivparam.etacd) + monkeypatch.setattr( + current_drive_variables, + "eta_hcd_primary_injector_wall_plug", + cudrivparam.eta_hcd_primary_injector_wall_plug, + ) monkeypatch.setattr(current_drive_variables, "etacdfix", cudrivparam.etacdfix) @@ -648,13 +656,17 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): assert heat_transport_variables.pinjwp == pytest.approx(cudrivparam.expected_pinjwp) - assert current_drive_variables.p_ecrh_injected_mw == pytest.approx(cudrivparam.expected_p_ecrh_injected_mw) + assert current_drive_variables.p_ecrh_injected_mw == pytest.approx( + cudrivparam.expected_p_ecrh_injected_mw + ) assert current_drive_variables.eta_cd_norm_hcd_primary == pytest.approx( cudrivparam.expected_gamcd ) - assert current_drive_variables.etacd == pytest.approx(cudrivparam.expected_etacd) + assert current_drive_variables.eta_hcd_primary_injector_wall_plug == pytest.approx( + cudrivparam.expected_etacd + ) assert current_drive_variables.p_hcd_injected_total_mw == pytest.approx( cudrivparam.expected_p_hcd_injected_total_mw diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 85b8db3d5b..91521f0b91 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2712,7 +2712,7 @@ def test_power2(power2param, monkeypatch, power): class Power3Param(NamedTuple): - etacd: Any = None + eta_hcd_primary_injector_wall_plug: Any = None htpmw: Any = None @@ -2755,7 +2755,7 @@ class Power3Param(NamedTuple): "power3param", ( Power3Param( - etacd=0.40000000000000002, + eta_hcd_primary_injector_wall_plug=0.40000000000000002, htpmw=234.28554165620102, pinjmax=120, crypmw=37.900388528497025, @@ -2782,7 +2782,7 @@ class Power3Param(NamedTuple): iprint=0, ), Power3Param( - etacd=0.40000000000000002, + eta_hcd_primary_injector_wall_plug=0.40000000000000002, htpmw=234.2162627659944, pinjmax=120, crypmw=108.74512702403499, @@ -2829,7 +2829,11 @@ def test_power3(power3param, monkeypatch, power): :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(current_drive_variables, "etacd", power3param.etacd) + monkeypatch.setattr( + current_drive_variables, + "eta_hcd_primary_injector_wall_plug", + power3param.eta_hcd_primary_injector_wall_plug, + ) monkeypatch.setattr(heat_transport_variables, "htpmw", power3param.htpmw) From 2341a13a9628b9140c0e502f125c856b236e2a07 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 11:47:42 +0100 Subject: [PATCH 51/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20etacdfix=20to=20e?= =?UTF-8?q?ta=5Fhcd=5Fsecondary=5Finjector=5Fwall=5Fplug=20for=20clarity?= =?UTF-8?q?=20and=20consistency=20in=20current=20drive=20calculations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 10 +++++----- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_current_drive.py | 12 ++++++++---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index 89ebad5ca9..2fe9525282 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -286,7 +286,7 @@ def cudriv(self, output: bool): ) # Wall plug to injector efficiency - current_drive_variables.etacdfix = ( + current_drive_variables.eta_hcd_secondary_injector_wall_plug = ( current_drive_variables.eta_lowhyb_injector_wall_plug ) @@ -316,7 +316,7 @@ def cudriv(self, output: bool): ) # Wall plug to injector efficiency - current_drive_variables.etacdfix = ( + current_drive_variables.eta_hcd_secondary_injector_wall_plug = ( current_drive_variables.eta_ecrh_injector_wall_plug ) @@ -368,7 +368,7 @@ def cudriv(self, output: bool): pnbitotfix / current_drive_variables.eta_beam_injector_wall_plug ) # neutral beam wall plug power heat_transport_variables.pinjwpfix = current_drive_variables.pwpnb - current_drive_variables.etacdfix = ( + current_drive_variables.eta_hcd_secondary_injector_wall_plug = ( current_drive_variables.eta_beam_injector_wall_plug ) gamnb = effnbssfix * (dene20 * physics_variables.rmajor) @@ -955,8 +955,8 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Seconday wall plug to injector efficiency", - "(etacdfix)", - current_drive_variables.etacdfix, + "(eta_hcd_secondary_injector_wall_plug)", + current_drive_variables.eta_hcd_secondary_injector_wall_plug, ) po.ovarre( self.outfile, diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index c1d78021eb..c5ba8da651 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -102,7 +102,7 @@ module current_drive_variables real(dp) :: eta_hcd_primary_injector_wall_plug !! auxiliary power wall plug to injector efficiency - real(dp) :: etacdfix + real(dp) :: eta_hcd_secondary_injector_wall_plug !! secondary auxiliary power wall plug to injector efficiency real(dp) :: eta_ecrh_injector_wall_plug diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index af47f5db4d..83eb061eaa 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1765,7 +1765,7 @@ "estotftgj": 0.0, "eta": null, "eta_hcd_primary_injector_wall_plug": 0.0, - "etacdfix": 0.0, + "eta_hcd_secondary_injector_wall_plug": 0.0, "etadrv": 0.0, "eta_ecrh_injector_wall_plug": 0.3, "etahtp": 0.95, @@ -9369,7 +9369,7 @@ "estotftgj": "total stored energy in the toroidal field (GJ)", "eta": "", "eta_hcd_primary_injector_wall_plug": "auxiliary power wall plug to injector efficiency", - "etacdfix": "secondary auxiliary power wall plug to injector efficiency", + "eta_hcd_secondary_injector_wall_plug": "secondary auxiliary power wall plug to injector efficiency", "etadrv": "IFE driver wall plug to target efficiency", "eta_ecrh_injector_wall_plug": "ECH wall plug to injector efficiency", "etahtp": "electrical efficiency of primary coolant pumps", @@ -17631,7 +17631,7 @@ "n_ecrh_harmonic", "e_beam_kev", "eta_hcd_primary_injector_wall_plug", - "etacdfix", + "eta_hcd_secondary_injector_wall_plug", "eta_ecrh_injector_wall_plug", "eta_lowhyb_injector_wall_plug", "eta_beam_injector_wall_plug", diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 6e255fbe8b..256da171d5 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -63,7 +63,7 @@ class CudrivParam(NamedTuple): eta_hcd_primary_injector_wall_plug: Any = None - etacdfix: Any = None + eta_hcd_secondary_injector_wall_plug: Any = None eta_ecrh_injector_wall_plug: Any = None @@ -224,7 +224,7 @@ class CudrivParam(NamedTuple): eta_cd_norm_ecrh=0.30000000000000004, eta_lowhyb_injector_wall_plug=0.29999999999999999, eta_hcd_primary_injector_wall_plug=0, - etacdfix=0, + eta_hcd_secondary_injector_wall_plug=0, eta_ecrh_injector_wall_plug=0.5, f_p_beam_orbit_loss=0, p_hcd_injected_total_mw=0, @@ -314,7 +314,7 @@ class CudrivParam(NamedTuple): eta_cd_norm_ecrh=0.30000000000000004, eta_lowhyb_injector_wall_plug=0.29999999999999999, eta_hcd_primary_injector_wall_plug=0.5, - etacdfix=0, + eta_hcd_secondary_injector_wall_plug=0, eta_ecrh_injector_wall_plug=0.5, f_p_beam_orbit_loss=0, p_hcd_injected_total_mw=120.49600019005746, @@ -478,7 +478,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.eta_hcd_primary_injector_wall_plug, ) - monkeypatch.setattr(current_drive_variables, "etacdfix", cudrivparam.etacdfix) + monkeypatch.setattr( + current_drive_variables, + "eta_hcd_secondary_injector_wall_plug", + cudrivparam.eta_hcd_secondary_injector_wall_plug, + ) monkeypatch.setattr( current_drive_variables, From 8d18798459c2af864ea848299c5395aa0b31d764 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 13:01:03 +0100 Subject: [PATCH 52/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20pscf=5Fscene=20to?= =?UTF-8?q?=20f=5Fc=5Fplasma=5Fpfirsch=5Fschluter=5Fscene=20for=20clarity?= =?UTF-8?q?=20and=20consistency=20in=20current=20drive=20calculations?= 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 | 8 ++--- source/fortran/current_drive_variables.f90 | 2 +- .../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 +- 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 153bf1d4eb..db1a913777 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -517,7 +517,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3036E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2877E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1680E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2449E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.2449E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1436E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index b26202ac12..1db24dfa96 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -513,7 +513,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index b0b1772ec0..09c6e10d65 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -513,7 +513,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index fc63f16e07..cb46b219db 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -513,7 +513,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index c22e8411e7..0120930500 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -513,7 +513,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 1ed9336cd1..7c3e3eddef 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -370,7 +370,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -1365,7 +1365,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -2360,7 +2360,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -3355,7 +3355,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -4350,7 +4350,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -5345,7 +5345,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -6340,7 +6340,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -7335,7 +7335,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -8330,7 +8330,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/process/physics.py b/process/physics.py index 21daae7772..8d6742e30b 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1791,11 +1791,11 @@ def physics(self): # ***************************** # # Pfirsch-Schlüter scaling for diamagnetic current - current_drive_variables.pscf_scene = ps_fraction_scene(physics_variables.beta) + current_drive_variables.f_c_plasma_pfirsch_schluter_scene = ps_fraction_scene(physics_variables.beta) if physics_variables.i_pfirsch_schluter_current == 1: current_drive_variables.f_c_plasma_pfirsch_schluter = ( - current_drive_variables.pscf_scene + current_drive_variables.f_c_plasma_pfirsch_schluter_scene ) # ***************************** # @@ -5748,8 +5748,8 @@ def outplas(self): po.ovarrf( self.outfile, "Pfirsch-Schlueter fraction (SCENE)", - "(pscf_scene)", - current_drive_variables.pscf_scene, + "(f_c_plasma_pfirsch_schluter_scene)", + current_drive_variables.f_c_plasma_pfirsch_schluter_scene, "OP ", ) # Error to catch if bootstap fraction limit has been enforced diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index c5ba8da651..3063821aae 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -120,7 +120,7 @@ module current_drive_variables real(dp) :: p_beam_injected_mw !! neutral beam power entering vacuum vessel - real(dp) :: pscf_scene + real(dp) :: f_c_plasma_pfirsch_schluter_scene !! Pfirsch-Schlüter current fraction, SCENE fit real(dp) :: p_beam_shine_through_mw diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index d4ab3d5bea..f41378ab18 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -512,7 +512,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index de538a5c9e..2e7d0ca687 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -513,7 +513,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index b26960ab22..c134c55ab0 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -513,7 +513,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index b8d1b9a4b6..013d3c633f 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -513,7 +513,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3349E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2017E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1139E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0283E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0283E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1920E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 2ede53745b..b96daa0579 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -510,7 +510,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3666E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.1803E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1022E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.9744E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.9744E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2290E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 362786bf30..213a99a281 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -515,7 +515,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2523E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2084E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1130E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0453E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0453E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1061E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -1678,7 +1678,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2711E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2599E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1485E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1749E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.1749E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1146E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -2841,7 +2841,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2922E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3125E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1846E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3075E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.3075E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1238E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -4004,7 +4004,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3397E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3186E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1924E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3228E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.3228E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1715E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -5167,7 +5167,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3114E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2692E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1579E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1983E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.1983E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1531E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -6330,7 +6330,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.2936E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2193E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1237E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0727E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0727E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1452E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -7493,7 +7493,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3402E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2251E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1312E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.0874E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.0874E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.1915E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -8656,7 +8656,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3660E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2733E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1649E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2087E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.2087E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2074E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -9819,7 +9819,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4013E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3209E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1989E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3286E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.3286E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2337E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -10982,7 +10982,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4400E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3304E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.2082E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.3525E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.3525E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2713E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -12145,7 +12145,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4000E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2839E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1746E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2353E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.2353E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2391E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -13308,7 +13308,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3736E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2358E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1408E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1141E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.1141E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2221E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -14471,7 +14471,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4135E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2439E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1493E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.1347E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.1347E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2611E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -15634,7 +15634,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4312E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.2956E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1848E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.2650E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.2650E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2685E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -16797,7 +16797,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.4499E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.3506E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.2222E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -3.4036E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -3.4036E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2763E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index c1c8cae151..93acec9aff 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -370,7 +370,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -1365,7 +1365,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -2360,7 +2360,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -3355,7 +3355,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -4350,7 +4350,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -5345,7 +5345,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -6340,7 +6340,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -7335,7 +7335,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 @@ -8330,7 +8330,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.0136E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.0963E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.0040E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.7628E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.7628E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 3.8470E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 83eb061eaa..bbd01e6fe1 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3599,7 +3599,7 @@ "f_nd_protium_electrons": 0.0, "proton_rate_density": 0.0, "pscalingmw": 0.0, - "pscf_scene": 0.0, + "f_c_plasma_pfirsch_schluter_scene": 0.0, "psecdiv": 0.0, "psechcd": 0.0, "psechtmw": 0.0, @@ -10316,7 +10316,7 @@ "f_nd_protium_electrons": "Seeded f_nd_protium_electrons density / electron density.", "proton_rate_density": "proton production rate (particles/m3/sec)", "pscalingmw": "Total transport power from scaling law (MW)", - "pscf_scene": "Pfirsch-Schl\u00fcter current fraction, SCENE fit", + "f_c_plasma_pfirsch_schluter_scene": "Pfirsch-Schl\u00fcter current fraction, SCENE fit", "psecdiv": "Low-grade heat lost in divertor (MW)", "psechcd": "Low-grade heat lost into HCD apparatus (MW)", "psechtmw": "Low-grade heat (MW)", @@ -17637,7 +17637,7 @@ "eta_beam_injector_wall_plug", "f_p_beam_injected_ions", "p_beam_injected_mw", - "pscf_scene", + "f_c_plasma_pfirsch_schluter_scene", "p_beam_shine_through_mw", "feffcd", "f_p_beam_orbit_loss", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index f5cf10a7ea..3530cf718b 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -510,7 +510,7 @@ Bootstrap_fraction_(Wilson)_____________________________________________ (f_c_plasma_bootstrap_wilson)_________________ 4.3666E-01 Diamagnetic_fraction_(Hender)___________________________________________ (f_c_plasma_diamagnetic_hender)________________ 1.1803E-02 Diamagnetic_fraction_(SCENE)____________________________________________ (f_c_plasma_diamagnetic_scene)_________________ 1.1022E-02 - Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (pscf_scene)__________________ -2.9744E-03 + Pfirsch-Schlueter_fraction_(SCENE)______________________________________ (f_c_plasma_pfirsch_schluter_scene)__________________ -2.9744E-03 Bootstrap_fraction_(enforced)___________________________________________ (bootipf.)____________________ 4.2290E-01 Diamagnetic_fraction_(enforced)_________________________________________ (diaipf.)_____________________ 0.0000E+00 Pfirsch-Schlueter_fraction_(enforced)___________________________________ (f_c_plasma_pfirsch_schluter.)______________________ 0.0000E+00 From e11385ed08e9a21d1273a9d7fa4bbdfda511d80e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 13:06:28 +0100 Subject: [PATCH 53/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20pinjemw=20to=20p?= =?UTF-8?q?=5Fhcd=5Finjected=5Felectrons=5Fmw=20for=20clarity=20and=20cons?= =?UTF-8?q?istency=20in=20current=20drive=20calculations?= 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/current_drive.py | 2 +- process/io/variable_metadata.py | 2 +- process/physics.py | 8 +++-- process/stellarator.py | 24 ++++++++++----- source/fortran/constraint_equations.f90 | 6 ++-- source/fortran/current_drive_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_current_drive.py | 22 ++++++++------ 23 files changed, 88 insertions(+), 74 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index db1a913777..e70786d7a3 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -459,7 +459,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.3659E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5338E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5213E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5213E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.5518E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.9397E+01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 1db24dfa96..44e6ee58a6 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -456,7 +456,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 8.0143E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0378E+01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 09c6e10d65..7a31757ca1 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -456,7 +456,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 8.0143E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0378E+01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index cb46b219db..da9e758e32 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -456,7 +456,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 8.0143E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0378E+01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 0120930500..e72f7fdcfb 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -456,7 +456,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 8.0143E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0378E+01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 7c3e3eddef..6c01a79dc6 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -312,7 +312,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -1307,7 +1307,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -2302,7 +2302,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -3297,7 +3297,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -4292,7 +4292,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -5287,7 +5287,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -6282,7 +6282,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -7277,7 +7277,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -8272,7 +8272,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP diff --git a/process/current_drive.py b/process/current_drive.py index 2fe9525282..f9338fe3de 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -728,7 +728,7 @@ def cudriv(self, output: bool): ) pinjmw1 = pinjemw1 + pinjimw1 pinjmwfix = pinjemwfix + pinjimwfix - current_drive_variables.pinjemw = pinjemw1 + pinjemwfix + current_drive_variables.p_hcd_injected_electrons_mw = pinjemw1 + pinjemwfix current_drive_variables.pinjimw = pinjimw1 + pinjimwfix heat_transport_variables.pinjwp = ( pinjwp1 + heat_transport_variables.pinjwpfix diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index ba286b0628..62f7355636 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -31,7 +31,7 @@ class VariableMetadata: "fusion_power": VariableMetadata( latex=r"$P_\mathrm{fus}$ [$MW$]", description="Fusion power", units="MW" ), - "pinjemw": VariableMetadata( + "p_hcd_injected_electrons_mw": VariableMetadata( latex=r"$P_\mathrm{inj}$ [$MW$]", description="Injected power", units="MW" ), "pnetelmw": VariableMetadata( diff --git a/process/physics.py b/process/physics.py index 8d6742e30b..32869b4ac6 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1791,7 +1791,9 @@ def physics(self): # ***************************** # # Pfirsch-Schlüter scaling for diamagnetic current - current_drive_variables.f_c_plasma_pfirsch_schluter_scene = ps_fraction_scene(physics_variables.beta) + current_drive_variables.f_c_plasma_pfirsch_schluter_scene = ps_fraction_scene( + physics_variables.beta + ) if physics_variables.i_pfirsch_schluter_current == 1: current_drive_variables.f_c_plasma_pfirsch_schluter = ( @@ -5006,8 +5008,8 @@ def outplas(self): po.ovarre( self.outfile, "Injection power to electrons (MW)", - "(pinjemw)", - current_drive_variables.pinjemw, + "(p_hcd_injected_electrons_mw)", + current_drive_variables.p_hcd_injected_electrons_mw, "OP ", ) if physics_variables.ignite == 1: diff --git a/process/stellarator.py b/process/stellarator.py index 45451c34a5..e14abc56fd 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4943,22 +4943,28 @@ def stheat(self, output: bool): if stellarator_variables.isthtr == 1: current_drive_variables.p_ecrh_injected_mw = current_drive_variables.pheat current_drive_variables.pinjimw = 0 - current_drive_variables.pinjemw = current_drive_variables.p_ecrh_injected_mw + current_drive_variables.p_hcd_injected_electrons_mw = ( + current_drive_variables.p_ecrh_injected_mw + ) current_drive_variables.eta_hcd_primary_injector_wall_plug = ( current_drive_variables.eta_ecrh_injector_wall_plug ) current_drive_variables.pinjwp = ( - current_drive_variables.pinjimw + current_drive_variables.pinjemw + current_drive_variables.pinjimw + + current_drive_variables.p_hcd_injected_electrons_mw ) / current_drive_variables.eta_hcd_primary_injector_wall_plug elif stellarator_variables.isthtr == 2: current_drive_variables.plhybd = current_drive_variables.pheat current_drive_variables.pinjimw = 0 - current_drive_variables.pinjemw = current_drive_variables.plhybd + current_drive_variables.p_hcd_injected_electrons_mw = ( + current_drive_variables.plhybd + ) current_drive_variables.eta_hcd_primary_injector_wall_plug = ( current_drive_variables.eta_lowhyb_injector_wall_plug ) current_drive_variables.pinjwp = ( - current_drive_variables.pinjimw + current_drive_variables.pinjemw + current_drive_variables.pinjimw + + current_drive_variables.p_hcd_injected_electrons_mw ) / current_drive_variables.eta_hcd_primary_injector_wall_plug elif stellarator_variables.isthtr == 3: ( @@ -4976,14 +4982,15 @@ def stheat(self, output: bool): current_drive_variables.pinjimw = ( current_drive_variables.pnbeam * f_p_beam_injected_ions ) - current_drive_variables.pinjemw = current_drive_variables.pnbeam * ( - 1 - f_p_beam_injected_ions + current_drive_variables.p_hcd_injected_electrons_mw = ( + current_drive_variables.pnbeam * (1 - f_p_beam_injected_ions) ) current_drive_variables.eta_hcd_primary_injector_wall_plug = ( current_drive_variables.eta_beam_injector_wall_plug ) current_drive_variables.pinjwp = ( - current_drive_variables.pinjimw + current_drive_variables.pinjemw + current_drive_variables.pinjimw + + current_drive_variables.p_hcd_injected_electrons_mw ) / current_drive_variables.eta_hcd_primary_injector_wall_plug else: raise ProcessValueError( @@ -4993,7 +5000,8 @@ def stheat(self, output: bool): # Total injected power current_drive_variables.p_hcd_injected_total_mw = ( - current_drive_variables.pinjemw + current_drive_variables.pinjimw + current_drive_variables.p_hcd_injected_electrons_mw + + current_drive_variables.pinjimw ) # Calculate neutral beam current diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 2fc47d9c50..89fa02df60 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -573,11 +573,11 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! f_alpha_plasma : input real : fraction of alpha power deposited in plasma !! alpha_power_electron_density : input real : alpha power per volume to electrons (MW/m3) !! piepv : input real : ion/electron equilibration power per volume (MW/m3) - !! pinjemw : input real : auxiliary injected power to electrons (MW) + !! p_hcd_injected_electrons_mw : input real : auxiliary injected power to electrons (MW) !! vol_plasma : input real : plasma volume (m3) use physics_variables, only: i_rad_loss, ignite, pden_electron_transport_loss_mw, pden_plasma_core_rad_mw, f_alpha_plasma, & alpha_power_electron_density, piepv, vol_plasma, pden_plasma_rad_mw - use current_drive_variables, only: pinjemw + use current_drive_variables, only: p_hcd_injected_electrons_mw implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -600,7 +600,7 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) ! if plasma not ignited include injected power if (ignite == 0) then - pdenom = f_alpha_plasma*alpha_power_electron_density + piepv + pinjemw/vol_plasma + pdenom = f_alpha_plasma*alpha_power_electron_density + piepv + p_hcd_injected_electrons_mw/vol_plasma else ! if plasma ignited pdenom = f_alpha_plasma*alpha_power_electron_density + piepv diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index 3063821aae..df1df1f7a4 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -205,7 +205,7 @@ module current_drive_variables real(dp) :: p_hcd_injected_max !! maximum allowable value for injected power (MW) (`constraint equation 30`) - real(dp) :: pinjemw + real(dp) :: p_hcd_injected_electrons_mw !! auxiliary injected power to electrons (MW) real(dp) :: pinjimw diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index f41378ab18..5758d43cbc 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -455,7 +455,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 8.0143E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0378E+01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 2e7d0ca687..15dd11a058 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -456,7 +456,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 8.0143E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0378E+01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index c134c55ab0..6fc4d71baf 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -456,7 +456,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 8.0143E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0378E+01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 013d3c633f..12161c0320 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -456,7 +456,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 8.0143E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0378E+01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b96daa0579..075d6d9265 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -452,7 +452,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.3990E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5739E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.9710E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.9710E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6412E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0515E+01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 213a99a281..06a42d7dbe 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -457,7 +457,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.3844E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5405E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6117E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0147E+01 OP @@ -1620,7 +1620,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.3962E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5532E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6185E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0232E+01 OP @@ -2783,7 +2783,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4019E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5603E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5559E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5559E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6064E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0080E+01 OP @@ -3946,7 +3946,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4011E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5610E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6098E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0123E+01 OP @@ -5109,7 +5109,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4038E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5630E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6255E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0319E+01 OP @@ -6272,7 +6272,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5588E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6362E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0452E+01 OP @@ -7435,7 +7435,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4026E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5618E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6410E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0512E+01 OP @@ -8598,7 +8598,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4038E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5636E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6288E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0360E+01 OP @@ -9761,7 +9761,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4002E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5600E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6168E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0211E+01 OP @@ -10924,7 +10924,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4060E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5683E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6240E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0300E+01 OP @@ -12087,7 +12087,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4104E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5733E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6300E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0375E+01 OP @@ -13250,7 +13250,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4100E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5722E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6412E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0515E+01 OP @@ -14413,7 +14413,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4146E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5792E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6476E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0595E+01 OP @@ -15576,7 +15576,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4201E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5863E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6402E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0503E+01 OP @@ -16739,7 +16739,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4257E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5936E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.5000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6326E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0408E+01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 93acec9aff..71bb720cb5 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -312,7 +312,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -1307,7 +1307,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -2302,7 +2302,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -3297,7 +3297,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -4292,7 +4292,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -5287,7 +5287,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -6282,7 +6282,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -7277,7 +7277,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP @@ -8272,7 +8272,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 5.1000E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 1.8956E+01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index bbd01e6fe1..cfce31ba1b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3506,7 +3506,7 @@ "piepv": 0.0, "pifecr": 10.0, "p_hcd_injected_max": 150.0, - "pinjemw": 0.0, + "p_hcd_injected_electrons_mw": 0.0, "p_hcd_secondary_injected_mw": 0.0, "pinjht": 0.0, "pinjimw": 0.0, @@ -10229,7 +10229,7 @@ "piepv": "ion/electron equilibration power per volume (MW/m3)", "pifecr": "IFE cryogenic power requirements (MW)", "p_hcd_injected_max": "maximum allowable value for injected power (MW) (`constraint equation 30`)", - "pinjemw": "auxiliary injected power to electrons (MW)", + "p_hcd_injected_electrons_mw": "auxiliary injected power to electrons (MW)", "p_hcd_secondary_injected_mw": "secondary total fixed auxiliary injected power (MW)", "pinjht": "power dissipated in heating and current drive system (MW)", "pinjimw": "auxiliary injected power to ions (MW)", @@ -17654,7 +17654,7 @@ "pheat", "pheatfix", "p_hcd_injected_max", - "pinjemw", + "p_hcd_injected_electrons_mw", "pinjimw", "p_hcd_injected_total_mw", "p_hcd_secondary_injected_mw", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index d9c898ce86..52bdb295b1 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -79,7 +79,7 @@ icc = 2 *icc = 4 * DESCRIPTION: Global power balance for electrons * JUSTIFICATION: Not recommended for use -* VARIABLES: i_rad_loss,ignite,pinjemw, Rest calculated in-situ +* VARIABLES: i_rad_loss,ignite,p_hcd_injected_electrons_mw, Rest calculated in-situ *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Performance ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 3530cf718b..acc93988a7 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -452,7 +452,7 @@ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.3990E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5739E+02 OP Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP - Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________ 7.9710E+01 OP + Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.9710E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6412E+02 OP Psep_/_R_ratio_(MW/m)___________________________________________________ (pdivt/rmajor)________________ 2.0515E+01 OP diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 256da171d5..f36024561b 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -87,7 +87,7 @@ class CudrivParam(NamedTuple): p_beam_shine_through_mw: Any = None - pinjemw: Any = None + p_hcd_injected_electrons_mw: Any = None pinjimw: Any = None @@ -195,7 +195,7 @@ class CudrivParam(NamedTuple): expected_echwpow: Any = None - expected_pinjemw: Any = None + expected_p_hcd_injected_electrons_mw: Any = None expected_bigq: Any = None @@ -236,7 +236,7 @@ class CudrivParam(NamedTuple): echwpow=0, p_beam_injected_mw=0, p_beam_shine_through_mw=0, - pinjemw=0, + p_hcd_injected_electrons_mw=0, pinjimw=0, bigq=0, f_c_plasma_bootstrap=0.27635918746616817, @@ -290,7 +290,7 @@ class CudrivParam(NamedTuple): expected_p_hcd_injected_total_mw=120.49600019005746, expected_effcd=0.05000000000000001, expected_echwpow=240.99200038011492, - expected_pinjemw=120.49600019005746, + expected_p_hcd_injected_electrons_mw=120.49600019005746, expected_bigq=0, ), CudrivParam( @@ -326,7 +326,7 @@ class CudrivParam(NamedTuple): echwpow=240.99200038011492, p_beam_injected_mw=0, p_beam_shine_through_mw=0, - pinjemw=120.49600019005746, + p_hcd_injected_electrons_mw=120.49600019005746, pinjimw=0, bigq=0, f_c_plasma_bootstrap=0.27635918746616817, @@ -380,7 +380,7 @@ class CudrivParam(NamedTuple): expected_p_hcd_injected_total_mw=120.49600019005746, expected_effcd=0.05000000000000001, expected_echwpow=240.99200038011492, - expected_pinjemw=120.49600019005746, + expected_p_hcd_injected_electrons_mw=120.49600019005746, expected_bigq=8.6725187311435423, ), ), @@ -528,7 +528,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.p_beam_shine_through_mw, ) - monkeypatch.setattr(current_drive_variables, "pinjemw", cudrivparam.pinjemw) + monkeypatch.setattr( + current_drive_variables, + "p_hcd_injected_electrons_mw", + cudrivparam.p_hcd_injected_electrons_mw, + ) monkeypatch.setattr(current_drive_variables, "pinjimw", cudrivparam.pinjimw) @@ -684,8 +688,8 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.expected_echwpow ) - assert current_drive_variables.pinjemw == pytest.approx( - cudrivparam.expected_pinjemw + assert current_drive_variables.p_hcd_injected_electrons_mw == pytest.approx( + cudrivparam.expected_p_hcd_injected_electrons_mw ) assert current_drive_variables.bigq == pytest.approx(cudrivparam.expected_bigq) From 16459b86c082280249506aab5a4490c4729ca288 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 13:07:35 +0100 Subject: [PATCH 54/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20pinjimw=20to=20p?= =?UTF-8?q?=5Fhcd=5Finjected=5Fions=5Fmw=20for=20clarity=20and=20consisten?= =?UTF-8?q?cy=20in=20current=20drive=20calculations?= 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/current_drive.py | 2 +- process/physics.py | 4 +-- process/stellarator.py | 14 ++++----- source/fortran/constraint_equations.f90 | 10 +++---- source/fortran/current_drive_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_current_drive.py | 12 +++++--- 22 files changed, 72 insertions(+), 68 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index e70786d7a3..e1334ac458 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -458,7 +458,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.7861E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.3659E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5338E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5213E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.5518E+02 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 44e6ee58a6..6d878f9b7f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -455,7 +455,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8172E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 7a31757ca1..fb93d48edf 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -455,7 +455,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8172E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index da9e758e32..13a75af4e0 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -455,7 +455,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8172E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index e72f7fdcfb..a43f6ac94a 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -455,7 +455,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8172E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 6c01a79dc6..7208b3a4e9 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -311,7 +311,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -1306,7 +1306,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -2301,7 +2301,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -3296,7 +3296,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -4291,7 +4291,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -5286,7 +5286,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -6281,7 +6281,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -7276,7 +7276,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -8271,7 +8271,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP diff --git a/process/current_drive.py b/process/current_drive.py index f9338fe3de..035a5f8542 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -729,7 +729,7 @@ def cudriv(self, output: bool): pinjmw1 = pinjemw1 + pinjimw1 pinjmwfix = pinjemwfix + pinjimwfix current_drive_variables.p_hcd_injected_electrons_mw = pinjemw1 + pinjemwfix - current_drive_variables.pinjimw = pinjimw1 + pinjimwfix + current_drive_variables.p_hcd_injected_ions_mw = pinjimw1 + pinjimwfix heat_transport_variables.pinjwp = ( pinjwp1 + heat_transport_variables.pinjwpfix ) diff --git a/process/physics.py b/process/physics.py index 32869b4ac6..78d75beffc 100644 --- a/process/physics.py +++ b/process/physics.py @@ -5001,8 +5001,8 @@ def outplas(self): po.ovarre( self.outfile, "Injection power to ions (MW)", - "(pinjimw)", - current_drive_variables.pinjimw, + "(p_hcd_injected_ions_mw)", + current_drive_variables.p_hcd_injected_ions_mw, "OP ", ) po.ovarre( diff --git a/process/stellarator.py b/process/stellarator.py index e14abc56fd..18f51bfdc0 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4942,7 +4942,7 @@ def stheat(self, output: bool): """ if stellarator_variables.isthtr == 1: current_drive_variables.p_ecrh_injected_mw = current_drive_variables.pheat - current_drive_variables.pinjimw = 0 + current_drive_variables.p_hcd_injected_ions_mw = 0 current_drive_variables.p_hcd_injected_electrons_mw = ( current_drive_variables.p_ecrh_injected_mw ) @@ -4950,12 +4950,12 @@ def stheat(self, output: bool): current_drive_variables.eta_ecrh_injector_wall_plug ) current_drive_variables.pinjwp = ( - current_drive_variables.pinjimw + current_drive_variables.p_hcd_injected_ions_mw + current_drive_variables.p_hcd_injected_electrons_mw ) / current_drive_variables.eta_hcd_primary_injector_wall_plug elif stellarator_variables.isthtr == 2: current_drive_variables.plhybd = current_drive_variables.pheat - current_drive_variables.pinjimw = 0 + current_drive_variables.p_hcd_injected_ions_mw = 0 current_drive_variables.p_hcd_injected_electrons_mw = ( current_drive_variables.plhybd ) @@ -4963,7 +4963,7 @@ def stheat(self, output: bool): current_drive_variables.eta_lowhyb_injector_wall_plug ) current_drive_variables.pinjwp = ( - current_drive_variables.pinjimw + current_drive_variables.p_hcd_injected_ions_mw + current_drive_variables.p_hcd_injected_electrons_mw ) / current_drive_variables.eta_hcd_primary_injector_wall_plug elif stellarator_variables.isthtr == 3: @@ -4979,7 +4979,7 @@ def stheat(self, output: bool): current_drive_variables.pheat * current_drive_variables.f_p_beam_orbit_loss ) - current_drive_variables.pinjimw = ( + current_drive_variables.p_hcd_injected_ions_mw = ( current_drive_variables.pnbeam * f_p_beam_injected_ions ) current_drive_variables.p_hcd_injected_electrons_mw = ( @@ -4989,7 +4989,7 @@ def stheat(self, output: bool): current_drive_variables.eta_beam_injector_wall_plug ) current_drive_variables.pinjwp = ( - current_drive_variables.pinjimw + current_drive_variables.p_hcd_injected_ions_mw + current_drive_variables.p_hcd_injected_electrons_mw ) / current_drive_variables.eta_hcd_primary_injector_wall_plug else: @@ -5001,7 +5001,7 @@ def stheat(self, output: bool): current_drive_variables.p_hcd_injected_total_mw = ( current_drive_variables.p_hcd_injected_electrons_mw - + current_drive_variables.pinjimw + + current_drive_variables.p_hcd_injected_ions_mw ) # Calculate neutral beam current diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 89fa02df60..987194da43 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -518,10 +518,10 @@ subroutine constraint_eqn_003(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! piepv : input real : ion/electron equilibration power per volume (MW/m3) !! f_alpha_plasma : input real : fraction of alpha power deposited in plasma !! alpha_power_ions_density : input real : alpha power per volume to ions (MW/m3) - !! pinjimw : input real : auxiliary injected power to ions (MW) + !! p_hcd_injected_ions_mw : input real : auxiliary injected power to ions (MW) !! vol_plasma : input real : plasma volume (m3) use physics_variables, only: ignite, pden_ion_transport_loss_mw, piepv, f_alpha_plasma, alpha_power_ions_density, vol_plasma - use current_drive_variables, only: pinjimw + use current_drive_variables, only: p_hcd_injected_ions_mw implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -531,9 +531,9 @@ subroutine constraint_eqn_003(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) ! No assume plasma ignition: if (ignite == 0) then - tmp_cc = 1.0D0 - (pden_ion_transport_loss_mw + piepv) / (f_alpha_plasma*alpha_power_ions_density + pinjimw/vol_plasma) - tmp_con = (f_alpha_plasma*alpha_power_ions_density + pinjimw/vol_plasma) * (1.0D0 - tmp_cc) - tmp_err = (f_alpha_plasma*alpha_power_ions_density + pinjimw/vol_plasma) * tmp_cc + tmp_cc = 1.0D0 - (pden_ion_transport_loss_mw + piepv) / (f_alpha_plasma*alpha_power_ions_density + p_hcd_injected_ions_mw/vol_plasma) + tmp_con = (f_alpha_plasma*alpha_power_ions_density + p_hcd_injected_ions_mw/vol_plasma) * (1.0D0 - tmp_cc) + tmp_err = (f_alpha_plasma*alpha_power_ions_density + p_hcd_injected_ions_mw/vol_plasma) * tmp_cc tmp_symbol = '=' tmp_units = 'MW/m3' ! Plasma ignited: diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index df1df1f7a4..cfd0ce2780 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -208,7 +208,7 @@ module current_drive_variables real(dp) :: p_hcd_injected_electrons_mw !! auxiliary injected power to electrons (MW) - real(dp) :: pinjimw + real(dp) :: p_hcd_injected_ions_mw !! auxiliary injected power to ions (MW) real(dp) :: p_hcd_injected_total_mw diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 5758d43cbc..73fe2d7b25 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -454,7 +454,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8172E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 15dd11a058..a2b0326ed5 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -455,7 +455,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8172E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 6fc4d71baf..8051f289d4 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -455,7 +455,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8172E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 12161c0320..7a49a85f9e 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -455,7 +455,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8172E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5772E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 8.0143E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6303E+02 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 075d6d9265..5322d366ee 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -451,7 +451,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8258E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.3990E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5739E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.9710E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6412E+02 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 06a42d7dbe..d5759a7654 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -456,7 +456,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.7689E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.3844E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5405E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6117E+02 OP @@ -1619,7 +1619,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.7689E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.3962E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5532E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6185E+02 OP @@ -2782,7 +2782,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.7689E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4019E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5603E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5559E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6064E+02 OP @@ -3945,7 +3945,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.7813E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4011E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5610E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6098E+02 OP @@ -5108,7 +5108,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.7813E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4038E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5630E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6255E+02 OP @@ -6271,7 +6271,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.7813E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4013E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5588E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6362E+02 OP @@ -7434,7 +7434,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.7937E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4026E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5618E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6410E+02 OP @@ -8597,7 +8597,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.7937E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4038E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5636E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6288E+02 OP @@ -9760,7 +9760,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.7937E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4002E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5600E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6168E+02 OP @@ -10923,7 +10923,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8061E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4060E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5683E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6240E+02 OP @@ -12086,7 +12086,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8061E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4104E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5733E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6300E+02 OP @@ -13249,7 +13249,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8061E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4100E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5722E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6412E+02 OP @@ -14412,7 +14412,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8185E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4146E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5792E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6476E+02 OP @@ -15575,7 +15575,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8185E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4201E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5863E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6402E+02 OP @@ -16738,7 +16738,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8185E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.4257E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5936E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.5000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6326E+02 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 71bb720cb5..b956360850 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -311,7 +311,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -1306,7 +1306,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -2301,7 +2301,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -3296,7 +3296,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -4291,7 +4291,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -5286,7 +5286,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -6281,7 +6281,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -7276,7 +7276,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP @@ -8271,7 +8271,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8143E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.5736E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.7258E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 5.1000E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.7397E+02 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index cfce31ba1b..92be7eb8a2 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3509,7 +3509,7 @@ "p_hcd_injected_electrons_mw": 0.0, "p_hcd_secondary_injected_mw": 0.0, "pinjht": 0.0, - "pinjimw": 0.0, + "p_hcd_injected_ions_mw": 0.0, "pinjmax": 120.0, "p_hcd_injected_total_mw": 0.0, "pinjwp": 0.0, @@ -10232,7 +10232,7 @@ "p_hcd_injected_electrons_mw": "auxiliary injected power to electrons (MW)", "p_hcd_secondary_injected_mw": "secondary total fixed auxiliary injected power (MW)", "pinjht": "power dissipated in heating and current drive system (MW)", - "pinjimw": "auxiliary injected power to ions (MW)", + "p_hcd_injected_ions_mw": "auxiliary injected power to ions (MW)", "pinjmax": "maximum injector power during pulse (heating and ramp-up/down phase) (MW)", "p_hcd_injected_total_mw": "total auxiliary injected power (MW)", "pinjwp": "injector wall plug power (MW)", @@ -17655,7 +17655,7 @@ "pheatfix", "p_hcd_injected_max", "p_hcd_injected_electrons_mw", - "pinjimw", + "p_hcd_injected_ions_mw", "p_hcd_injected_total_mw", "p_hcd_secondary_injected_mw", "plasipf", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 52bdb295b1..9d136c1b8c 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2779,7 +2779,7 @@ feffcd = 1.0 *icc = 3 * DESCRIPTION: Global power balance for ions (NBI) * JUSTIFICATION: Not used as no NBI used -* VARIABLES: pinjimw,ignite, Rest calculated in-situ +* VARIABLES: p_hcd_injected_ions_mw,ignite, Rest calculated in-situ *icc = 7 * DESCRIPTION: Equation for hot ion beam density (NBI) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index acc93988a7..1037f28972 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -451,7 +451,7 @@ Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________ 2.8258E-01 Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________ 1.3990E+02 OP Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________ 1.5739E+02 OP - Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________ 0.0000E+00 OP + Injection_power_to_ions_(MW)____________________________________________ (p_hcd_injected_ions_mw)_____________________ 0.0000E+00 OP Injection_power_to_electrons_(MW)_______________________________________ (p_hcd_injected_electrons_mw)_____________________ 7.9710E+01 OP Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________ 0 Power_into_divertor_zone_via_charged_particles_(MW)_____________________ (pdivt)_______________________ 1.6412E+02 OP diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index f36024561b..3a83273a21 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -89,7 +89,7 @@ class CudrivParam(NamedTuple): p_hcd_injected_electrons_mw: Any = None - pinjimw: Any = None + p_hcd_injected_ions_mw: Any = None bigq: Any = None @@ -237,7 +237,7 @@ class CudrivParam(NamedTuple): p_beam_injected_mw=0, p_beam_shine_through_mw=0, p_hcd_injected_electrons_mw=0, - pinjimw=0, + p_hcd_injected_ions_mw=0, bigq=0, f_c_plasma_bootstrap=0.27635918746616817, f_c_plasma_bootstrap_max=0.95000000000000007, @@ -327,7 +327,7 @@ class CudrivParam(NamedTuple): p_beam_injected_mw=0, p_beam_shine_through_mw=0, p_hcd_injected_electrons_mw=120.49600019005746, - pinjimw=0, + p_hcd_injected_ions_mw=0, bigq=0, f_c_plasma_bootstrap=0.27635918746616817, f_c_plasma_bootstrap_max=0.95000000000000007, @@ -534,7 +534,11 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): cudrivparam.p_hcd_injected_electrons_mw, ) - monkeypatch.setattr(current_drive_variables, "pinjimw", cudrivparam.pinjimw) + monkeypatch.setattr( + current_drive_variables, + "p_hcd_injected_ions_mw", + cudrivparam.p_hcd_injected_ions_mw, + ) monkeypatch.setattr(current_drive_variables, "bigq", cudrivparam.bigq) From 38f1e1cae720c2fee4996efee519f9119510c3c2 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 13:14:37 +0100 Subject: [PATCH 55/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20pheat=20to=20p=5F?= =?UTF-8?q?hcd=5Fprimary=5Fextra=5Fheat=5Fmw=20for=20clarity=20and=20consi?= =?UTF-8?q?stency=20in=20current=20drive=20calculations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating-and-current-drive.md | 4 +-- .../proc-pages/fusion-devices/stellarator.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/current_drive.py | 14 ++++---- process/input.py | 2 +- process/io/mfile_comparison.py | 4 +-- process/io/plot_proc.py | 10 +++--- process/io/variable_metadata.py | 2 +- process/stellarator.py | 12 +++---- source/fortran/constraint_equations.f90 | 4 +-- source/fortran/current_drive_variables.f90 | 2 +- source/fortran/numerics.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 20 ++++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 20 ++++++------ tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- .../stellarator_helias_once_through.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_current_drive.py | 8 ++--- tracking/tracking_data.py | 2 +- 42 files changed, 116 insertions(+), 116 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md index 7bc547f5cc..498ab8453b 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md @@ -36,7 +36,7 @@ The power injected by the secondary current drive scheme has to be set to a fixe ## Plasma heating only -In addition to current drive, some auxiliary power can be used to only heat the plasma. The value of input parameters `pheat` determines the amount of auxiliary heating power (in MW) to be applied to the plasma. This variable may be used as an iteration variable (`ixc = 11`). +In addition to current drive, some auxiliary power can be used to only heat the plasma. The value of input parameters `p_hcd_primary_extra_heat_mw` determines the amount of auxiliary heating power (in MW) to be applied to the plasma. This variable may be used as an iteration variable (`ixc = 11`). ### Secondary heating @@ -44,7 +44,7 @@ Like for a current drive and heating system a fixed amount of heating power that ## Ignited plasma -Switch `ignite` can be used to denote whether the plasma is ignited, i.e. fully self-sustaining without the need for any injected auxiliary power during the burn. If `ignite` = 1, the calculated injected power does not contribute to the plasma power balance, although the cost of the auxiliary power system is taken into account (the system is then assumed to be required to provide heating etc during the plasma start-up phase only - use `pheat` to indicate the power requirement). If `ignite` = 0, the plasma is not ignited, and the auxiliary power is taken into account in the plasma power balance during the burn phase. Also, constraint equation 28 (`icc = 28`) can be turned on to enforce the fusion gain *Q* to be at least `bigqmin`. +Switch `ignite` can be used to denote whether the plasma is ignited, i.e. fully self-sustaining without the need for any injected auxiliary power during the burn. If `ignite` = 1, the calculated injected power does not contribute to the plasma power balance, although the cost of the auxiliary power system is taken into account (the system is then assumed to be required to provide heating etc during the plasma start-up phase only - use `p_hcd_primary_extra_heat_mw` to indicate the power requirement). If `ignite` = 0, the plasma is not ignited, and the auxiliary power is taken into account in the plasma power balance during the burn phase. Also, constraint equation 28 (`icc = 28`) can be turned on to enforce the fusion gain *Q* to be at least `bigqmin`. [^1]: N. A. Uckan and ITER Physics Group, *"ITER Physics Design Guidelines: 1989"*, ITER Documentation Series, No. 10, IAEA/ITER/DS/10 (1990) diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index 3fa84f047a..801c9190dc 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -173,7 +173,7 @@ Stellarators require no curren drive, although provision for auxiliary heating d `isthtr = 3` : neutral beam injection -The value of variable `pheat` determines the actual amount of auxiliary heating power (in Watts) to be applied to the plasma. This variable may be used as an iteration variable (no. 11). Switch `ignite` may be used if necessary. +The value of variable `p_hcd_primary_extra_heat_mw` determines the actual amount of auxiliary heating power (in Watts) to be applied to the plasma. This variable may be used as an iteration variable (no. 11). Switch `ignite` may be used if necessary. ### Divertor diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index e1334ac458..510b23479f 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -533,7 +533,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 2.1293E-01 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0990E+01 OP @@ -1658,7 +1658,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 6d878f9b7f..a66d05e327 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -531,7 +531,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP @@ -1652,7 +1652,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index fb93d48edf..a8b00282f2 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -531,7 +531,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP @@ -1652,7 +1652,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 13a75af4e0..c22f237db7 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -531,7 +531,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP @@ -1653,7 +1653,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a43f6ac94a..c3df9f28f1 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -531,7 +531,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP @@ -1653,7 +1653,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 9a9a126832..b374171e95 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -463,7 +463,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 7208b3a4e9..1b5e14084c 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -386,7 +386,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -1381,7 +1381,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -2376,7 +2376,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -3371,7 +3371,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -4366,7 +4366,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -5361,7 +5361,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -6356,7 +6356,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -7351,7 +7351,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -8346,7 +8346,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -9149,7 +9149,7 @@ i_hcd_primary = 10 * Switch for current drive efficiency model; eta_cd_norm_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) -pheat = 50.0 +p_hcd_primary_extra_heat_mw = 50.0 *----------------Divertor Variables----------------* diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 75a4f81b04..051a50be64 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -463,7 +463,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/process/current_drive.py b/process/current_drive.py index 035a5f8542..58d7c3f22f 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -606,7 +606,7 @@ def cudriv(self, output: bool): ) * physics_variables.plasma_current / effrfss - + current_drive_variables.pheat + + current_drive_variables.p_hcd_primary_extra_heat_mw ) pinjimw1 = 0.0e0 pinjemw1 = current_drive_variables.plhybd @@ -637,7 +637,7 @@ def cudriv(self, output: bool): ) * physics_variables.plasma_current / effrfss - + current_drive_variables.pheat + + current_drive_variables.p_hcd_primary_extra_heat_mw ) pinjemw1 = current_drive_variables.p_ecrh_injected_mw @@ -662,7 +662,7 @@ def cudriv(self, output: bool): ) * physics_variables.plasma_current / effnbss - + current_drive_variables.pheat + + current_drive_variables.p_hcd_primary_extra_heat_mw ) # Account for first orbit losses @@ -840,15 +840,15 @@ def cudriv(self, output: bool): po.ovarre( self.outfile, "Auxiliary power used for plasma heating only (MW)", - "(pheat)", - current_drive_variables.pheat + current_drive_variables.pheatfix, + "(p_hcd_primary_extra_heat_mw)", + current_drive_variables.p_hcd_primary_extra_heat_mw + current_drive_variables.pheatfix, ) po.ovarre( self.outfile, "Power injected for current drive (MW)", "(pcurrentdrivemw)", current_drive_variables.p_hcd_injected_total_mw - - current_drive_variables.pheat + - current_drive_variables.p_hcd_primary_extra_heat_mw - current_drive_variables.pheatfix, ) po.ovarre( @@ -862,7 +862,7 @@ def cudriv(self, output: bool): self.outfile, "Power injected for main current drive (MW)", "(pcurrentdrivemw1)", - pinjmw1 - current_drive_variables.pheat, + pinjmw1 - current_drive_variables.p_hcd_primary_extra_heat_mw, ) po.ovarre( self.outfile, diff --git a/process/input.py b/process/input.py index 486411a70d..c2bd7243d6 100644 --- a/process/input.py +++ b/process/input.py @@ -962,7 +962,7 @@ def __post_init__(self): ), "rho_pf_coil": InputVariable(fortran.pfcoil_variables, float, range=(0.0, 0.0001)), "pfusife": InputVariable(fortran.ife_variables, float, range=(0.0, 10000.0)), - "pheat": InputVariable(fortran.current_drive_variables, float, range=(0.0, 1000.0)), + "p_hcd_primary_extra_heat_mw": InputVariable(fortran.current_drive_variables, float, range=(0.0, 1000.0)), "pheatfix": InputVariable( fortran.current_drive_variables, float, range=(0.0, 1000.0) ), diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 86e95b61d4..f65e02edab 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -84,7 +84,7 @@ "p_blkt_nuclear_heat_total_mw", "pnucshld", "pdivt", - "pheat", + "p_hcd_primary_extra_heat_mw", "f_c_plasma_bootstrap", "aux_current_fraction", "inductive_current_fraction", @@ -173,7 +173,7 @@ "pgrossmw", "pnetelmw", "p_hcd_injected_total_mw", - "pheat", + "p_hcd_primary_extra_heat_mw", "f_c_plasma_bootstrap", "aux_current_fraction", "inductive_current_fraction", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index f269603a17..43f303b247 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3123,7 +3123,7 @@ def plot_current_drive_info(axis, mfile_data, scan): if ecrh: data = [ (pinjie, "Steady state auxiliary power", "MW"), - ("pheat", "Power for heating only", "MW"), + ("p_hcd_primary_extra_heat_mw", "Power for heating only", "MW"), ("f_c_plasma_bootstrap", "Bootstrap fraction", ""), ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), @@ -3153,7 +3153,7 @@ def plot_current_drive_info(axis, mfile_data, scan): if nbi: data = [ (pinjie, "Steady state auxiliary power", "MW"), - ("pheat", "Power for heating only", "MW"), + ("p_hcd_primary_extra_heat_mw", "Power for heating only", "MW"), ("f_c_plasma_bootstrap", "Bootstrap fraction", ""), ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), @@ -3179,7 +3179,7 @@ def plot_current_drive_info(axis, mfile_data, scan): if ebw: data = [ (pinjie, "Steady state auxiliary power", "MW"), - ("pheat", "Power for heating only", "MW"), + ("p_hcd_primary_extra_heat_mw", "Power for heating only", "MW"), ("f_c_plasma_bootstrap", "Bootstrap fraction", ""), ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), @@ -3208,7 +3208,7 @@ def plot_current_drive_info(axis, mfile_data, scan): if lhcd: data = [ (pinjie, "Steady state auxiliary power", "MW"), - ("pheat", "Power for heating only", "MW"), + ("p_hcd_primary_extra_heat_mw", "Power for heating only", "MW"), ("f_c_plasma_bootstrap", "Bootstrap fraction", ""), ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), @@ -3237,7 +3237,7 @@ def plot_current_drive_info(axis, mfile_data, scan): if iccd: data = [ (pinjie, "Steady state auxiliary power", "MW"), - ("pheat", "Power for heating only", "MW"), + ("p_hcd_primary_extra_heat_mw", "Power for heating only", "MW"), ("f_c_plasma_bootstrap", "Bootstrap fraction", ""), ("aux_current_fraction", "Auxiliary fraction", ""), ("inductive_current_fraction", "Inductive fraction", ""), diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 62f7355636..0a571974e8 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -225,7 +225,7 @@ class VariableMetadata: description="Central solenoid height / TF coil internal height", units="m", ), - "pheat": VariableMetadata( + "p_hcd_primary_extra_heat_mw": VariableMetadata( latex=r"$ P_{\mathrm{heat}}$ [$MW$]", description="Heat power", units="MW" ), "eta_cd_hcd_primary": VariableMetadata( diff --git a/process/stellarator.py b/process/stellarator.py index 18f51bfdc0..40efe6f7f4 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4941,7 +4941,7 @@ def stheat(self, output: bool): AEA FUS 172: Physics Assessment for the European Reactor Study """ if stellarator_variables.isthtr == 1: - current_drive_variables.p_ecrh_injected_mw = current_drive_variables.pheat + current_drive_variables.p_ecrh_injected_mw = current_drive_variables.p_hcd_primary_extra_heat_mw current_drive_variables.p_hcd_injected_ions_mw = 0 current_drive_variables.p_hcd_injected_electrons_mw = ( current_drive_variables.p_ecrh_injected_mw @@ -4954,7 +4954,7 @@ def stheat(self, output: bool): + current_drive_variables.p_hcd_injected_electrons_mw ) / current_drive_variables.eta_hcd_primary_injector_wall_plug elif stellarator_variables.isthtr == 2: - current_drive_variables.plhybd = current_drive_variables.pheat + current_drive_variables.plhybd = current_drive_variables.p_hcd_primary_extra_heat_mw current_drive_variables.p_hcd_injected_ions_mw = 0 current_drive_variables.p_hcd_injected_electrons_mw = ( current_drive_variables.plhybd @@ -4972,11 +4972,11 @@ def stheat(self, output: bool): f_p_beam_injected_ions, current_drive_variables.f_p_beam_shine_through, ) = self.current_drive.culnbi() - current_drive_variables.pnbeam = current_drive_variables.pheat * ( + current_drive_variables.pnbeam = current_drive_variables.p_hcd_primary_extra_heat_mw * ( 1 - current_drive_variables.f_p_beam_orbit_loss ) current_drive_variables.p_beam_orbit_loss_mw = ( - current_drive_variables.pheat + current_drive_variables.p_hcd_primary_extra_heat_mw * current_drive_variables.f_p_beam_orbit_loss ) current_drive_variables.p_hcd_injected_ions_mw = ( @@ -5054,8 +5054,8 @@ def stheat(self, output: bool): po.ovarre( self.outfile, "Auxiliary power supplied to plasma (MW)", - "(pheat)", - current_drive_variables.pheat, + "(p_hcd_primary_extra_heat_mw)", + current_drive_variables.p_hcd_primary_extra_heat_mw, ) po.ovarre( self.outfile, diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 987194da43..c21d21a7e3 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -3390,7 +3390,7 @@ subroutine constraint_eqn_091(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) use constraint_variables, only: fecrh_ignition use stellarator_variables, only: max_gyrotron_frequency, te0_ecrh_achievable, powerscaling_constraint, powerht_constraint use physics_variables, only: ignite - use current_drive_variables, only: pheat + use current_drive_variables, only: p_hcd_primary_extra_heat_mw implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -3400,7 +3400,7 @@ subroutine constraint_eqn_091(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) ! Achievable ECRH te needs to be larger than needed te for igntion if(ignite==0) then - tmp_cc = 1.0D0 - fecrh_ignition* (powerht_constraint+pheat)/powerscaling_constraint + tmp_cc = 1.0D0 - fecrh_ignition* (powerht_constraint+p_hcd_primary_extra_heat_mw)/powerscaling_constraint else tmp_cc = 1.0D0 - fecrh_ignition* powerht_constraint/powerscaling_constraint endif diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index cfd0ce2780..afe6dd8e7d 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -196,7 +196,7 @@ module current_drive_variables real(dp) :: dx_beam_shield !! neutral beam duct shielding thickness (m) - real(dp) :: pheat + real(dp) :: p_hcd_primary_extra_heat_mw !! heating power not used for current drive (MW) (`iteration variable 11`) real(dp) :: pheatfix diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index bb1c58a185..59d1ab3723 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -216,7 +216,7 @@ module numerics !!
  • ( 8) fbeta_poloidal_eps (f-value for equation 6) !!
  • ( 9) fdene (f-value for equation 5) !!
  • (10) hfact - !!
  • (11) pheat + !!
  • (11) p_hcd_primary_extra_heat_mw !!
  • (12) oacdcp !!
  • (13) dr_tf_inboard (NOT RECOMMENDED) !!
  • (14) fwalld (f-value for equation 8) diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 73fe2d7b25..879f2aff8e 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -530,7 +530,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP @@ -1651,7 +1651,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index a2b0326ed5..0163c9bcb3 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -531,7 +531,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP @@ -1652,7 +1652,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 8051f289d4..dbb4fc2414 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -531,7 +531,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP @@ -1652,7 +1652,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 7a49a85f9e..9940e97c10 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -531,7 +531,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.1429E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0060E+01 OP @@ -1652,7 +1652,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 51971638b0..93d224e53e 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -462,7 +462,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 5322d366ee..4e9c3daca1 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -528,7 +528,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 4.7098E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0141E+01 OP @@ -1653,7 +1653,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 73f00d5e33..d7bddf9a5b 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -164,7 +164,7 @@ f_c_plasma_bootstrap_max = 0.95 * maximum fraction of plasma current from boots eta_ecrh_injector_wall_plug = 0.5 * ECH wall plug to injector efficiency eta_cd_norm_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) i_hcd_primary = 10 * Switch for current drive efficiency model; -pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) +p_hcd_primary_extra_heat_mw = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) p_hcd_injected_max = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) *-------------------Dcll Module--------------------* diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index c8ce5349d3..90b039dd60 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -170,7 +170,7 @@ i_hcd_primary = 10 * Switch for current drive efficiency model; eta_cd_norm_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) -pheat = 50.0 +p_hcd_primary_extra_heat_mw = 50.0 *----------------Divertor Variables----------------* diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index d5759a7654..0275cb9c1a 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -532,7 +532,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1129E+01 OP @@ -1695,7 +1695,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1326E+01 OP @@ -2858,7 +2858,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 5.5891E-01 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1272E+01 OP @@ -4021,7 +4021,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1468E+01 OP @@ -5184,7 +5184,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1502E+01 OP @@ -6347,7 +6347,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1436E+01 OP @@ -7510,7 +7510,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1481E+01 OP @@ -8673,7 +8673,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1510E+01 OP @@ -9836,7 +9836,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1428E+01 OP @@ -10999,7 +10999,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1568E+01 OP @@ -12162,7 +12162,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1696E+01 OP @@ -13325,7 +13325,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1690E+01 OP @@ -14488,7 +14488,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1807E+01 OP @@ -15651,7 +15651,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.1919E+01 OP @@ -16814,7 +16814,7 @@ # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 0.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.2037E+01 OP @@ -17939,7 +17939,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index b956360850..78935b2da1 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -386,7 +386,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -1381,7 +1381,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -2376,7 +2376,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -3371,7 +3371,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -4366,7 +4366,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -5361,7 +5361,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -6356,7 +6356,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -7351,7 +7351,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -8346,7 +8346,7 @@ # Energy confinement times, and required H-factors : # # Current Drive System # Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 5.0000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 5.0000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 1.0000E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.9000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 3.9003E+01 OP @@ -9149,7 +9149,7 @@ i_hcd_primary = 10 * Switch for current drive efficiency model; eta_cd_norm_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) -pheat = 50.0 +p_hcd_primary_extra_heat_mw = 50.0 *----------------Divertor Variables----------------* diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index bd95297d56..a502d9ea0f 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -170,7 +170,7 @@ i_hcd_primary = 10 * Switch for current drive efficiency model; eta_cd_norm_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) -pheat = 50.0 +p_hcd_primary_extra_heat_mw = 50.0 *----------------Divertor Variables----------------* diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 793e9d3b4f..1cf2d1bb2a 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -170,7 +170,7 @@ i_hcd_primary = 10 * Switch for current drive efficiency model; eta_cd_norm_ecrh = 0.30 * ECRH gamma_CD (user input) eta_ecrh_injector_wall_plug = 0.4 * ECRH wall-plug efficiency p_hcd_injected_max = 51.0 * Maximum allowable value for injected power (mw) -pheat = 50.0 +p_hcd_primary_extra_heat_mw = 50.0 *----------------Divertor Variables----------------* diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 92be7eb8a2..067a49d6ad 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3490,7 +3490,7 @@ "pfwdiv": 0.0, "pfwpmw": 0.0, "pgrossmw": 0.0, - "pheat": 0.0, + "p_hcd_primary_extra_heat_mw": 0.0, "pheatfix": 0.0, "phi_0_n_BZ_IB": 512000000000000.0, "phi_0_n_BZ_OB": 565500000000000.0, @@ -10213,7 +10213,7 @@ "pfwdiv": "heat removal from first wall/divertor (MW)", "pfwpmw": "Total mean wall plug power dissipated in PFC and CS power supplies (MW) (issue #713)", "pgrossmw": "gross electric power (MW)", - "pheat": "heating power not used for current drive (MW) (`iteration variable 11`)", + "p_hcd_primary_extra_heat_mw": "heating power not used for current drive (MW) (`iteration variable 11`)", "pheatfix": "secondary fixed heating power not used for current drive (MW)", "phi_0_n_BZ_IB": "Pre-exp term in IB BZ [n/cm^2/sec]", "phi_0_n_BZ_OB": "Pre-exp term in OB BZ [n/cm^2/sec]", @@ -13743,7 +13743,7 @@ "lb": 0.0, "ub": 10000.0 }, - "pheat": { + "p_hcd_primary_extra_heat_mw": { "lb": 0.0, "ub": 1000.0 }, @@ -15436,7 +15436,7 @@ "lb": 500.0, "ub": 3000.0 }, - "pheat": { + "p_hcd_primary_extra_heat_mw": { "lb": 0.001, "ub": 1000.0 }, @@ -15666,7 +15666,7 @@ "dr_cs": 0.811, "pdrive": 23000000.0, "pfusife": 1000.0, - "pheat": 0.0, + "p_hcd_primary_extra_heat_mw": 0.0, "q": 3.0, "qtargettotal": 5000000.0, "r_cp_top": 0.0, @@ -15744,7 +15744,7 @@ }, "11": { "lb": 0.001, - "name": "pheat", + "name": "p_hcd_primary_extra_heat_mw", "ub": 1000.0 }, "110": { @@ -16503,7 +16503,7 @@ "107": "favail", "108": "breeder_f", "109": "f_nd_alpha_electron", - "11": "pheat", + "11": "p_hcd_primary_extra_heat_mw", "110": "falpha_energy_confinement", "111": "fniterpump", "112": "fzeffmax", @@ -16779,7 +16779,7 @@ "dr_cs": "16", "pdrive": "85", "pfusife": "155", - "pheat": "11", + "p_hcd_primary_extra_heat_mw": "11", "q": "18", "qtargettotal": "124", "r_cp_top": "162", @@ -17651,7 +17651,7 @@ "i_hcd_calculations", "f_p_beam_shine_through", "dx_beam_shield", - "pheat", + "p_hcd_primary_extra_heat_mw", "pheatfix", "p_hcd_injected_max", "p_hcd_injected_electrons_mw", @@ -20391,7 +20391,7 @@ "pfbldgm3": "real_variable", "rho_pf_coil": "real_variable", "pfusife": "real_variable", - "pheat": "real_variable", + "p_hcd_primary_extra_heat_mw": "real_variable", "pheatfix": "real_variable", "pibv": "real_variable", "pifecr": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index 359063c615..08c30c2b54 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -105,7 +105,7 @@ beta_min = 0.01 *lower beta limit *-------------Current Drive Variables--------------* eta_ecrh_injector_wall_plug = 0.7 *ECH wall plug to injector efficiency -pheat = 0.0 *Heating power not used for current drive (MW) +p_hcd_primary_extra_heat_mw = 0.0 *Heating power not used for current drive (MW) *----------------Divertor Variables----------------* diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 7fb387338f..a2b934e77f 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -465,7 +465,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 6b9d577679..b5549fb2dc 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -447,7 +447,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** 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 9e2fc64b9e..48562d5d1f 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -164,7 +164,7 @@ f_c_plasma_bootstrap_max = 0.95 * maximum fraction of plasma current from boots eta_ecrh_injector_wall_plug = 0.5 * ECH wall plug to injector efficiency eta_cd_norm_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) i_hcd_primary = 10 * Switch for current drive efficiency model; -pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) +p_hcd_primary_extra_heat_mw = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) p_hcd_injected_max = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) *-------------------Dcll Module--------------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 9d136c1b8c..b68afac8ff 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2708,7 +2708,7 @@ p_hcd_injected_max = 150.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *ixc = 11 -*pheat = +*p_hcd_primary_extra_heat_mw = *boundl(11) = *boundu(11) = * DESCRIPTION: Heating power not used for C.D. (MW) diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index 4eb818c36f..282ce8f1cf 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -154,7 +154,7 @@ ucme = 3.e8 * cost of maintenance equipment ($) *-------------Current Drive Variables--------------* eta_ecrh_injector_wall_plug = 0.7 * ECH wall plug to injector efficiency -pheat = 0. * heating power not used for current drive (MW) (`iteration variable 11`) +p_hcd_primary_extra_heat_mw = 0. * heating power not used for current drive (MW) (`iteration variable 11`) *-------------------Dcll Module--------------------* diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index d75aac1831..87b43aa753 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -463,7 +463,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 1037f28972..516fe83972 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -528,7 +528,7 @@ Current_drive_efficiency_model__________________________________________ (i_hcd_primary)_______________________ 10 Secondary_current_drive_efficiency_model________________________________ (i_hcd_secondary)____________________ 0 Ratio_of_power_for_flat-top_to_start-up_(MW)____________________________ (startupratio)________________ 1.0000E+00 - Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (pheat)_______________________ 7.5000E+01 + Auxiliary_power_used_for_plasma_heating_only_(MW)_______________________ (p_hcd_primary_extra_heat_mw)_______________________ 7.5000E+01 Power_injected_for_current_drive_(MW)___________________________________ (pcurrentdrivemw)_____________ 4.7098E+00 Maximum_Allowed_Bootstrap_current_fraction______________________________ (f_c_plasma_bootstrap_max)_____________________ 9.5000E-01 Fusion_gain_factor_Q____________________________________________________ (bigq)________________________ 2.0141E+01 OP @@ -1654,7 +1654,7 @@ eta_cd_norm_ecrh = 0.30 eta_ecrh_injector_wall_plug = 0.5 * Amount of injected power for heating [MW] -pheat = 75.0 +p_hcd_primary_extra_heat_mw = 75.0 * Impurity radiation * ********************** diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 3a83273a21..08df9dd932 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -41,7 +41,7 @@ class CudrivParam(NamedTuple): i_hcd_secondary: Any = None - pheat: Any = None + p_hcd_primary_extra_heat_mw: Any = None pheatfix: Any = None @@ -213,7 +213,7 @@ class CudrivParam(NamedTuple): p_beam_orbit_loss_mw=0, i_hcd_primary=10, i_hcd_secondary=0, - pheat=75, + p_hcd_primary_extra_heat_mw=75, pheatfix=0, p_hcd_secondary_injected_mw=0, i_hcd_calculations=1, @@ -303,7 +303,7 @@ class CudrivParam(NamedTuple): p_beam_orbit_loss_mw=0, i_hcd_primary=10, i_hcd_secondary=0, - pheat=75, + p_hcd_primary_extra_heat_mw=75, pheatfix=0, p_hcd_secondary_injected_mw=0, i_hcd_calculations=1, @@ -428,7 +428,7 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): current_drive_variables, "i_hcd_secondary", cudrivparam.i_hcd_secondary ) - monkeypatch.setattr(current_drive_variables, "pheat", cudrivparam.pheat) + monkeypatch.setattr(current_drive_variables, "p_hcd_primary_extra_heat_mw", cudrivparam.p_hcd_primary_extra_heat_mw) monkeypatch.setattr(current_drive_variables, "pheatfix", cudrivparam.pheatfix) diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index 3a99f1a36c..2bbf3ac6e8 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -90,7 +90,7 @@ class ProcessTracker: # Variables in an MFile that hold metadata we want to show on the graph tracking_variables: ClassVar = { - "pheat", + "p_hcd_primary_extra_heat_mw", "f_c_plasma_bootstrap", "p_hcd_injected_total_mw", "dr_shld_inboard", From 90429b8b2e4115c97ca0a5bfba8358dc0c6f2606 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 4 Apr 2025 13:15:21 +0100 Subject: [PATCH 56/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20pheatfix=20to=20p?= =?UTF-8?q?=5Fhcd=5Fsecondary=5Fextra=5Fheat=5Fmw=20for=20clarity=20and=20?= =?UTF-8?q?consistency=20in=20current=20drive=20calculations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heating-and-current-drive.md | 2 +- process/current_drive.py | 19 ++++++++++--------- process/input.py | 6 ++++-- process/stellarator.py | 13 +++++++++---- source/fortran/current_drive_variables.f90 | 2 +- tests/integration/ref_dicts.json | 10 +++++----- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_current_drive.py | 18 +++++++++++++----- 8 files changed, 44 insertions(+), 28 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md index 498ab8453b..a3025ec314 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md @@ -40,7 +40,7 @@ In addition to current drive, some auxiliary power can be used to only heat the ### Secondary heating -Like for a current drive and heating system a fixed amount of heating power that does not drive current can be set with the `pheatfix` variable. +Like for a current drive and heating system a fixed amount of heating power that does not drive current can be set with the `p_hcd_secondary_extra_heat_mw` variable. ## Ignited plasma diff --git a/process/current_drive.py b/process/current_drive.py index 58d7c3f22f..7c750a6fc5 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -53,15 +53,15 @@ def cudriv(self, output: bool): # To stop issues with input file we force # zero secondary heating if no injection method if current_drive_variables.i_hcd_secondary == 0: - current_drive_variables.pheatfix = 0.0 + current_drive_variables.p_hcd_secondary_extra_heat_mw = 0.0 # check for unphysically large heating in # secondary injected power source if ( - current_drive_variables.pheatfix + current_drive_variables.p_hcd_secondary_extra_heat_mw > current_drive_variables.p_hcd_secondary_injected_mw ): - current_drive_variables.pheatfix = ( + current_drive_variables.p_hcd_secondary_extra_heat_mw = ( current_drive_variables.p_hcd_secondary_injected_mw ) @@ -298,7 +298,7 @@ def cudriv(self, output: bool): effrfssfix * ( current_drive_variables.p_hcd_secondary_injected_mw - - current_drive_variables.pheatfix + - current_drive_variables.p_hcd_secondary_extra_heat_mw ) * 1.0e6 ) @@ -325,7 +325,7 @@ def cudriv(self, output: bool): effrfssfix * ( current_drive_variables.p_hcd_secondary_injected_mw - - current_drive_variables.pheatfix + - current_drive_variables.p_hcd_secondary_extra_heat_mw ) * 1.0e6 ) @@ -380,7 +380,7 @@ def cudriv(self, output: bool): effnbssfix * ( current_drive_variables.p_hcd_secondary_injected_mw - - current_drive_variables.pheatfix + - current_drive_variables.p_hcd_secondary_extra_heat_mw ) * 1.0e6 ) @@ -841,7 +841,8 @@ def cudriv(self, output: bool): self.outfile, "Auxiliary power used for plasma heating only (MW)", "(p_hcd_primary_extra_heat_mw)", - current_drive_variables.p_hcd_primary_extra_heat_mw + current_drive_variables.pheatfix, + current_drive_variables.p_hcd_primary_extra_heat_mw + + current_drive_variables.p_hcd_secondary_extra_heat_mw, ) po.ovarre( self.outfile, @@ -849,7 +850,7 @@ def cudriv(self, output: bool): "(pcurrentdrivemw)", current_drive_variables.p_hcd_injected_total_mw - current_drive_variables.p_hcd_primary_extra_heat_mw - - current_drive_variables.pheatfix, + - current_drive_variables.p_hcd_secondary_extra_heat_mw, ) po.ovarre( self.outfile, @@ -868,7 +869,7 @@ def cudriv(self, output: bool): self.outfile, "Power injected for secondary current drive (MW)", "(pcurrentdrivemw2)", - pinjmwfix - current_drive_variables.pheatfix, + pinjmwfix - current_drive_variables.p_hcd_secondary_extra_heat_mw, ) po.ovarre( diff --git a/process/input.py b/process/input.py index c2bd7243d6..27919171b4 100644 --- a/process/input.py +++ b/process/input.py @@ -962,8 +962,10 @@ def __post_init__(self): ), "rho_pf_coil": InputVariable(fortran.pfcoil_variables, float, range=(0.0, 0.0001)), "pfusife": InputVariable(fortran.ife_variables, float, range=(0.0, 10000.0)), - "p_hcd_primary_extra_heat_mw": InputVariable(fortran.current_drive_variables, float, range=(0.0, 1000.0)), - "pheatfix": InputVariable( + "p_hcd_primary_extra_heat_mw": InputVariable( + fortran.current_drive_variables, float, range=(0.0, 1000.0) + ), + "p_hcd_secondary_extra_heat_mw": InputVariable( fortran.current_drive_variables, float, range=(0.0, 1000.0) ), "pibv": InputVariable(fortran.buildings_variables, float, range=(1000.0, 100000.0)), diff --git a/process/stellarator.py b/process/stellarator.py index 40efe6f7f4..03392a2aef 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -4941,7 +4941,9 @@ def stheat(self, output: bool): AEA FUS 172: Physics Assessment for the European Reactor Study """ if stellarator_variables.isthtr == 1: - current_drive_variables.p_ecrh_injected_mw = current_drive_variables.p_hcd_primary_extra_heat_mw + current_drive_variables.p_ecrh_injected_mw = ( + current_drive_variables.p_hcd_primary_extra_heat_mw + ) current_drive_variables.p_hcd_injected_ions_mw = 0 current_drive_variables.p_hcd_injected_electrons_mw = ( current_drive_variables.p_ecrh_injected_mw @@ -4954,7 +4956,9 @@ def stheat(self, output: bool): + current_drive_variables.p_hcd_injected_electrons_mw ) / current_drive_variables.eta_hcd_primary_injector_wall_plug elif stellarator_variables.isthtr == 2: - current_drive_variables.plhybd = current_drive_variables.p_hcd_primary_extra_heat_mw + current_drive_variables.plhybd = ( + current_drive_variables.p_hcd_primary_extra_heat_mw + ) current_drive_variables.p_hcd_injected_ions_mw = 0 current_drive_variables.p_hcd_injected_electrons_mw = ( current_drive_variables.plhybd @@ -4972,8 +4976,9 @@ def stheat(self, output: bool): f_p_beam_injected_ions, current_drive_variables.f_p_beam_shine_through, ) = self.current_drive.culnbi() - current_drive_variables.pnbeam = current_drive_variables.p_hcd_primary_extra_heat_mw * ( - 1 - current_drive_variables.f_p_beam_orbit_loss + current_drive_variables.pnbeam = ( + current_drive_variables.p_hcd_primary_extra_heat_mw + * (1 - current_drive_variables.f_p_beam_orbit_loss) ) current_drive_variables.p_beam_orbit_loss_mw = ( current_drive_variables.p_hcd_primary_extra_heat_mw diff --git a/source/fortran/current_drive_variables.f90 b/source/fortran/current_drive_variables.f90 index afe6dd8e7d..f1ff175c11 100644 --- a/source/fortran/current_drive_variables.f90 +++ b/source/fortran/current_drive_variables.f90 @@ -199,7 +199,7 @@ module current_drive_variables real(dp) :: p_hcd_primary_extra_heat_mw !! heating power not used for current drive (MW) (`iteration variable 11`) - real(dp) :: pheatfix + real(dp) :: p_hcd_secondary_extra_heat_mw !! secondary fixed heating power not used for current drive (MW) real(dp) :: p_hcd_injected_max diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 067a49d6ad..8f1f3d9999 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3491,7 +3491,7 @@ "pfwpmw": 0.0, "pgrossmw": 0.0, "p_hcd_primary_extra_heat_mw": 0.0, - "pheatfix": 0.0, + "p_hcd_secondary_extra_heat_mw": 0.0, "phi_0_n_BZ_IB": 512000000000000.0, "phi_0_n_BZ_OB": 565500000000000.0, "phi_n_0_VV_ref": 20000000000.0, @@ -10214,7 +10214,7 @@ "pfwpmw": "Total mean wall plug power dissipated in PFC and CS power supplies (MW) (issue #713)", "pgrossmw": "gross electric power (MW)", "p_hcd_primary_extra_heat_mw": "heating power not used for current drive (MW) (`iteration variable 11`)", - "pheatfix": "secondary fixed heating power not used for current drive (MW)", + "p_hcd_secondary_extra_heat_mw": "secondary fixed heating power not used for current drive (MW)", "phi_0_n_BZ_IB": "Pre-exp term in IB BZ [n/cm^2/sec]", "phi_0_n_BZ_OB": "Pre-exp term in OB BZ [n/cm^2/sec]", "phi_n_0_VV_ref": "Reference fast neutron flux on VV inner side [Fish09] [n/cm^2/sec]", @@ -13747,7 +13747,7 @@ "lb": 0.0, "ub": 1000.0 }, - "pheatfix": { + "p_hcd_secondary_extra_heat_mw": { "lb": 0.0, "ub": 1000.0 }, @@ -17652,7 +17652,7 @@ "f_p_beam_shine_through", "dx_beam_shield", "p_hcd_primary_extra_heat_mw", - "pheatfix", + "p_hcd_secondary_extra_heat_mw", "p_hcd_injected_max", "p_hcd_injected_electrons_mw", "p_hcd_injected_ions_mw", @@ -20392,7 +20392,7 @@ "rho_pf_coil": "real_variable", "pfusife": "real_variable", "p_hcd_primary_extra_heat_mw": "real_variable", - "pheatfix": "real_variable", + "p_hcd_secondary_extra_heat_mw": "real_variable", "pibv": "real_variable", "pifecr": "real_variable", "p_hcd_injected_max": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index b68afac8ff..a59d4bc367 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2729,7 +2729,7 @@ feffcd = 1.0 * DESCRIPTION: Secondary auxiliary injection power (MW) * JUSTIFICATION: Not used, ECRH only -*pheatfix = +*p_hcd_secondary_extra_heat_mw = * DESCRIPTION: Secondary fixed heating power not used for C.D. (MW) * JUSTIFICATION: Not used, ECRH only. diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py index 08df9dd932..9ce955253d 100644 --- a/tests/unit/test_current_drive.py +++ b/tests/unit/test_current_drive.py @@ -43,7 +43,7 @@ class CudrivParam(NamedTuple): p_hcd_primary_extra_heat_mw: Any = None - pheatfix: Any = None + p_hcd_secondary_extra_heat_mw: Any = None p_hcd_secondary_injected_mw: Any = None @@ -214,7 +214,7 @@ class CudrivParam(NamedTuple): i_hcd_primary=10, i_hcd_secondary=0, p_hcd_primary_extra_heat_mw=75, - pheatfix=0, + p_hcd_secondary_extra_heat_mw=0, p_hcd_secondary_injected_mw=0, i_hcd_calculations=1, feffcd=1, @@ -304,7 +304,7 @@ class CudrivParam(NamedTuple): i_hcd_primary=10, i_hcd_secondary=0, p_hcd_primary_extra_heat_mw=75, - pheatfix=0, + p_hcd_secondary_extra_heat_mw=0, p_hcd_secondary_injected_mw=0, i_hcd_calculations=1, feffcd=1, @@ -428,9 +428,17 @@ def test_cudriv(cudrivparam, monkeypatch, current_drive): current_drive_variables, "i_hcd_secondary", cudrivparam.i_hcd_secondary ) - monkeypatch.setattr(current_drive_variables, "p_hcd_primary_extra_heat_mw", cudrivparam.p_hcd_primary_extra_heat_mw) + monkeypatch.setattr( + current_drive_variables, + "p_hcd_primary_extra_heat_mw", + cudrivparam.p_hcd_primary_extra_heat_mw, + ) - monkeypatch.setattr(current_drive_variables, "pheatfix", cudrivparam.pheatfix) + monkeypatch.setattr( + current_drive_variables, + "p_hcd_secondary_extra_heat_mw", + cudrivparam.p_hcd_secondary_extra_heat_mw, + ) monkeypatch.setattr( current_drive_variables, From 0306dcab0f5c747157999a687f20c8c2d9d123fb Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 9 Apr 2025 08:37:35 +0100 Subject: [PATCH 57/61] =?UTF-8?q?=F0=9F=94=84=20Update=20obsolete=5Fvars.p?= =?UTF-8?q?y=20to=20include=20new=20variable=20mappings=20for=20clarity=20?= =?UTF-8?q?and=20consistency=20in=20current=20drive=20calculations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/io/obsolete_vars.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index f134323e76..0c6426956b 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -295,6 +295,24 @@ "casths": "dx_tf_side_case", "thkcas": "dr_tf_nose_case", "tmpcry": "temp_tf_cryo", + "beam_energy": "e_beam_kev", + "bootstrap_current_fraction_max": "f_c_plasma_bootstrap_max", + "etaech": "eta_ecrh_injector_wall_plug", + "etalh": "eta_lowhyb_injector_wall_plug", + "etanbi": "eta_beam_injector_wall_plug", + "f_tritium_beam": "f_tritium_beam", + "forbitloss": "f_p_beam_orbit_loss", + "gammaecrh": "eta_cd_norm_ecrh", + "harnum": "n_ecrh_harmonic", + "nbshield": "dx_beam_shield", + "nbshinefmax": "f_p_beam_shine_through_max", + "pheat": "p_hcd_primary_extra_heat_mw", + "pinjalw": "p_hcd_injected_max", + "pinjfixmw": "p_hcd_secondary_injected_mw", + "iefrf": "i_hcd_primary", + "iefrffix": "i_hcd_secondary", + "irfcd": "i_hcd_calculations", + "wave_mode": "i_ecrh_wave_mode", } OBS_VARS_HELP = { From 260de8ac7356c82d887bae76d5fe598736a4eeec Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 9 Apr 2025 13:29:58 +0100 Subject: [PATCH 58/61] =?UTF-8?q?=F0=9F=94=84=20Refactor=20current=5Fdrive?= =?UTF-8?q?.py=20variable=20names=20for=20clarity=20and=20consistency=20in?= =?UTF-8?q?=20current=20drive=20calculations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/current_drive.py | 100 ++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index 7c750a6fc5..9d066259eb 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -2215,66 +2215,68 @@ def init_current_drive_variables(): """Initialise current drive variables""" current_drive_variables.beamwd = 0.58 current_drive_variables.bigq = 0.0 - current_drive_variables.bootstrap_current_fraction = 0.0 - current_drive_variables.bootstrap_current_fraction_max = 0.9 - current_drive_variables.bscf_iter89 = 0.0 - current_drive_variables.bscf_nevins = 0.0 - current_drive_variables.bscf_sauter = 0.0 - current_drive_variables.bscf_wilson = 0.0 - current_drive_variables.bscf_sakai = 0.0 - current_drive_variables.bscf_aries = 0.0 - current_drive_variables.bscf_andrade = 0.0 - current_drive_variables.bscf_hoang = 0.0 - current_drive_variables.bscf_wong = 0.0 + current_drive_variables.f_c_plasma_bootstrap = 0.0 + current_drive_variables.f_c_plasma_bootstrap_max = 0.9 + current_drive_variables.f_c_plasma_bootstrap_iter89 = 0.0 + current_drive_variables.f_c_plasma_bootstrap_nevins = 0.0 + current_drive_variables.f_c_plasma_bootstrap_sauter = 0.0 + current_drive_variables.f_c_plasma_bootstrap_wilson = 0.0 + current_drive_variables.f_c_plasma_bootstrap_sakai = 0.0 + current_drive_variables.f_c_plasma_bootstrap_aries = 0.0 + current_drive_variables.f_c_plasma_bootstrap_andrade = 0.0 + current_drive_variables.f_c_plasma_bootstrap_hoang = 0.0 + current_drive_variables.f_c_plasma_bootstrap_wong = 0.0 current_drive_variables.bscf_gi_i = 0.0 current_drive_variables.bscf_gi_ii = 0.0 current_drive_variables.cboot = 1.0 - current_drive_variables.beam_current = 0.0 - current_drive_variables.diacf_hender = 0.0 - current_drive_variables.diacf_scene = 0.0 - current_drive_variables.diamagnetic_current_fraction = 0.0 - current_drive_variables.echpwr = 0.0 + current_drive_variables.c_beam_total = 0.0 + current_drive_variables.f_c_plasma_diamagnetic_hender = 0.0 + current_drive_variables.f_c_plasma_diamagnetic_scene = 0.0 + current_drive_variables.f_c_plasma_diamagnetic = 0.0 + current_drive_variables.p_ecrh_injected_mw = 0.0 current_drive_variables.echwpow = 0.0 - current_drive_variables.effcd = 0.0 - current_drive_variables.harnum = 2.0 - current_drive_variables.wave_mode = 0 - current_drive_variables.beam_energy = 1.0e3 - current_drive_variables.etacd = 0.0 - current_drive_variables.etacdfix = 0.0 - current_drive_variables.etaech = 0.3 - current_drive_variables.etalh = 0.3 - current_drive_variables.etanbi = 0.3 - current_drive_variables.fpion = 0.5 - current_drive_variables.pnbitot = 0.0 - current_drive_variables.pscf_scene = 0.0 - current_drive_variables.nbshinemw = 0.0 + current_drive_variables.eta_cd_hcd_primary = 0.0 + current_drive_variables.n_ecrh_harmonic = 2.0 + current_drive_variables.i_ecrh_wave_mode = 0 + current_drive_variables.e_beam_kev = 1.0e3 + current_drive_variables.eta_hcd_primary_injector_wall_plug = 0.0 + current_drive_variables.eta_hcd_secondary_injector_wall_plug = 0.0 + current_drive_variables.eta_ecrh_injector_wall_plug = 0.3 + current_drive_variables.eta_lowhyb_injector_wall_plug = 0.3 + current_drive_variables.eta_beam_injector_wall_plug = 0.3 + current_drive_variables.f_p_beam_injected_ions = 0.5 + current_drive_variables.p_beam_injected_mw = 0.0 + current_drive_variables.f_c_plasma_pfirsch_schluter_scene = 0.0 + current_drive_variables.p_beam_shine_through_mw = 0.0 current_drive_variables.feffcd = 1.0 - current_drive_variables.forbitloss = 0.0 + current_drive_variables.f_p_beam_orbit_loss = 0.0 current_drive_variables.frbeam = 1.05 - current_drive_variables.f_tritium_beam = 1e-6 - current_drive_variables.gamcd = 0.0 - current_drive_variables.gamma_ecrh = 0.35 + current_drive_variables.f_beam_tritium = 1e-6 + current_drive_variables.eta_cd_norm_hcd_primary = 0.0 + current_drive_variables.eta_cd_norm_ecrh = 0.35 current_drive_variables.xi_ebw = 0.8 - current_drive_variables.iefrf = 5 - current_drive_variables.iefrffix = 0 - current_drive_variables.irfcd = 1 - current_drive_variables.nbshinef = 0.0 - current_drive_variables.nbshield = 0.5 - current_drive_variables.pheat = 0.0 - current_drive_variables.pheatfix = 0.0 - current_drive_variables.pinjalw = 150.0 - current_drive_variables.pinjemw = 0.0 - current_drive_variables.pinjimw = 0.0 - current_drive_variables.pinjmw = 0.0 - current_drive_variables.pinjfixmw = 0.0 - current_drive_variables.plasma_current_internal_fraction = 0.0 + current_drive_variables.i_hcd_primary = 5 + current_drive_variables.i_hcd_secondary = 0 + current_drive_variables.i_hcd_calculations = 1 + current_drive_variables.f_p_beam_shine_through = 0.0 + current_drive_variables.dx_beam_shield = 0.5 + current_drive_variables.p_hcd_primary_extra_heat_mw = 0.0 + current_drive_variables.p_hcd_secondary_extra_heat_mw = 0.0 + current_drive_variables.p_hcd_injected_max = 150.0 + current_drive_variables.p_hcd_injected_electrons_mw = 0.0 + current_drive_variables.p_hcd_injected_ions_mw = 0.0 + current_drive_variables.p_hcd_injected_total_mw = 0.0 + current_drive_variables.p_hcd_secondary_injected_mw = 0.0 + current_drive_variables.f_c_plasma_internal = 0.0 current_drive_variables.plhybd = 0.0 current_drive_variables.pnbeam = 0.0 - current_drive_variables.porbitlossmw = 0.0 - current_drive_variables.ps_current_fraction = 0.0 + current_drive_variables.p_beam_orbit_loss_mw = 0.0 + current_drive_variables.f_c_plasma_pfirsch_schluter = 0.0 current_drive_variables.pwplh = 0.0 current_drive_variables.pwpnb = 0.0 current_drive_variables.rtanbeam = 0.0 current_drive_variables.rtanmax = 0.0 - current_drive_variables.taubeam = 0.0 + current_drive_variables.n_beam_decay_lengths_core = 0.0 current_drive_variables.tbeamin = 3.0 + current_drive_variables.eta_cd_norm_hcd_secondary = 0.0 + current_drive_variables.eta_cd_hcd_secondary = 0.0 From 464291e4a52ccf154f991405f19c0142cf4c084c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 10 Apr 2025 10:36:50 +0100 Subject: [PATCH 59/61] Update variables to new iteration python file --- process/iteration_variables.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/process/iteration_variables.py b/process/iteration_variables.py index 3dcc36d71b..e77806fe6e 100644 --- a/process/iteration_variables.py +++ b/process/iteration_variables.py @@ -48,7 +48,9 @@ class IterationVariable: ), 9: IterationVariable("fdene", fortran.constraint_variables, 0.001, 1.0), 10: IterationVariable("hfact", fortran.physics_variables, 0.1, 3.0), - 11: IterationVariable("pheat", fortran.current_drive_variables, 1.0e-3, 1.0e3), + 11: IterationVariable( + "p_hcd_primary_extra_heat_mw", fortran.current_drive_variables, 1.0e-3, 1.0e3 + ), 12: IterationVariable("oacdcp", fortran.tfcoil_variables, 1.0e5, 1.50e8), 13: IterationVariable("dr_tf_inboard", fortran.build_variables, 0.1, 5.0), 14: IterationVariable("fwalld", fortran.constraint_variables, 0.001, 1.0), @@ -56,7 +58,7 @@ class IterationVariable: 16: IterationVariable("dr_cs", fortran.build_variables, 0.01, 10.00), 17: IterationVariable("t_between_pulse", fortran.times_variables, 0.1, 1.0e8), 18: IterationVariable("q95", fortran.physics_variables, 2.0, 50.00), - 19: IterationVariable("beam_energy", fortran.current_drive_variables, 1.0, 1.0e6), + 19: IterationVariable("e_beam_kev", fortran.current_drive_variables, 1.0, 1.0e6), 20: IterationVariable("temp_cp_average", fortran.tfcoil_variables, 40.00, 3.0e2), 21: IterationVariable("ft_burn", fortran.constraint_variables, 0.001, 1.0), 23: IterationVariable("fcoolcp", fortran.tfcoil_variables, 0.1, 0.50), From ee8af041dcfbf57679cbee6ed0394df132309266 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 10 Apr 2025 15:50:58 +0100 Subject: [PATCH 60/61] =?UTF-8?q?=F0=9F=94=84=20Fix=20typos=20and=20update?= =?UTF-8?q?=20variable=20descriptions=20for=20clarity=20in=20documentation?= =?UTF-8?q?=20and=20obsolete=5Fvars.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eng-models/heating_and_current_drive/NBI/culham_nb.md | 2 +- documentation/proc-pages/fusion-devices/stellarator.md | 2 +- process/io/obsolete_vars.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md index 4da5ee1262..78dfe54e97 100644 --- a/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md +++ b/documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md @@ -56,7 +56,7 @@ $$ \mathtt{dent} = n_{\text{ion}} \times \mathtt{f_beam_tritium} $$ -Power split to the ions and electrons is clauclated with the $\mathtt{cfnbi()}$ method found [here](../NBI/nbi_overview.md/#ion-coupled-power-cfnbi) and outputs $\mathtt{f_p_beam_injected_ions}$ +Power split to the ions and electrons is calculated with the $\mathtt{cfnbi()}$ method found [here](../NBI/nbi_overview.md/#ion-coupled-power-cfnbi) and outputs $\mathtt{f_p_beam_injected_ions}$ ## Current drive efficiency | `etanb2()` diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index 801c9190dc..1458610c57 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -173,7 +173,7 @@ Stellarators require no curren drive, although provision for auxiliary heating d `isthtr = 3` : neutral beam injection -The value of variable `p_hcd_primary_extra_heat_mw` determines the actual amount of auxiliary heating power (in Watts) to be applied to the plasma. This variable may be used as an iteration variable (no. 11). Switch `ignite` may be used if necessary. +The value of variable `p_hcd_primary_extra_heat_mw` determines the actual amount of auxiliary heating power (in Mega Watts) to be applied to the plasma. This variable may be used as an iteration variable (no. 11). Switch `ignite` may be used if necessary. ### Divertor diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 0c6426956b..6043e804b3 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -302,7 +302,7 @@ "etanbi": "eta_beam_injector_wall_plug", "f_tritium_beam": "f_tritium_beam", "forbitloss": "f_p_beam_orbit_loss", - "gammaecrh": "eta_cd_norm_ecrh", + "gamma_ecrh": "eta_cd_norm_ecrh", "harnum": "n_ecrh_harmonic", "nbshield": "dx_beam_shield", "nbshinefmax": "f_p_beam_shine_through_max", @@ -313,6 +313,7 @@ "iefrffix": "i_hcd_secondary", "irfcd": "i_hcd_calculations", "wave_mode": "i_ecrh_wave_mode", + "pheatfix": "p_hcd_secondary_extra_heat_mw", } OBS_VARS_HELP = { From 5441437e359494652801bbe20abdf84c7d95954b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 10 Apr 2025 16:08:19 +0100 Subject: [PATCH 61/61] =?UTF-8?q?=F0=9F=94=84=20Rename=20current=20drive?= =?UTF-8?q?=20variables=20for=20clarity=20and=20consistency=20in=20large?= =?UTF-8?q?=5Ftokamak=5Fonce=5Fthrough=5FIN.DAT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/data/large_tokamak_once_through_IN.DAT | 12 ++++++------ process/io/obsolete_vars.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/data/large_tokamak_once_through_IN.DAT b/examples/data/large_tokamak_once_through_IN.DAT index 47adbeb7bf..48235fad95 100644 --- a/examples/data/large_tokamak_once_through_IN.DAT +++ b/examples/data/large_tokamak_once_through_IN.DAT @@ -160,12 +160,12 @@ output_costs = 1 * Switch for costs output; *-------------Current Drive Variables--------------* -bootstrap_current_fraction_max = 0.95 * maximum fraction of plasma current from bootstrap; if `bootstrap_current_fraction_max < 0`; -etaech = 0.5 * ECH wall plug to injector efficiency -gamma_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) -iefrf = 10 * Switch for current drive efficiency model; -pheat = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) -pinjalw = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) +f_c_plasma_bootstrap_max = 0.95 * maximum fraction of plasma current from bootstrap; if `f_c_plasma_bootstrap_max < 0`; +eta_ecrh_injector_wall_plug = 0.5 * ECH wall plug to injector efficiency +eta_cd_norm_ecrh = 0.30 * User input ECRH gamma (1;0e20 A/(W m^2)) +i_hcd_primary = 10 * Switch for current drive efficiency model; +p_hcd_primary_extra_heat_mw = 75.0 * heating power not used for current drive (MW) (`iteration variable 11`) +p_hcd_injected_max = 200.0 * maximum allowable value for injected power (MW) (`constraint equation 30`) *-------------------Dcll Module--------------------* diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 6043e804b3..73750e3160 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -300,7 +300,7 @@ "etaech": "eta_ecrh_injector_wall_plug", "etalh": "eta_lowhyb_injector_wall_plug", "etanbi": "eta_beam_injector_wall_plug", - "f_tritium_beam": "f_tritium_beam", + "f_tritium_beam": "f_beam_tritium", "forbitloss": "f_p_beam_orbit_loss", "gamma_ecrh": "eta_cd_norm_ecrh", "harnum": "n_ecrh_harmonic",